libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #80 from cardosogabriel/master

Browse source 
Adjustments on the header and content area
This commit is contained in:
Bill Burke 2013-10-23 07:41:57 -07:00
commit 2110eae99e
13 changed files with 109 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
View file

@ -5,9 +5,44 @@ body {
color: #4d5258; color: #4d5258;
font-family: "Open Sans", sans-serif; font-family: "Open Sans", sans-serif;
} }
/* Feedback */
.feedback-aligner { .feedback-aligner {
top: 0.9em; top: 0.9em;
} }
.alert {
position: relative;
display: inline-block;
text-align: left;
border-width: 1px;
margin: 0;
font-size: 1.1em;
padding: 0.90909090909091em 3.63636363636364em;
background-repeat: no-repeat;
background-position: 1.27272727272727em center;
line-height: 1.4em;
border-radius: 2px;
color: #4d5258;
}
.alert.alert-success {
border-color: #4b9e39;
background-image: url(img/feedback-success-sign.svg);
background-color: #e4f1e1;
}
.alert.alert-error {
border-color: #b91415;
background-image: url(img/feedback-error-sign.svg);
background-color: #f8e7e7;
}
.alert.alert-warning {
border-color: #f17528;
background-image: url(img/feedback-warning-sign.svg);
background-color: #fef1e9;
}
.alert.alert-info {
border-color: #5994b2;
background-image: url(img/feedback-info-sign.svg);
background-color: #e4f3fa;
}
/* Header */ /* Header */
.header.rcue .navbar.primary .navbar-inner { .header.rcue .navbar.primary .navbar-inner {
min-height: 42px; min-height: 42px;
@ -138,10 +173,11 @@ body {
border: none; border: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
float: right; display: inline-block;
vertical-align: middle;
font-size: 0.76923076923077em; font-size: 0.76923076923077em;
margin-left: 1em; margin-left: 1em;
margin-top: 1.4em; margin-top: 0.7em;
} }
.header.rcue .navbar.primary .nav > li a#refresh:hover { .header.rcue .navbar.primary .nav > li a#refresh:hover {
background: none; background: none;
@ -236,6 +272,7 @@ body {
font-weight: 100; font-weight: 100;
font-size: 2.4em; font-size: 2.4em;
margin-bottom: 1.04166666666667em; margin-bottom: 1.04166666666667em;
margin-top: 1em;
} }
#content-area #content h2 span { #content-area #content h2 span {
color: #a1a1a1; color: #a1a1a1;

47
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
View file

