Author: olamy
Date: Wed Jan 4 08:50:59 2012
New Revision: 1227083
URL: http://svn.apache.org/viewvc?rev=1227083&view=rev
Log:
add buttons to switch from users assigned role view to update view
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1227083&r1=1227082&r2=1227083&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
Wed Jan 4 08:50:59 2012
@@ -67,6 +67,15 @@ $(function() {
}
);
}
+
+ this.updateMode=function(){
+ $("#main-content #role-list-users").hide();
+ $("#main-content #role-edit-users").show();
+ }
+ this.viewMode=function(){
+ $("#main-content #role-edit-users").hide();
+ $("#main-content #role-list-users").show();
+ }
}
/**
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1227083&r1=1227082&r2=1227083&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
Wed Jan 4 08:50:59 2012
@@ -119,18 +119,23 @@
<div class="page-header">
<h3>${$.i18n.prop('role.edit.users.defined.in.current.role')}</h3>
</div>
+ <div id="role-list-users">
+ {{if $data.users}}
+ <ul>
+ {{each users}}
+ <li>${$value.fullName} - ( ${$value.username} - ${$value.email} )
</li>
+ {{/each}}
+ </ul>
+ {{else}}
+ ${$.i18n.prop('role.edit.no.user.defined')}
+ {{/if}}
- {{if $data.users}}
- <ul>
- {{each users}}
- <li>${$value.fullName} - ( ${$value.username} - ${$value.email} ) </li>
- {{/each}}
- </ul>
- {{else}}
- ${$.i18n.prop('role.edit.no.user.defined')}
- {{/if}}
+ <button class="btn"
data-bind="click:updateMode">${$.i18n.prop('role.update.mode')}</button>
+
+ </div>
+
+ <div id="role-edit-users" class="clearfix ar-multiselect"
style="display:none">
- <div id="role-edit-users" class="clearfix ar-multiselect">
<div class="ar-multiselect-column ar-multiselect-left">
<select data-bind="options: otherUsers ,optionsText:
'username',selectedOptions:selectedOtherUsers" multiple="true"
id="role-edit-available-users"></select>
</div>
@@ -144,6 +149,8 @@
<select data-bind="options: users ,optionsText:
'username',selectedOptions:selectedUsers" multiple="true"
id="role-edit-affected-users"></select>
</div>
<button class="btn" data-bind="click:
saveUsers">${$.i18n.prop('save')}</button>
+ <br/>
+ <button class="btn"
data-bind="click:viewMode">${$.i18n.prop('role.view.mode')}</button>
</div>
</script>
