jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2026-03-22 19:00:09 -04:00
Code Issues Projects Releases Wiki Activity

Nicer layout for add user + typoe fix

Browse Source
This commit is contained in:
Zsolt Kocsmarszky
2018-02-05 01:52:31 +01:00
parent a5904a6e50
commit af4ecb5085
3 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
client/app/pages/users/new.html
View File

@@ -1,33 +1,34 @@
<settings-screen>
<email-settings-warning function="'invite emails'"></email-settings-warning>
<form class="form" name="$ctrl.userForm" ng-submit="saveUser()" novalidate>
<div class="form-group required" ng-class="{ 'has-error': ($ctrl.userForm.name | showError )}">
<label class="control-label">Name</label>
<input type="text" name="name" class="form-control" ng-model="user.name" ng-disabled="user.created" required/ autofocus>
<div class="row">
<div class="col-md-4 col-md-offset-4 creation-container">
<h3>New User</h3>
<form class="form" name="$ctrl.userForm" ng-submit="saveUser()" novalidate>
<div class="form-group required" ng-class="{ 'has-error': ($ctrl.userForm.name | showError )}">
<label class="control-label">Name</label>
<input type="text" name="name" class="form-control" ng-model="user.name" ng-disabled="user.created" required/ autofocus>
<error-messages input="$ctrl.userForm.name" form="$ctrl.userForm"></error-messages>
<error-messages input="$ctrl.userForm.name" form="$ctrl.userForm"></error-messages>
</div>
<div class="form-group required" ng-class="{ 'has-error': ($ctrl.userForm.email | showError ) }">
<label class="control-label">Email</label>
<input name="email" type="email" class="form-control" ng-model="user.email" ng-disabled="user.created" required/>
<error-messages input="$ctrl.userForm.email" form="$ctrl.userForm"></error-messages>
</div>
<div class="form-group" ng-if="!user.created">
<button class="btn btn-primary">Create user</button>
</div>
<div ng-if="user.created" class="alert alert-success alert-invited">
<h4>The user has been created and should receive an invite email soon</h4>
<p>You can use the following link to invite them yourself:</p>
<textarea class="form-control" rows="2" disabled>{{user.invite_link}}</textarea>
</div>
</form>
</div>
<div class="form-group required" ng-class="{ 'has-error': ($ctrl.userForm.email | showError ) }">
<label class="control-label">Email</label>
<input name="email" type="email" class="form-control" ng-model="user.email" ng-disabled="user.created" required/>
<error-messages input="$ctrl.userForm.email" form="$ctrl.userForm"></error-messages>
</div>
<div class="form-group" ng-if="!user.created">
<button class="btn btn-primary">Create</button>
</div>
<div ng-if="user.created" class="alert alert-success">
<p>
<strong>The user has been created and should receive an invite email soon.</strong>
</p>
<p>
You can use the following link to invite them yourself:<br/>
{{user.invite_link}}
</p>
</div>
</form>
</div>
</settings-screen>

9
client/app/pages/users/settings.less
View File

@@ -8,10 +8,17 @@
margin: 8px 0 0 0;
}
.profile__cointainer {
.profile__container {
.well {
.form-group:last-of-type {
margin-bottom: 0;
}
}
}
.alert-invited {
.form-control {
cursor: text !important;
background: #fff !important;
}
}

2
client/app/pages/users/show.html
View File

@@ -3,7 +3,7 @@
<div ng-show="selectedTab == 'profile'">
<div class="row">
<div class="col-md-4 col-md-offset-4 profile__cointainer">
<div class="col-md-4 col-md-offset-4 profile__container">
<img ng-src="{{user.profile_image_url}}" class="profile__image"/>