libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #205 from vrockai/FORMS3

Browse source 
KEYCLOAK-283 role forms fixes
This commit is contained in:
Stian Thorgersen 2014-02-13 15:45:18 +00:00
commit f443d75812
7 changed files with 69 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -555,7 +555,7 @@ legend .kc-icon-collapse {
line-height: 30px; line-height: 30px;
margin-left: -2px; margin-left: -2px;
margin-top: -2px; margin-top: -2px;
padding: 5px 0.545455em; padding: 5px .496em;
width: 150%; width: 150%;
} }
.select-kc option { .select-kc option {

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

@ -59,7 +59,7 @@
</fieldset> </fieldset>
<fieldset data-ng-show="!create && (compositeSwitch || role.composite)"> <fieldset data-ng-show="!create && (compositeSwitch || role.composite)">
<legend collapsed><span class="text">Composite Realm Roles</span> </legend> <legend uncollapsed><span class="text">Composite Realm Roles</span> </legend>
<div class="form-group col-sm-10"> <div class="form-group col-sm-10">
<div class="controls changing-selectors"> <div class="controls changing-selectors">
<div class="select-title"> <div class="select-title">
@ -91,7 +91,7 @@
</fieldset> </fieldset>
<fieldset ng-show="applications.length > 0 && !create && (compositeSwitch || role.composite)"> <fieldset ng-show="applications.length > 0 && !create && (compositeSwitch || role.composite)">
<legend collapsed><span class="text">Composite Application Roles</span> </legend> <legend uncollapsed><span class="text">Composite Application Roles</span> </legend>
<div class="form-group input-select"> <div class="form-group input-select">
<label class="col-sm-2 control-label" for="applications">Application</label> <label class="col-sm-2 control-label" for="applications">Application</label>
<div class="col-sm-4"> <div class="col-sm-4">

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

@ -54,8 +54,9 @@
<fieldset ng-show="applications.length > 0"> <fieldset ng-show="applications.length > 0">
<legend><span class="text">Application Roles</span> </legend> <legend><span class="text">Application Roles</span> </legend>
<div class="form-group input-select col-sm-10"> <div class="form-group input-select">
<label class="control-label" for="applications">Application</label> <label class="col-sm-2 control-label" for="applications">Application</label>
<div class="col-sm-4">
<div class="input-group"> <div class="input-group">
<div class="select-kc"> <div class="select-kc">
<select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications|remove:application:'id')"> <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications|remove:application:'id')">
@ -63,7 +64,10 @@
</select> </select>
</div> </div>
</div> </div>
<div class="controls changing-selectors" ng-show="targetApp"> </div>
</div>
<div class="form-group" ng-show="targetApp">
<div class="controls changing-selectors col-sm-10">
<div class="select-title"> <div class="select-title">
<label class="control-label" for="app-available">Available Roles</label> <label class="control-label" for="app-available">Available Roles</label>
<select id="app-available" class="form-control" multiple size="5" <select id="app-available" class="form-control" multiple size="5"

10
admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html
View file

@ -52,8 +52,9 @@
<fieldset ng-show="applications.length > 0"> <fieldset ng-show="applications.length > 0">
<legend><span class="text">Application Roles</span> </legend> <legend><span class="text">Application Roles</span> </legend>
<div class="form-group input-select col-sm-10"> <div class="form-group input-select">
<label class="control-label" for="applications">Application</label> <label class="col-sm-2 control-label" for="applications">Application</label>
<div class="col-sm-4">
<div class="input-group"> <div class="input-group">
<div class="select-kc"> <div class="select-kc">
<select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications)"> <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications)">
@ -61,7 +62,10 @@
</select> </select>
</div> </div>
</div> </div>
<div class="controls changing-selectors" data-ng-show="targetApp"> </div>
</div>
<div class="form-group" data-ng-show="targetApp">
<div class="controls changing-selectors col-sm-10">
<div class="select-title"> <div class="select-title">
<label class="control-label" for="app-available">Available Roles</label> <label class="control-label" for="app-available">Available Roles</label>
<select id="app-available" class="form-control" multiple size="5" <select id="app-available" class="form-control" multiple size="5"

9
admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-default-roles.html
View file

@ -7,7 +7,7 @@
<li><a href="#/realms/{{realm.realm}}">Settings</a></li> <li><a href="#/realms/{{realm.realm}}">Settings</a></li>
<li class="active">Registration</li> <li class="active">Registration</li>
</ol> </ol>
<h2><span>{{realm.realm}}</span> Registration Settings</h2> <h2><span>{{realm.realm}}</span> Default Roles</h2>
<form class="form-horizontal" name="realmForm" novalidate> <form class="form-horizontal" name="realmForm" novalidate>
<fieldset> <fieldset>
<legend><span class="text">Realm Default Roles</span> </legend> <legend><span class="text">Realm Default Roles</span> </legend>
@ -46,13 +46,17 @@
<div class="form-group input-select"> <div class="form-group input-select">
<label class="col-sm-2 control-label" for="applications">Application</label> <label class="col-sm-2 control-label" for="applications">Application</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="input-group">
<div class="select-kc"> <div class="select-kc">
<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">
<option value="" selected> Select an Application...</option> <option value="" selected> Select an Application...</option>
</select> </select>
</div> </div>
</div> </div>
<div class="controls changing-selectors" ng-show="application"> </div>
</div>
<div class="form-group" ng-show="application">
<div class="controls changing-selectors col-sm-10">
<div class="select-title"> <div class="select-title">
<label class="control-label" for="available-app">Available Roles</label> <label class="control-label" for="available-app">Available Roles</label>
<select id="available-app" class="form-control" multiple size="5" <select id="available-app" class="form-control" multiple size="5"
@ -80,7 +84,6 @@
</div> </div>
</div> </div>
</fieldset> </fieldset>
</form> </form>
</div> </div>
</div> </div>