@ -15,10 +15,51 @@ body {
font-family: @open-sans; font-family: @open-sans;
} }
/* Feedback */
.feedback-aligner { .feedback-aligner {
top: 0.9em; top: 0.9em;
} }
.alert {
position: relative;
display: inline-block;
text-align: left;
border-width: 1px;
margin: 0;
font-size: 1.1em;
padding: 0.90909090909091em 3.63636363636364em;
background-repeat: no-repeat;
background-position: 1.27272727272727em center;
line-height: 1.4em;
border-radius: 2px;
color: #4d5258;
&.alert-success {
border-color: #4b9e39;
background-image: url(img/feedback-success-sign.svg);
background-color: #e4f1e1;
}
&.alert-error {
border-color: #b91415;
background-image: url(img/feedback-error-sign.svg);
background-color: #f8e7e7;
}
&.alert-warning {
border-color: #f17528;
background-image: url(img/feedback-warning-sign.svg);
background-color: #fef1e9;
}
&.alert-info {
border-color: #5994b2;
background-image: url(img/feedback-info-sign.svg);
background-color: #e4f3fa;
}
}
/* Header */ /* Header */
@ -78,10 +119,11 @@ body {
border: none; border: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
float: right; display: inline-block;
vertical-align: middle;
font-size: 0.76923076923077em; font-size: 0.76923076923077em;
margin-left: 1em; margin-left: 1em;
margin-top: 1.4em; margin-top: 0.7em;
&:hover { &:hover {
background: none; background: none;
@ -279,6 +321,7 @@ body {
font-weight: 100; font-weight: 100;
font-size: 2.4em; font-size: 2.4em;
margin-bottom: 1.04166666666667em; margin-bottom: 1.04166666666667em;
margin-top: 1em;
span { span {
color: @text-light-grey; color: @text-light-grey;

2
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
View file

@ -829,7 +829,7 @@ input[type="email"].tiny {
} }
.breadcrumb { .breadcrumb {
background: none; background: none;
margin: 5px 0 5px 0; margin: 5px 0 0 0;
padding: 0; padding: 0;
} }
.breadcrumb li a { .breadcrumb li a {

2
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
View file

@ -1007,7 +1007,7 @@ input[type="email"] {
.breadcrumb { .breadcrumb {
background: none; background: none;
margin: 5px 0 5px 0; margin: 5px 0 0 0;
padding: 0; padding: 0;
li { li {

BIN
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/feedback-warning-sign.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 387 B

2
admin-ui/src/main/resources/META-INF/resources/admin/index.html
View file

@ -65,7 +65,7 @@
<div class="feedback-aligner" data-ng-show="notification" data-ng-click="notification = null"> <div class="feedback-aligner" data-ng-show="notification" data-ng-click="notification = null">
<div class="alert alert-{{notification.type}}"><strong>{{notification.message}}</strong></div> <!-- Needs to be <div class="feedback success"> to have the original design --> <div class="alert alert-{{notification.type}}"><strong>Success!</strong> {{notification.message}}</div>
</div> </div>
<div id="wrap"> <div id="wrap">

10
admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js
View file

@ -120,7 +120,7 @@ module.controller('ApplicationRoleDetailCtrl', function($scope, realm, applicati
var l = headers().location; var l = headers().location;
var id = l.substring(l.lastIndexOf("/") + 1); var id = l.substring(l.lastIndexOf("/") + 1);
$location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles/" + id); $location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles/" + id);
Notifications.success("Created role"); Notifications.success("The role has been created.");
}); });
} else { } else {
@ -131,7 +131,7 @@ module.controller('ApplicationRoleDetailCtrl', function($scope, realm, applicati
}, $scope.role, function() { }, $scope.role, function() {
$scope.changed = false; $scope.changed = false;
role = angular.copy($scope.role); role = angular.copy($scope.role);
Notifications.success("Saved changes to role"); Notifications.success("Your changes have been saved to the role.");
}); });
} }
}; };
@ -154,7 +154,7 @@ module.controller('ApplicationRoleDetailCtrl', function($scope, realm, applicati
role : $scope.role.name role : $scope.role.name
}, function() { }, function() {
$location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles"); $location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles");
Notifications.success("Deleted role"); Notifications.success("The role has been deleted.");
}); });
}); });
}; };
@ -231,7 +231,7 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
}, $scope.application, function() { }, $scope.application, function() {
$scope.changed = false; $scope.changed = false;
application = angular.copy($scope.application); application = angular.copy($scope.application);
Notifications.success("Saved changes to application"); Notifications.success("Your changes have been saved to the application.");
}); });
} }
@ -257,7 +257,7 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
id : $scope.application.id id : $scope.application.id
}, function() { }, function() {
$location.url("/realms/" + realm.id + "/applications"); $location.url("/realms/" + realm.id + "/applications");
Notifications.success("Deleted application"); Notifications.success("The application has been deleted.");
}); });
}); });
}; };

10
admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
View file

@ -145,7 +145,7 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $ht
Realm.remove($scope.realm, function() { Realm.remove($scope.realm, function() {
Current.realms = Realm.get(); Current.realms = Realm.get();
$location.url("/realms"); $location.url("/realms");
Notifications.success("Deleted realm"); Notifications.success("The realm has been deleted.");
}); });
}); });
}; };
@ -182,7 +182,7 @@ module.controller('RealmRequiredCredentialsCtrl', function($scope, Realm, realm,
$scope.changed = false; $scope.changed = false;
Realm.update(realmCopy, function () { Realm.update(realmCopy, function () {
$location.url("/realms/" + realm.id + "/required-credentials"); $location.url("/realms/" + realm.id + "/required-credentials");
Notifications.success("Saved changes to realm"); Notifications.success("Your changes have been saved to the realm.");
}); });
} else { } else {
$scope.realmForm.showErrors = true; $scope.realmForm.showErrors = true;
@ -235,7 +235,7 @@ module.controller('RealmTokenDetailCtrl', function($scope, Realm, realm, $http,
$scope.changed = false; $scope.changed = false;
Realm.update(realmCopy, function () { Realm.update(realmCopy, function () {
$location.url("/realms/" + realm.id + "/token-settings"); $location.url("/realms/" + realm.id + "/token-settings");
Notifications.success("Saved changes to realm"); Notifications.success("Your changes have been saved to the realm.");
}); });
} else { } else {
$scope.realmForm.showErrors = true; $scope.realmForm.showErrors = true;
@ -290,7 +290,7 @@ module.controller('RoleDetailCtrl', function($scope, realm, role, Role, $locatio
var l = headers().location; var l = headers().location;
var id = l.substring(l.lastIndexOf("/") + 1); var id = l.substring(l.lastIndexOf("/") + 1);
$location.url("/realms/" + realm.id + "/roles/" + id); $location.url("/realms/" + realm.id + "/roles/" + id);
Notifications.success("Created role"); Notifications.success("The role has been created.");
}); });
} else { } else {
@ -322,7 +322,7 @@ module.controller('RoleDetailCtrl', function($scope, realm, role, Role, $locatio
role : $scope.role.name role : $scope.role.name
}, function() { }, function() {
$location.url("/realms/" + realm.id + "/roles"); $location.url("/realms/" + realm.id + "/roles");
Notifications.success("Deleted role"); Notifications.success("The role has been deleted.");
}); });
}); });
}; };

