Update of /var/cvs/applications/cloudcontext/blocks
In directory james.mmbase.org:/tmp/cvs-serv14428

Modified Files:
        actions.jspx contexts.jspx groups.jspx users.jspx 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/blocks


Index: actions.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/actions.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- actions.jspx        5 Jan 2009 17:01:43 -0000       1.1
+++ actions.jspx        6 Jan 2009 10:10:13 -0000       1.2
@@ -23,10 +23,10 @@
 
   </mm:form>
 
-  <mm:import id="orderby">number</mm:import>
-  <mm:import id="directions">down</mm:import>
+  <mm:import externid="orderby" from="request">number</mm:import>
+  <mm:import externid="directions" from="request">DOWN</mm:import>
   <mm:import externid="search" />
-  <table summary="Users">
+  <table summary="Actions">
 
     <mm:listnodescontainer type="$nodetype">
 
@@ -97,8 +97,9 @@
           </mm:fieldlist>
           <td class="commands">
             <mm:maywrite>
-              <mm:link referids="gr...@node" page="action">
-                <a 
onclick="document.getElementById('object${_node}').className = 'active'; "
+              <mm:link referids="gr...@node"
+                       page="action">
+                <a
                    href="${_}">
                   <fmt:message key="update" />
                   <img src="${mm:link('/mmbase/style/images/edit.png')}"


Index: contexts.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/contexts.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- contexts.jspx       6 Jan 2009 09:22:37 -0000       1.5
+++ contexts.jspx       6 Jan 2009 10:10:13 -0000       1.6
@@ -82,7 +82,7 @@
       <tr>
         <mm:fieldlist nodetype="$nodetype"  fields="$fields">
           <th>
-            <mm:link>
+            <mm:link referids="tab">
               <mm:param name="orderby"><mm:fieldinfo type="name" /></mm:param>
               <mm:fieldinfo type="name">
                 <mm:compare referid2="orderby">
@@ -104,7 +104,8 @@
           </th>
         </mm:fieldlist>
         <th>
-          <mm:link referids="search">
+          <mm:link
+              referids="search,tab">
             <mm:compare referid="orderby" value="number">
               <mm:write referid="directions">
                 <mm:compare value="UP">
@@ -128,16 +129,26 @@
           </mm:fieldlist>
           <td class="commands">
             <mm:maywrite>
-              <mm:link referids="_n...@node"
+              <mm:link
+                  referids="_n...@node"
                        page="context">
-                <a 
onclick="document.getElementById('object${_node}').className = 'active'; "
-                   href="${_}">
+                <a href="${_}">
                   <fmt:message key="update" />
                   <img src="${mm:link('/mmbase/style/images/edit.png')}"
                        alt="" title="" />
                 </a>
               </mm:link>
             </mm:maywrite>
+            <mm:maydelete>
+              <mm:link referids="_n...@delete" page="contexts" process="true">
+                <a class="confirm post"
+                   href="${_}">
+                  <fmt:message key="delete" />
+                  <img src="${mm:link('/mmbase/style/images/delete.png')}"
+                       alt="X" title="" />
+                </a>
+              </mm:link>
+            </mm:maydelete>
           </td>
         </tr>
       </mm:listnodes>


Index: groups.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/groups.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- groups.jspx 6 Jan 2009 09:22:37 -0000       1.6
+++ groups.jspx 6 Jan 2009 10:10:13 -0000       1.7
@@ -33,8 +33,8 @@
 
   </mm:form>
 
-  <mm:import id="orderby">number</mm:import>
-  <mm:import id="directions">down</mm:import>
+  <mm:import externid="orderby">number</mm:import>
+  <mm:import externid="directions">down</mm:import>
   <mm:import externid="search" />
   <table summary="Users">
 


Index: users.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/users.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- users.jspx  6 Jan 2009 09:22:37 -0000       1.8
+++ users.jspx  6 Jan 2009 10:10:13 -0000       1.9
@@ -38,8 +38,8 @@
 
   </mm:form>
 
-  <mm:import id="orderby">number</mm:import>
-  <mm:import id="directions">down</mm:import>
+  <mm:import externid="orderby">number</mm:import>
+  <mm:import externid="directions">DOWN</mm:import>
   <mm:import externid="search" />
   <table summary="Users">
 
@@ -52,6 +52,7 @@
         </mm:fieldlist>
       </mm:present>
 
+
       <mm:size id="totalsize" write="false" />
 
       <mm:offset value="$offset" />
@@ -104,7 +105,9 @@
           </mm:link>
         </th>
       </tr>
+
       <mm:sortorder field="$orderby" direction="$directions" />
+
       <mm:listnodes id="user" varStatus="status">
         <tr id="object${_node}" class="${status.index % 2 eq 0 ? 'even' : 
'odd'}">
           <td>
@@ -128,10 +131,7 @@
                 </a>
               </mm:link>
             </mm:maywrite>
-            <mm:function name="rank" >
-              <mm:compare value="ADMIN_INT" inverse="true">
                 <mm:maydelete>
-                  <mm:import id="prompt">reallydeleteusers</mm:import>
                   <mm:link referids="u...@delete" page="users" process="true">
                     <a class="confirm post"
                        href="${_}">
@@ -141,8 +141,6 @@
                     </a>
                   </mm:link>
                 </mm:maydelete>
-            </mm:compare>
-            </mm:function>
           </td>
         </tr>
       </mm:listnodes>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to