FEATURE #1359: some minor changes in styling and layout

resources/views/admin/userManagement/editForm.blade.php

@@ -1,6 +1,8 @@
 <form method="POST" action="{{route('users.newPost')}}">
     {!! csrf_field() !!}
 
+    <input type="hidden" value="{{$user->id}}" name="userId" />
+
     <label>
         @lang('admin/userManagement.name')
         <input type="text" placeholder="@lang('admin/userManagement.name')" value="{{$user->name}}" name="name">
@@ -19,32 +21,28 @@
     </label>
 
     <label>
-        @lang('admin/userManagement.password')
+        @lang('admin/userManagement.password') <em>(@lang('admin/userManagement.passwordLeaveEmpty'))</em>
 
-        <input type="text" name="password">
+        <input type="text" name="password" value="">
+    </label>
 
-        @if (isset($errors) && $errors->has('password'))
+
+    @if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN)
+        <label>
+            @lang('admin/userManagement.roles')
+
+            <select name="role">
+                @foreach($roles as $role => $translation)
+                    <option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
+                @endforeach
+            </select>
+        </label>
+
+        @if (isset($errors) && $errors->has('role'))
             <div class="callout alert">
-                {{ $errors->first('password') }}
+                {{ $errors->first('role') }}
             </div>
         @endif
-    </label>
-
-
-    <label>
-        @lang('admin/userManagement.roles')
-
-        <select name="role">
-            @foreach($roles as $role => $translation)
-                <option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
-            @endforeach
-        </select>
-    </label>
-
-    @if (isset($errors) && $errors->has('role'))
-        <div class="callout alert">
-            {{ $errors->first('role') }}
-        </div>
     @endif
 
     <label>