Small tweaks to inherit js

resources/lang/en-US/admin/users/general.php

@@ -53,4 +53,5 @@ return [
     'all_assigned_list_generation' => 'Generated on:',
     'email_user_creds_on_create' => 'Email this user their credentials?',
     'department_manager' => 'Department Manager',
+    'generate_password' => 'Generate random password',
 ];

resources/views/modals/user.blade.php

@@ -59,9 +59,14 @@
                             <div class="col-md-3 col-xs-12">
                                 <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12 " style="margin-bottom:5px;">
+                            <div class="col-md-7 col-xs-12">
                                 <input type='password' name="password" id='modal-password' class="form-control" required>
-                                <a href="#" class="left" id="modal-genPassword">Generate</a>
+                                <div id="modal-generated-password"></div>
+                            </div>
+                            <div class="col-md-1">
+                                <a href="#" class="btn btn-default btn-sm" id="modal-genPassword" data-tooltip="true" title="{{ trans('admin/users/general.generate_password') }}">
+                                    <i class="fa-solid fa-wand-magic-sparkles"></i>
+                                </a>
                                 <div id="modal-generated-password"></div>
                             </div>
                         </div>
@@ -72,9 +77,8 @@
                             <div class="col-md-3 col-xs-12 ">
                                 <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12">
+                            <div class="col-md-7 col-xs-12">
                                 <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' required>
-
                             </div>
                          </div>
                     </div>

resources/views/partials/forms/edit/permissions-base.blade.php

@@ -30,32 +30,30 @@
   .radio-slider-inputs label {
     color: #9a9999;
     border-radius: 4px;
+    border: 1px transparent solid;
   }
 
   .radio-slider-inputs .allow:checked + label {
     background-color: green;
     color: white;
     border-radius: 4px;
+    border: 1px transparent solid;
   }
 
   .radio-slider-inputs .inherit:checked + label {
-    background-color: #f6f4f4;
-    border: 1px #d6d6d6 solid;
+    background-color: #f6f5f5;
     color: #9a9999;
     border-radius: 4px;
+    border: 1px #d6d6d6 solid;
   }
 
   .radio-slider-inputs .deny:checked + label {
     background-color: #a94442;
     color: white;
     border-radius: 4px;
+    border: 1px transparent solid;
   }
 
-  .radio-slider-inputs .allow:checked + label {
-    background-color: green;
-    color: white;
-    border-radius: 4px;
-  }
 </style>
 
 

resources/views/users/edit.blade.php

@@ -145,10 +145,12 @@
 
                   </div>
 
-                  <div class="col-md-2">
+                  <div class="col-md-1 pull-left">
 
                     @if (Gate::allows('editableOnDemo') && (Gate::allows('canEditAuthFields', $user)) && ($user->ldap_import!='1'))
-                      <a href="#" class="left" id="genPassword">{{ trans('general.generate') }}</a>
+                      <a href="#" class="text-left btn btn-default btn-sm" id="genPassword" data-tooltip="true" title="{{ trans('admin/users/general.generate_password') }}">
+                          <i class="fa-solid fa-wand-magic-sparkles"></i>
+                      </a>
                     @endif
                   </div>
                 </div>
@@ -697,28 +699,9 @@ $(document).ready(function() {
 
         @endif
     });
-
-
-	// Check/Uncheck all radio buttons in the group
-    $('tr.header-row input:radio').change(function() {
-        value = $(this).attr('value');
-        area = $(this).data('checker-group');
-        $('.radiochecker-'+area+'[value='+value+']').prop('checked', true);
-    });
-
-    $('.header-name').click(function() {
-        $(this).parent().nextUntil('tr.header-row').slideToggle(500);
-    });
-
+    
     $('.tooltip-base').tooltip({container: 'body'})
-    $(".superuser").change(function() {
-        var perms = $(this).val();
-        if (perms =='1') {
-            $("#nonadmin").hide();
-        } else {
-            $("#nonadmin").show();
-        }
-    });
+
 
     $('#genPassword').pGenerator({
         'bind': 'click',
@@ -741,6 +724,7 @@ $(document).ready(function() {
         document.cookie = "optional_user_info_open="+optional_user_info_open+'; path=/';
     });
 
+
     var all_cookies = document.cookie.split(';')
     for(var i in all_cookies) {
         var trimmed_cookie = all_cookies[i].trim(' ')
@@ -796,7 +780,7 @@ $(document).ready(function() {
             $(".nonsuperuser").attr('display','none');
             $(".nonadmin").fadeOut();
             $(".nonadmin").attr('display','none');
-        } else if ($(this).val() == '0') {
+        } else if ($(this).val() != '1') {
             $(".nonsuperuser").fadeIn();
             $(".nonsuperuser").attr('display','block');
         }
@@ -816,7 +800,7 @@ $(document).ready(function() {
         if ($(this).val() == '1') {
             $(".nonadmin").fadeOut();
             $(".nonadmin").attr('display','none');
-        } else if ($(this).val() == '0') {
+        } else if ($(this).val() != '1') {
             $(".nonadmin").fadeIn();
             $(".nonadmin").attr('display','block');
         }