portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r472868 - in /portals/jetspeed-2/trunk/applications/j2-admin/src: java/org/apache/jetspeed/portlets/security/permissions/ webapp/WEB-INF/ webapp/WEB-INF/security/permissions/ webapp/WEB-INF/view/security/constraints/
Date Thu, 09 Nov 2006 11:27:14 GMT
Author: smilek
Date: Thu Nov  9 03:27:13 2006
New Revision: 472868

URL: http://svn.apache.org/viewvc?view=rev&rev=472868
Log:
updated for dojo 0.4.0

Modified:
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java?view=diff&rev=472868&r1=472867&r2=472868
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
Thu Nov  9 03:27:13 2006
@@ -98,7 +98,7 @@
         headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Dialog" );
         headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Button" );
         headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Menu2" );
-        headerResource.dojoAddModuleLibraryRequire( "jetspeed.ui.widget.EditorTable" );
+        headerResource.dojoAddModuleLibraryRequire( "jetspeed.widget.EditorTable" );
     }
     
     public void doView(RenderRequest request, RenderResponse response)

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml?view=diff&rev=472868&r1=472867&r2=472868
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml Thu Nov
 9 03:27:13 2006
@@ -1278,7 +1278,7 @@
 		</init-param>
 		<init-param>
 			<name>dojo.requires.modules</name>
-			<value>jetspeed.ui.widget.EditorTable;jetspeed.desktop.compatibility</value>
+			<value>jetspeed.widget.EditorTable;jetspeed.desktop.compatibility</value>
 		</init-param>
         <portlet-name>SecurityConstraintsPortlet</portlet-name>
     	<display-name>Security Constraints</display-name>        

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm?view=diff&rev=472868&r1=472867&r2=472868
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
Thu Nov  9 03:27:13 2006
@@ -26,7 +26,7 @@
     layoutChildPriority="left-right"
     style="width: 100%">
 
-<div id="mainTabContainer" dojoType="TabContainer" selectedTab="portlets" doLayout="false">
+<div id="mainTabContainer" dojoType="TabContainer" selectedChild="portlets" doLayout="false">
 
 <div id="portlets" dojoType="ContentPane" label="Portlets">
 <div class="tableContainer">
@@ -212,7 +212,7 @@
         {
             actionCheckbox.checked = false;
             actionCheckbox.disabled = true;
-            actionCheckbox._updateImgSrc();
+            actionCheckbox._setInfo();
         }
     }
     for ( var i = 0 ; i < rolePrincipals.length; i++ )
@@ -223,7 +223,7 @@
         {
             roleCheckbox.checked = false;
             roleCheckbox.disabled = true;
-            roleCheckbox._updateImgSrc();
+            roleCheckbox._setInfo();
         }
     }
 
@@ -262,9 +262,9 @@
         var actionCheckbox = dojo.widget.byId( "action" + actionNames[i] );
         if ( actionCheckbox )
         {
-            actionCheckbox.disabled = "enabled";
+            actionCheckbox.disabled = false;
             actionCheckbox.checked = false;
-            actionCheckbox._updateImgSrc();
+            actionCheckbox._setInfo();
         }
     }
 
@@ -277,7 +277,7 @@
             if ( actionCheckbox )
             {
                 actionCheckbox.checked = true;
-                actionCheckbox._updateImgSrc();
+                actionCheckbox._setInfo();
             }
         }
     }
@@ -286,9 +286,9 @@
     {
         var roleIndex = i + 1;
         var roleCheckbox = dojo.widget.byId( "role_" + roleIndex );
-        roleCheckbox.disabled = "enabled";
+        roleCheckbox.disabled = false;
         roleCheckbox.checked = false;
-        roleCheckbox._updateImgSrc();
+        roleCheckbox._setInfo();
     }
     var rolesList = rowData.roles.split( new RegExp( " *, *" ) );
     if ( rolesList )
@@ -305,7 +305,7 @@
                     if ( roleCheckbox )
                     {
                         roleCheckbox.checked = true;
-                        roleCheckbox._updateImgSrc();
+                        roleCheckbox._setInfo();
                     }
                 }
             }
