Skip to content

N
nexpie-grafana-theme
Commit eae4bb74 by Torkel Ödegaard
Options

ux(profile): update profile forms with new form markup and classes

parent caa765ec
Showing with 42 additions and 95 deletions
public/app/features/profile/partials/password.html
......@@ -2,55 +2,33 @@
</navbar>
<div class="page-container">
<div class="page">
<h1>Change password</h1>
<form name="userForm">
<div>
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Old Password
</li>
<li>
<input type="password" required ng-model="command.oldPassword" class="input-xlarge norm-form-input last" >
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
New Password
</li>
<li>
<input type="password" required ng-model="command.newPassword" ng-minlength="4" class="input-xlarge norm-form-input last" >
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Confirm New
</li>
<li>
<input type="password" required ng-model="command.confirmNew" ng-minlength="4" class="input-xlarge norm-form-input last" >
</li>
</ul>
<div class="clearfix"></div>
<form name="userForm" class="gf-form-group">
<div class="gf-form">
<span class="gf-form-label gf-size-m">Old Password</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-model="command.oldPassword">
</div>
<br>
<div class="gf-form">
<span class="gf-form-label gf-size-m">New Password</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-minlength="4" ng-model="command.newPassword">
</div>
<br>
<div class="gf-form">
<span class="gf-form-label gf-size-m">Confirm Password</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-minlength="4" ng-model="command.confirmNew">
</div>
<br>
<div class="p">
<div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-click="changePassword()">Change Password</button>
&nbsp;
<a class="btn-text" href="profile">Cancel</a>
</div>
</form>
</div>
</div>
public/app/features/profile/partials/profile.html
......@@ -2,71 +2,42 @@
</navbar>
<div class="page-container">
<div class="page-wide">
<h1>Profile</h1>
<section class="simple-box">
<h3 class="">Preferences</h3>
</section>
<form name="userForm">
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Name
</li>
<li>
<input type="text" required ng-model="user.name" class="input-xlarge norm-form-input last" >
</li>
</ul>
<div class="clearfix"></div>
<form name="userForm" class="gf-form-group">
<div class="gf-form">
<span class="gf-form-label gf-size-s">Name</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-model="user.name" >
</div>
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Email
</li>
<li>
<input type="email" required ng-model="user.email" class="input-xlarge norm-form-input last" >
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="norm-form">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Username
</li>
<li>
<input type="text" required ng-model="user.login" class="input-xlarge norm-form-input last" >
</li>
</ul>
<div class="clearfix"></div>
<br>
<div class="gf-form">
<span class="gf-form-label gf-size-s">Email</span>
<input class="gf-form-input gf-size-xxl" type="email" required ng-model="user.email">
</div>
<br>
<div class="norm-form last">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
UI Theme
</li>
<li>
<select class="input-small norm-form-input" ng-model="user.theme" ng-options="f for f in ['dark', 'light']"></select>
</li>
</ul>
<div class="clearfix"></div>
<div class="gf-form">
<span class="gf-form-label gf-size-s">Username</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-model="user.login">
</div>
<br>
<div class="gf-form">
<span class="gf-form-label gf-size-s">UI Theme</span>
<select class="gf-form-input gf-size-auto" ng-model="user.theme" ng-options="f for f in ['dark', 'light']"></select>
</div>
<div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-click="update()">Update</button>
<div class="clearfix"></div>
</div>
</form>
<section class="simple-box">
<h3 class="">Password</h3>
<a class="btn btn-inverse btn-small" href="profile/password" style="margin: 7px 10px 0 0">Change Password</a>
</section>
<h3>Password</h3>
<a href="profile/password" class="btn btn-inverse">Change Password</a>
<section class="simple-box">
<h3 class="">Organizations</h3>
<h3>Organizations</h3>
<table class="filter-table form-inline">
<thead>
<tr>
......@@ -90,7 +61,5 @@
</tr>
</tbody>
</table>
</div>
</section>
</div>
</div>
public/less/normform.less
......@@ -17,7 +17,7 @@
}
.gf-form-button-row {
margin-top: 15px;
margin-top: 20px;
margin-bottom: 10px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment