Merge branch 'develop' into cputhreads

This commit is contained in:
Dane Everitt 2020-04-03 13:48:06 -07:00 committed by GitHub
commit 78d6e59fc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 1883 additions and 1323 deletions

View file

@ -30,25 +30,25 @@
<div class="form-group">
<label for="email" class="control-label">Email</label>
<div>
<input readonly type="email" name="email" value="{{ $user->email }}" class="form-control form-autocomplete-stop">
<input type="email" name="email" value="{{ $user->email }}" class="form-control form-autocomplete-stop">
</div>
</div>
<div class="form-group">
<label for="registered" class="control-label">Username</label>
<div>
<input readonly type="text" name="username" value="{{ $user->username }}" class="form-control form-autocomplete-stop">
<input type="text" name="username" value="{{ $user->username }}" class="form-control form-autocomplete-stop">
</div>
</div>
<div class="form-group">
<label for="registered" class="control-label">Client First Name</label>
<div>
<input readonly type="text" name="name_first" value="{{ $user->name_first }}" class="form-control form-autocomplete-stop">
<input type="text" name="name_first" value="{{ $user->name_first }}" class="form-control form-autocomplete-stop">
</div>
</div>
<div class="form-group">
<label for="registered" class="control-label">Client Last Name</label>
<div>
<input readonly type="text" name="name_last" value="{{ $user->name_last }}" class="form-control form-autocomplete-stop">
<input type="text" name="name_last" value="{{ $user->name_last }}" class="form-control form-autocomplete-stop">
</div>
</div>
<div class="form-group">
@ -80,7 +80,7 @@
<div class="form-group no-margin-bottom">
<label for="password" class="control-label">Password <span class="field-optional"></span></label>
<div>
<input readonly type="password" id="password" name="password" class="form-control form-autocomplete-stop">
<input type="password" id="password" name="password" class="form-control form-autocomplete-stop">
<p class="text-muted small">Leave blank to keep this user's password the same. User will not receive any notification if password is changed.</p>
</div>
</div>