6
admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js
View file

@ -182,7 +182,7 @@ module.controller('UserDetailCtrl', function($scope, realm, user, User, $locatio
userId : $scope.user.username userId : $scope.user.username
}, function() { }, function() {
$location.url("/realms/" + realm.id + "/users"); $location.url("/realms/" + realm.id + "/users");
Notifications.success("Deleted user"); Notifications.success("The user has been deleted.");
}); });
}); });
}; };
@ -210,7 +210,7 @@ module.controller('RoleMappingCtrl', function($scope, realm, User, users, role,
realm : $scope.realmId, realm : $scope.realmId,
role : role role : role
}); });
Notifications.success("Added role mapping for user"); Notifications.success("The role mapping has been added for the user.");
}); });
} }
} }
@ -229,7 +229,7 @@ module.controller('RoleMappingCtrl', function($scope, realm, User, users, role,
role : role role : role
}); });
Notifications.success("Removed role mapping for user"); Notifications.success("The role mapping has been removed for the user.");
}); });
} }
} }

4
admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
View file

@ -13,8 +13,8 @@
<li class="active">Applications</li> <li class="active">Applications</li>
</ol> </ol>
<h2><span>{{realm.realm}}</span> Applications</h2> <h2><span>{{realm.realm}}</span> Applications</h2>
<div class="feedback info" data-ng-show="!applications || applications.length == 0"> <div class="feedback info inline" data-ng-show="!applications || applications.length == 0">
<p><strong>You have not configured applications.</strong><br><a class="button" href="#/create/application/{{realm.id}}">Add Application</a></p> <p><strong>You have not configured applications.</strong> <a class="button" href="#/create/application/{{realm.id}}">Add Application</a></p>
</div> </div>
<table> <table>
<thead> <thead>

4
admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
View file

@ -25,9 +25,7 @@
<span class="dropdown-label" data-ng-show="showNav()">Realm:</span> <span class="dropdown-label" data-ng-show="showNav()">Realm:</span>
<div class="select-rcue" data-ng-show="showNav()"> <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> <select ng-change="changeRealm()" ng-model="current.realm" ng-options="r.realm for r in current.realms"></select>
</div> </div><a href="#/realms/{{realm.id}}" id="refresh" data-ng-show="showNav()"><span class="icon-spinner6">Icon: spinner</span></a>
<a href="#/realms/{{realm.id}}" id="refresh"><span class="icon-spinner6">Icon: spinner</span></a>
</li> </li>
</ul> </ul>
<div class="pull-right" data-ng-show="auth.loggedIn"> <div class="pull-right" data-ng-show="auth.loggedIn">

2
admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-detail.html
View file

@ -18,7 +18,7 @@
<li class="active">General</li> <li class="active">General</li>
</ol> </ol>
<h2 class="pull-left" data-ng-show="createRealm">Add Realm</h2> <h2 class="pull-left" data-ng-show="createRealm">Add Realm</h2>
<h2 class="pull-left" data-ng-hide="createRealm"><span>{{realm.realm}}</span> General Settings</h2> <h2 data-ng-hide="createRealm"><span>{{realm.realm}}</span> General Settings</h2>
<p class="subtitle" data-ng-show="createRealm"><span class="required">*</span> Required fields</p> <p class="subtitle" data-ng-show="createRealm"><span class="required">*</span> Required fields</p>
<form name="realmForm" novalidate> <form name="realmForm" novalidate>
<fieldset> <fieldset>

10
admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html
View file

@ -12,14 +12,14 @@
</ul> </ul>
</div> </div>
<div id="content"> <div id="content">
<ol class="breadcrumb" data-ng-hide="createRealm"> <ol class="breadcrumb">
<li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li> <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
<li><a href="#/realms/{{realm.id}}">Settings</a></li> <li><a href="#/realms/{{realm.id}}">Settings</a></li>
<li class="active">Roles</li> <li class="active">Roles</li>
</ol> </ol>
<h2 class="pull-left"><span>{{realm.realm}}</span> Roles</h2> <h2><span>{{realm.realm}}</span> Roles</h2>
<div class="feedback info" data-ng-show="!roles || roles.length == 0"> <div class="feedback info inline" data-ng-show="!roles || roles.length == 0">
<p><strong>You have not configured realm roles.</strong><br><a class="button" href="#/create/role/{{realm.id}}">Add Role</a></p> <p><strong>You have not configured realm roles.</strong> <a class="button" href="#/create/role/{{realm.id}}">Add Role</a></p>
</div> </div>
<table> <table>
<caption class="hidden" data-ng-show="roles && roles.length > 0">Table of realm roles</caption> <caption class="hidden" data-ng-show="roles && roles.length > 0">Table of realm roles</caption>