svn commit: r1228029 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback: roles.js templates/roles-tmpl.html

[olamy]

Author: olamy
Date: Fri Jan  6 09:14:33 2012
New Revision: 1228029

URL: http://svn.apache.org/viewvc?rev=1228029&view=rev
Log:
add ids for selenium tests and force tab activation as webkit tend to fail

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=1228029&r1=1228028&r2=1228029&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
 Fri Jan  6 09:14:33 2012
@@ -163,6 +163,7 @@ $(function() {
         currentRole.users.push(removed[i]);
       }
       selectedOtherUsers([]);
+      activateRoleUsersEditTab();
     }
 
     removeUser=function(){
@@ -172,7 +173,7 @@ $(function() {
         currentRole.removedUsers.push(added[i]);
       }
       selectedUsers([]);
-
+      activateRoleUsersEditTab()
     }
     saveRoleDescription=function(){
       $.log("saveRoleDescription:"+currentRole.description());
@@ -237,4 +238,21 @@ $(function() {
     $("#roles-view-tabs-li-roles-edit").addClass("active");
   }
 
+  activateRoleUsersListTab=function(){
+    $("#main-content #role-edit-users-li").removeClass("active");
+    $("#main-content #role-edit-users").removeClass("active");
+    // activate roles grid tab
+    $("#main-content #role-view-users-li").addClass("active");
+    $("#main-content #role-view-users").addClass("active");
+  }
+
+  activateRoleUsersEditTab=function(){
+    $("#main-content #role-view-users-li").removeClass("active");
+    $("#main-content #role-view-users").removeClass("active");
+    // activate role edit tab
+    $("#main-content #role-edit-users").addClass("active");
+    $("#role-edit-users-li").addClass("active");
+  }
+
+
 });
\ No newline at end of file

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=1228029&r1=1228028&r2=1228029&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
 Fri Jan  6 09:14:33 2012
@@ -117,10 +117,10 @@
   {{/if}}
 
   <ul id="role-edit-users-tabs" class="pills">
-    <li class="active">
+    <li class="active" id="role-view-users-li">
       <a href="#role-view-users">${$.i18n.prop('role.edit.users.list')}</a>
     </li>
-    <li>
+    <li id="role-edit-users-li">
       <a href="#role-edit-users">${$.i18n.prop('edit')}</a>
     </li>
   </ul>