14
admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html
View file

@ -62,7 +62,7 @@
<div class="form-group"> <div class="form-group">
<div class="controls changing-selectors col-sm-10"> <div class="controls changing-selectors col-sm-10">
<div class="select-title"> <div class="select-title">
<label for="available">Available Roles</label> <label class="control-label" for="available">Available Roles</label>
<select id="available" class="form-control" multiple size="5" <select id="available" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmRoles" ng-model="selectedRealmRoles"
@ -78,7 +78,7 @@
</button> </button>
</div> </div>
<div class="select-title"> <div class="select-title">
<label for="assigned">Assigned Roles</label> <label class="control-label" for="assigned">Assigned Roles</label>
<select id="assigned" class="form-control" multiple size=5 <select id="assigned" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmMappings" ng-model="selectedRealmMappings"
@ -91,8 +91,9 @@
<fieldset ng-show="applications.length > 0 && !create && (compositeSwitch || role.composite)"> <fieldset ng-show="applications.length > 0 && !create && (compositeSwitch || role.composite)">
<legend uncollapsed><span class="text">Composite Application Roles</span> </legend> <legend uncollapsed><span class="text">Composite Application Roles</span> </legend>
<div class="form-group input-select col-sm-10"> <div class="form-group input-select">
<label for="applications">Application</label> <label class="col-sm-2 control-label" for="applications">Application</label>
<div class="col-sm-4">
<div class="input-group"> <div class="input-group">
<div class="select-kc"> <div class="select-kc">
<select id="applications" name="applications" ng-change="changeApplication()" ng-model="compositeApp" ng-options="a.name for a in applications"> <select id="applications" name="applications" ng-change="changeApplication()" ng-model="compositeApp" ng-options="a.name for a in applications">
@ -100,7 +101,10 @@
</select> </select>
</div> </div>
</div> </div>
<div class="controls changing-selectors" ng-show="compositeApp"> </div>
</div>
<div class="form-group" ng-show="compositeApp">
<div class="controls changing-selectors col-sm-10">
<div class="select-title"> <div class="select-title">
<label class="control-label" for="available-app">Available Roles</label> <label class="control-label" for="available-app">Available Roles</label>
<select id="available-app" class="form-control" multiple size="5" <select id="available-app" class="form-control" multiple size="5"

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

@ -17,10 +17,10 @@
<fieldset> <fieldset>
<legend><span class="text">Realm Roles</span> </legend> <legend><span class="text">Realm Roles</span> </legend>
<div class="form-group"> <div class="form-group col-sm-10">
<div class="controls changing-selectors col-sm-10"> <div class="controls changing-selectors">
<div class="select-title"> <div class="select-title">
<label for="available">Available Roles</label> <label class="control-label" for="available">Available Roles</label>
<select id="available" class="form-control" multiple size="5" <select id="available" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmRoles" ng-model="selectedRealmRoles"
@ -36,7 +36,7 @@
</button> </button>
</div> </div>
<div class="select-title"> <div class="select-title">
<label for="assigned">Assigned Roles</label> <label class="control-label" for="assigned">Assigned Roles</label>
<select id="assigned" class="form-control" multiple size=5 <select id="assigned" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmMappings" ng-model="selectedRealmMappings"
@ -49,8 +49,9 @@
<fieldset ng-show="applications.length > 0"> <fieldset ng-show="applications.length > 0">
<legend><span class="text">Application Roles</span> </legend> <legend><span class="text">Application Roles</span> </legend>
<div class="form-group input-select col-sm-10"> <div class="form-group input-select">
<label for="applications">Application</label> <label class="col-sm-2 control-label" for="applications">Application</label>
<div class="col-sm-4">
<div class="input-group"> <div class="input-group">
<div class="select-kc"> <div class="select-kc">
<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">
@ -58,9 +59,12 @@
</select> </select>
</div> </div>
</div> </div>
<div class="controls changing-selectors" ng-show="application"> </div>
</div>
<div class="form-group" ng-show="application">
<div class="controls changing-selectors col-sm-10">
<div class="select-title"> <div class="select-title">
<label for="available-app">Available Roles</label> <label class="control-label" for="available-app">Available Roles</label>
<select id="available-app" class="form-control" multiple size="5" <select id="available-app" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedApplicationRoles" ng-model="selectedApplicationRoles"
@ -76,7 +80,7 @@
</button> </button>
</div> </div>
<div class="select-title"> <div class="select-title">
<label for="assigned-app">Assigned Roles</label> <label class="control-label" for="assigned-app">Assigned Roles</label>
<select id="assigned-app" class="form-control" multiple size=5 <select id="assigned-app" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedApplicationMappings" ng-model="selectedApplicationMappings"