Details
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js
index cc28637..c14231d 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js
@@ -32,7 +32,7 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real
$scope.changePassword = function() {
if ($scope.password != $scope.confirmPassword) {
- Notifications.error("Password not confirmed");
+ Notifications.error("Password and confirmation does not match.");
$scope.password = "";
$scope.confirmPassword = "";
return;
@@ -46,12 +46,12 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real
ApplicationCredentials.update({ realm : realm.id, application : application.id }, creds,
function() {
- Notifications.success('Change password successful');
+ Notifications.success('The password has been changed.');
$scope.password = null;
$scope.confirmPassword = null;
},
function() {
- Notifications.error("Change password failed");
+ Notifications.error("The password was not changed due to a problem.");
$scope.password = null;
$scope.confirmPassword = null;
}
@@ -68,11 +68,11 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real
ApplicationCredentials.update({ realm : realm.id, application : application.id }, creds,
function() {
- Notifications.success('Change totp successful');
+ Notifications.success('The totp was changed.');
$scope.totp = null;
},
function() {
- Notifications.error("Change totp failed");
+ Notifications.error("The totp was not changed due to a problem.");
$scope.totp = null;
}
);
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
index 13d6d99..68fd97e 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
@@ -25,7 +25,7 @@
<span class="dropdown-label" data-ng-show="showNav()">Realm:</span>
<div class="select-rcue" data-ng-show="showNav()">
<select ng-change="changeRealm()" ng-model="current.realm" ng-options="r.realm for r in current.realms"></select>
- </div><a href="#/realms/{{current.realm.id}}" id="refresh" data-ng-show="showNav()"><span class="icon-spinner6">Icon: spinner</span></a>
+ </div><a href="#/realms/{{current.realm.id}}" id="refresh" data-ng-show="showNav()" class="tooltipBottomTrigger" data-original-title="Refresh"><span class="icon-spinner6">Icon: spinner</span></a>
</li>
</ul>
<div class="pull-right" data-ng-show="auth.loggedIn">
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html
index c361ed3..d15ab2b 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html
@@ -22,7 +22,7 @@
</ol>
<h2><span>{{realm.realm}}</span> Keys</h2>
<form name="realmForm" novalidate>
- <fieldset>
+ <fieldset class="border-top">
<div class="form-group">
<label for="publicKey">Public key</label>
@@ -32,7 +32,7 @@
</div>
</fieldset>
<div class="form-actions">
- <button type="submit" data-ng-click="generate()" class="destructive">Generate new keys</button>
+ <button type="submit" data-ng-click="generate()">Generate new keys</button>
</div>
</form>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html
index 1db8892..5ee18f2 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html
@@ -20,7 +20,8 @@
<li><a href="#/realms/{{realm.id}}">Settings</a></li>
<li class="active">SMTP Configuration</li>
</ol>
- <h2><span>{{realm.realm}}</span> SMTP Settings</h2>
+ <h2 class="pull-left"><span>{{realm.realm}}</span> SMTP Settings</h2>
+ <p class="subtitle"><span class="required">*</span> Required fields</p>
<form name="realmForm" novalidate>
<fieldset>
<legend uncollapsed><span class="text">Required Settings</span></legend>
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
index 1cea3b5..8f42e66 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
@@ -261,6 +261,9 @@ body {
background-image: url('img/sprites-white.png');
background-color: transparent;
}
+.header.rcue .navbar.primary .nav > li .tooltip {
+ font-size: 0.84615384615385em;
+}
.header.rcue .navbar.primary .button {
font-size: 0.84615384615385em;
margin-right: 1.36363636363636em;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
index d5bfdf2..527e707 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
@@ -218,6 +218,10 @@ body {
}
}
+ .tooltip {
+ font-size: 0.84615384615385em;
+ }
+
/*
.dropdown {
display: inline-block;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
index d83a677..c2deb87 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
@@ -304,7 +304,7 @@ button.primary:focus,
font-weight: normal;
}
.feedback-aligner {
- position: absolute;
+ position: fixed;
top: 1.5em;
text-align: center;
width: 100%;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
index 5fc4c0b..0ec81b7 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
@@ -324,7 +324,7 @@ button.primary,
}
.feedback-aligner {
- position: absolute;
+ position: fixed;
top: 1.5em;
text-align: center;
width: 100%;