@@ -317,7 +317,7 @@
 function getTableWidget( containedInTab )
 {
     if ( ! containedInTab )
-        containedInTab = dojo.widget.byId( "mainTabContainer" ).selectedTabWidget;
+        containedInTab = dojo.widget.byId( "mainTabContainer" ).selectedChildWidget;
     return dojo.widget.byId( containedInTab.widgetId + "Table" );
 }
 function checkForChanges()
@@ -534,7 +534,7 @@
 function addListeners()
 {
     var tabContainer = dojo.widget.byId("mainTabContainer");
-    dojo.event.connect("around", tabContainer, "selectTab", function(invocation) {
+    dojo.event.connect("around", tabContainer, "selectChild", function(invocation) {
         if ( checkForChanges() )
         {
             dojo.widget.byId( "SaveWarningDialog" ).show();
@@ -622,8 +622,8 @@
         var actionCheckbox = dojo.widget.byId( "action" + actionNames[i] );
         if ( actionCheckbox )
         {
-            dojo.event.connect(actionCheckbox, "onMouseUp", function() {
-                if(actionCheckbox.disabled == "enabled"){
+            dojo.event.connect(actionCheckbox, "onClick", function() {
+                if(!actionCheckbox.disabled){
                     updateSelectedRow();
                 }
             });
@@ -635,8 +635,8 @@
         var roleCheckbox = dojo.widget.byId( "role_" + roleIndex );
         if ( roleCheckbox )
         {
-            dojo.event.connect(roleCheckbox, "onMouseUp", function() {
-                if(roleCheckbox.disabled == "enabled"){
+            dojo.event.connect(roleCheckbox, "onClick", function() {
+                if(!roleCheckbox.disabled){
                     updateSelectedRow();
                 }
             });

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm?view=diff&rev=472868&r1=472867&r2=472868
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
Thu Nov  9 03:27:13 2006
@@ -5,7 +5,7 @@
      layoutChildPriority="left-right"
      style="width: 100%">
     
-    <div id="mainTabContainer" dojoType="TabContainer" selectedTab="portlets" doLayout="false">
+    <div id="mainTabContainer" dojoType="TabContainer" selectedChild="defs" doLayout="false">
 
         <div id="defs" dojoType="ContentPane" label="Definitions">
             <div class="tableContainer">
@@ -418,9 +418,9 @@
         var actionCheckbox = dojo.widget.byId( "action" + actionNames[i] );
         if ( actionCheckbox )
         {
-            actionCheckbox.disabled = "enabled";
+            actionCheckbox.disabled = false;
             actionCheckbox.checked = false;
-            actionCheckbox._updateImgSrc();
+            actionCheckbox._setInfo();
         }
     }
 
@@ -433,7 +433,7 @@
             if ( actionCheckbox )
             {
                 actionCheckbox.checked = true;
-                actionCheckbox._updateImgSrc();
+                actionCheckbox._setInfo();
             }
         }
     }
@@ -442,9 +442,9 @@
     {
         var roleIndex = i + 1;
         var roleCheckbox = dojo.widget.byId( "role_" + roleIndex );
-        roleCheckbox.disabled = "enabled";
+        roleCheckbox.disabled = false;
         roleCheckbox.checked = false;
-        roleCheckbox._updateImgSrc();
+        roleCheckbox._setInfo();
     }
     var rolesList = rowData.roles.split( new RegExp( " *, *" ) );
     if ( rolesList )
@@ -461,7 +461,7 @@
                     if ( roleCheckbox )
                     {
                         roleCheckbox.checked = true;
-                        roleCheckbox._updateImgSrc();
+                        roleCheckbox._setInfo();
                     }
                 }
             }
@@ -472,9 +472,9 @@
     {
         var groupIndex = i + 1;
         var groupCheckbox = dojo.widget.byId( "group_" + groupIndex );
-        groupCheckbox.disabled = "enabled";
+        groupCheckbox.disabled = false;
         groupCheckbox.checked = false;
-        groupCheckbox._updateImgSrc();
+        groupCheckbox._setInfo();
     }
     var groupsList = rowData.groups.split( new RegExp( " *, *" ) );
     if ( groupsList )
@@ -491,7 +491,7 @@
                     if ( groupCheckbox )
                     {
                         groupCheckbox.checked = true;
-                        groupCheckbox._updateImgSrc();
+                        groupCheckbox._setInfo();
                     }
                 }
             }
@@ -527,7 +527,7 @@
         {
             actionCheckbox.checked = false;
             actionCheckbox.disabled = true;
-            actionCheckbox._updateImgSrc();
+            actionCheckbox._setInfo();
         }
     }
     for ( var i = 0 ; i < rolePrincipals.length; i++ )
@@ -538,7 +538,7 @@
         {
             roleCheckbox.checked = false;
             roleCheckbox.disabled = true;
-            roleCheckbox._updateImgSrc();
+            roleCheckbox._setInfo();
         }
     }
     for ( var i = 0 ; i < groupPrincipals.length; i++ )
@@ -549,7 +549,7 @@
         {
             groupCheckbox.checked = false;
             groupCheckbox.disabled = true;
-            groupCheckbox._updateImgSrc();
+            groupCheckbox._setInfo();
         }
     }
 
@@ -910,8 +910,14 @@
 function getTableWidget( containedInTab )
 {
     if ( ! containedInTab )
-        containedInTab = dojo.widget.byId( "mainTabContainer" ).selectedTabWidget;
-    return dojo.widget.byId( containedInTab.widgetId + "Table" );
+        containedInTab = dojo.widget.byId( "mainTabContainer" ).selectedChildWidget;
+    if ( ! containedInTab )
+        alert( "no selected mainTabContainer child widget" );
+    var tableWidgetId = containedInTab.widgetId + "Table";
+    var tableWidget = dojo.widget.byId( tableWidgetId );
+    if ( ! tableWidget )
+        alert( "no table widget " + tableWidgetId + " could be found" );
+    return tableWidget;
 }
 function checkForChanges()
 {
@@ -1000,7 +1006,7 @@
     // ... mainTabContainer
 
     var tabContainer = dojo.widget.byId("mainTabContainer");
-    dojo.event.connect("around", tabContainer, "selectTab", function(invocation) {
+    dojo.event.connect("around", tabContainer, "selectChild", function(invocation) {
         if ( ! okToChangeSelectionOrExit() )
         {
             return false;  // was return (with no value) 2006/08/29
@@ -1128,8 +1134,8 @@
         var actionCheckbox = dojo.widget.byId( "action" + actionNames[i] );
         if ( actionCheckbox )
         {
-            dojo.event.connect(actionCheckbox, "onMouseUp", function() {
-                if(actionCheckbox.disabled == "enabled"){
+            dojo.event.connect(actionCheckbox, "onClick", function() {
+                if(!actionCheckbox.disabled){
                     updateSelectedConstraintsRow();
                 }
             });
@@ -1141,8 +1147,8 @@
         var roleCheckbox = dojo.widget.byId( "role_" + roleIndex );
         if ( roleCheckbox )
         {
-            dojo.event.connect(roleCheckbox, "onMouseUp", function() {
-                if(roleCheckbox.disabled == "enabled"){
+            dojo.event.connect(roleCheckbox, "onClick", function() {
+                if(!roleCheckbox.disabled){
                     updateSelectedConstraintsRow();
                 }
             });
@@ -1154,8 +1160,8 @@
         var groupCheckbox = dojo.widget.byId( "group_" + groupIndex );
         if ( groupCheckbox )
         {
-            dojo.event.connect(groupCheckbox, "onMouseUp", function() {
-                if(groupCheckbox.disabled == "enabled"){
+            dojo.event.connect(groupCheckbox, "onClick", function() {
+                if(!groupCheckbox.disabled){
                     updateSelectedConstraintsRow();
                 }
             });



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message