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

Merge pull request #75 from patriot1burke/master

Browse source 
ui fixes
This commit is contained in:
Bill Burke 2013-10-16 14:56:21 -07:00
commit 7966afb434
12 changed files with 140 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
View file

@ -34,6 +34,14 @@ module.config([ '$routeProvider', function($routeProvider) {
} }
}, },
controller : 'RealmTokenDetailCtrl' controller : 'RealmTokenDetailCtrl'
}).when('/realms/:realm/social-settings', {
templateUrl : 'partials/realm-social.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
}
},
controller : 'RealmTokenDetailCtrl'
}) })
.when('/realms/:realm/required-credentials', { .when('/realms/:realm/required-credentials', {
templateUrl : 'partials/realm-credentials.html', templateUrl : 'partials/realm-credentials.html',

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

@ -11,10 +11,9 @@
<div id="content"> <div id="content">
<h2 class="pull-left">Applications</h2> <h2 class="pull-left">Applications</h2>
<table> <table>
<caption data-ng-show="applications && applications.length > 0">Table of realm applications</caption>
<caption data-ng-show="!applications || applications.length == 0">No configured applications...</caption> <caption data-ng-show="!applications || applications.length == 0">No configured applications...</caption>
<thead> <thead>
<tr data-ng-show="applications && applications.length > 5"> <tr >
<th class="rcue-table-actions" colspan="3"> <th class="rcue-table-actions" colspan="3">
<div class="search-comp clearfix"> <div class="search-comp clearfix">
<input type="text" placeholder="Search..." class="search"> <input type="text" placeholder="Search..." class="search">
@ -23,6 +22,10 @@
Icon: search Icon: search
</button> </button>
</div> </div>
<div class="actions">
<a class="button" href="#/create/application/{{realm.id}}">Add</a>
<button class="remove disabled">Remove</button>
</div>
</th> </th>
</tr> </tr>
<tr> <tr>

47
admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html
View file

@ -15,30 +15,39 @@
</ul> </ul>
</div> </div>
<div id="content"> <div id="content">
<h2 class="pull-left">Application Scope Mappings for <span>{{application.name}}</span></h2> <h2 class="pull-left"><span>{{application.name}}</span> Scope Mappings</h2>
<p class="subtitle"></p> <p class="subtitle"></p>
<form name="realmForm" novalidate> <form name="realmForm" novalidate>
<fieldset> <legend uncollapsed><span class="text">Realm Roles</span> </legend>
<legend uncollapsed><span class="text">Realm Scope</span> </legend> <fieldset class="border-top">
<div class="form-group"> <div class="form-group">
<div class="controls"> <div class="controls changing-selectors">
<select multiple size="5" <div class="select-title">
<label for="available">Available Roles</label>
<select id="available" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmRoles" ng-model="selectedRealmRoles"
ng-options="r.name for r in realmRoles"> ng-options="r.name for r in realmRoles">
</select> </select>
<button type="submit" ng-click="addRealmRole()">---&gt;</button> </div>
<button type="submit" ng-click="deleteRealmRole()">&lt;---</button> <div class="middle-buttons">
<select multiple size=5 <button type="submit" ng-click="addRealmRole()" data-original-title="Move right" class="tooltipRightTrigger"><span class="icon-arrow-right">Move right</span></button>
<button type="submit" ng-click="deleteRealmRole()" data-original-title="Move left" class="tooltipRightTrigger"><span class="icon-arrow-left">Move left</span></button>
</div>
<div class="select-title">
<label for="assigned">Assigned Roles</label>
<select id="assigned" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmMappings" ng-model="selectedRealmMappings"
ng-options="r.name for r in realmMappings"> ng-options="r.name for r in realmMappings">
</select> </select>
</div> </div>
</div> </div>
</div>
</fieldset> </fieldset>
<fieldset ng-show="applications.length > 0"> <fieldset ng-show="applications.length > 0">
<legend collapsed><span class="text">Application Scope</span> </legend> <legend collapsed><span class="text">Application Roles</span> </legend>
<div class="form-group input-select"> <div class="form-group input-select">
<label for="applications">Application: </label> <label for="applications">Application: </label>
<div class="input-group"> <div class="input-group">
@ -48,22 +57,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-show="application"> <div class="form-group">
<div class="controls"> <div class="controls changing-selectors">
<select multiple size="5" <div class="select-title">
<label for="app-available">Available Roles</label>
<select id="app-available" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedApplicationRoles" ng-model="selectedApplicationRoles"
ng-options="r.name for r in applicationRoles"> ng-options="r.name for r in applicationRoles">
</select> </select>
<button type="submit" ng-click="addApplicationRole()">---&gt;</button> </div>
<button type="submit" ng-click="deleteApplicationRole()">&lt;---</button> <div class="middle-buttons">
<select multiple size=5 <button type="submit" ng-click="addApplicationRole()" data-original-title="Move right" class="tooltipRightTrigger"><span class="icon-arrow-right">Move right</span></button>
<button type="submit" ng-click="deleteApplicationRole()" data-original-title="Move left" class="tooltipRightTrigger"><span class="icon-arrow-left">Move left</span></button>
</div>
<div class="select-title">
<label for="app-assigned">Assigned Roles</label>
<select id="app-assigned" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedApplicationMappings" ng-model="selectedApplicationMappings"
ng-options="r.name for r in applicationMappings"> ng-options="r.name for r in applicationMappings">
</select> </select>
</div> </div>
</div> </div>
</div>
</fieldset> </fieldset>
</form> </form>
</div> </div>

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

@ -5,7 +5,7 @@
<div class="top-nav" data-ng-hide="createRealm"> <div class="top-nav" data-ng-hide="createRealm">
<ul class="rcue-tabs"> <ul class="rcue-tabs">
<li><a href="#/realms/{{realm.id}}">General</a></li> <li><a href="#/realms/{{realm.id}}">General</a></li>
<li data-ng-show="realm.social"><a href="#">Social</a></li> <li data-ng-show="realm.social"><a href="#/realms/{{realm.id}}/social-settings">Social</a></li>
<li><a href="#/realms/{{realm.id}}/roles">Roles</a></li> <li><a href="#/realms/{{realm.id}}/roles">Roles</a></li>
<li class="active"><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li> <li class="active"><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li>
<li><a href="#/realms/{{realm.id}}/token-settings">Token</a></li> <li><a href="#/realms/{{realm.id}}/token-settings">Token</a></li>

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

@ -5,7 +5,7 @@
<div class="top-nav" data-ng-hide="createRealm"> <div class="top-nav" data-ng-hide="createRealm">
<ul class="rcue-tabs"> <ul class="rcue-tabs">
<li class="active"><a href="#/realms/{{realm.id}}">General</a></li> <li class="active"><a href="#/realms/{{realm.id}}">General</a></li>
<li data-ng-show="realm.social"><a href="#">Social</a></li> <li data-ng-show="realm.social"><a href="#/realms/{{realm.id}}/social-settings">Social</a></li>
<li><a href="#/realms/{{realm.id}}/roles">Roles</a></li> <li><a href="#/realms/{{realm.id}}/roles">Roles</a></li>
<li><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li> <li><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li>
<li><a href="#/realms/{{realm.id}}/token-settings">Token</a></li> <li><a href="#/realms/{{realm.id}}/token-settings">Token</a></li>

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

@ -1,5 +1,5 @@
<ul data-ng-hide="createRealm"> <ul data-ng-hide="createRealm">
<li data-ng-class="(!path[2] || path[1] == 'role' || path[2] == 'roles' || path[2] == 'token-settings' || path[2] == 'required-credentials') && 'active'"><a href="#/realms/{{realm.id}}">Settings</a></li> <li data-ng-class="(!path[2] || path[1] == 'role' || path[2] == 'roles' || path[2] == 'token-settings' || path[2] == 'social-settings' || path[2] == 'required-credentials') && 'active'"><a href="#/realms/{{realm.id}}">Settings</a></li>
<li data-ng-class="(path[2] == 'users' || path[1] == 'user') && 'active'"><a href="#/realms/{{realm.id}}/users">Users</a> <li data-ng-class="(path[2] == 'users' || path[1] == 'user') && 'active'"><a href="#/realms/{{realm.id}}/users">Users</a>
</li> </li>
<li data-ng-class="(path[2] == 'applications' || path[1] == 'application') && 'active'"><a href="#/realms/{{realm.id}}/applications">Applications</a></li> <li data-ng-class="(path[2] == 'applications' || path[1] == 'application') && 'active'"><a href="#/realms/{{realm.id}}/applications">Applications</a></li>

33
admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html Executable file
View file

@ -0,0 +1,33 @@
<div id="wrapper" class="container">
<div class="row">
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<div class="top-nav" data-ng-hide="createRealm">
<ul class="rcue-tabs">
<li><a href="#/realms/{{realm.id}}">General</a></li>
<li class="active" data-ng-show="realm.social"><a href="#/realms/{{realm.id}}/social-settings">Social</a></li>
<li><a href="#/realms/{{realm.id}}/roles">Roles</a></li>
<li><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li>
<li><a href="#/realms/{{realm.id}}/token-settings">Token</a></li>
</ul>
</div>
<div id="content">
<h2 class="pull-left"><span>{{realm.realm}}</span> Social Providers</h2>
<p class="subtitle"></p>
<form name="realmForm" novalidate>
<fieldset>
<legend uncollapsed><span class="text">Social Settings</span></legend>
</fieldset>
<div class="form-actions">
<button type="submit" data-ng-click="save()" class="primary" data-ng-show="changed">Save
changes
</button>
<button type="submit" data-ng-click="reset()" data-ng-show="changed">Clear changes
</button>
</div>
</form>
</div>
</div>
<div id="container-right-bg"></div>
</div>
</div>

5
admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
View file

@ -5,7 +5,7 @@
<div class="top-nav" data-ng-hide="createRealm"> <div class="top-nav" data-ng-hide="createRealm">
<ul class="rcue-tabs"> <ul class="rcue-tabs">
<li><a href="#/realms/{{realm.id}}">General</a></li> <li><a href="#/realms/{{realm.id}}">General</a></li>
<li data-ng-show="realm.social"><a href="#">Social</a></li> <li data-ng-show="realm.social"><a href="#/realms/{{realm.id}}/social-settings">Social</a></li>
<li><a href="#/realms/{{realm.id}}/roles">Roles</a></li> <li><a href="#/realms/{{realm.id}}/roles">Roles</a></li>
<li><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li> <li><a href="#/realms/{{realm.id}}/required-credentials">Credentials</a></li>
<li class="active"><a href="#/realms/{{realm.id}}/token-settings">Token</a></li> <li class="active"><a href="#/realms/{{realm.id}}/token-settings">Token</a></li>
@ -19,7 +19,8 @@
</ol> </ol>
<h2><span>{{realm.realm}}</span> Token Settings</h2> <h2><span>{{realm.realm}}</span> Token Settings</h2>
<form name="realmForm" novalidate> <form name="realmForm" novalidate>
<fieldset class="border-top"> <fieldset>
<legend uncollapsed><span class="text">Token Settings</span></legend>
<div class="form-group input-select"> <div class="form-group input-select">
<label for="tokenLifespan">Token lifespan</label> <label for="tokenLifespan">Token lifespan</label>
<div class="input-group"> <div class="input-group">

2
admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html
View file

@ -50,7 +50,7 @@
<fieldset ng-show="applications.length > 0"> <fieldset ng-show="applications.length > 0">
<legend collapsed><span class="text">Application Roles</span> </legend> <legend collapsed><span class="text">Application Roles</span> </legend>
<div class="form-group input-select"> <div class="form-group input-select">
<label for="applications">Application</label> <label for="applications">Application: </label>
<div class="input-group"> <div class="input-group">
<div class="select-rcue"> <div class="select-rcue">
<select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications"> <select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications">

2
admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
View file

@ -28,7 +28,7 @@
</div> </div>
<div class="actions"> <div class="actions">
<a class="button" href="#/create/user/{{realm.id}}">Add User</a> <a class="button" href="#/create/user/{{realm.id}}">Add User</a>
<!-- <button class="remove disabled">Remove</button> --> <button class="remove disabled">Remove</button>
</div> </div>
</th> </th>
</tr> </tr>

2
model/api/src/main/java/org/keycloak/models/Constants.java
View file

@ -5,7 +5,7 @@ package org.keycloak.models;
* @version $Revision: 1 $ * @version $Revision: 1 $
*/ */
public interface Constants { public interface Constants {
String ADMIN_REALM = "Keycloak Adminstration"; String ADMIN_REALM = "Keycloak Administration";
String ADMIN_CONSOLE_APPLICATION = "Admin Console"; String ADMIN_CONSOLE_APPLICATION = "Admin Console";
String ADMIN_CONSOLE_ADMIN_ROLE = "admin"; String ADMIN_CONSOLE_ADMIN_ROLE = "admin";
String APPLICATION_ROLE = "KEYCLOAK_APPLICATION"; String APPLICATION_ROLE = "KEYCLOAK_APPLICATION";