Update of /var/cvs/applications/cloudcontext/blocks In directory james.mmbase.org:/tmp/cvs-serv32250
Modified Files: contexts.jspx groups.jspx users.jspx Log Message: more work on new security editors See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext/blocks Index: contexts.jspx =================================================================== RCS file: /var/cvs/applications/cloudcontext/blocks/contexts.jspx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- contexts.jspx 5 Jan 2009 12:43:23 -0000 1.3 +++ contexts.jspx 5 Jan 2009 12:57:43 -0000 1.4 @@ -2,6 +2,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core" class="mm_c c_cloudcontent b_contexts ${requestScope.className}" id="${requestScope.componentId}"> @@ -12,7 +13,8 @@ <mm:function set="cloudcontext" name="authorization" write="false"> <c:set var="queries" value="${_.contextProvider.contextQueries}" /> </mm:function> - <mm:import id="nodetype">${queries[tab].tableName}</mm:import> + <c:set var="query" value="${queries[tab]}" /> + <mm:import id="nodetype">${query.builder.tableName}</mm:import> <mm:import id="fields" externid="user_fields"><mm:write value="${mm:managerProperty(nodetype, 'security_editor_fields')}" write="true"><mm:isempty>name</mm:isempty></mm:write></mm:import> @@ -21,16 +23,30 @@ <p class="action"> <mm:maycreate type="$nodetype"> <mm:link page="create_context"> - <a href="${_}"><img src="${mm:link('images/mmbase-new.gif')}" alt="+" title="create user" /></a> + <a href="${_}"><img src="${mm:link('/mmbase/style/images/create.png')}" alt="+" title="create user" /></a> </mm:link> </mm:maycreate> <mm:maycreate type="$nodetype" inverse="true"> <fmt:message key="notallowedtocreatecontexts" /> </mm:maycreate> </p> + <c:if test="${fn:length(queries) gt 1}"> + <ol> + <c:forEach begin="0" end="${fn:length(queries) - 1}" var="t"> + <li> + <mm:link> + <mm:param name="tab" value="${t}" /> + <a href="${_}"> + <mm:nodeinfo nodetype="${queries[t].builder.tableName}" type="guinodemanager" /> + </a> + </mm:link> + </li> + </c:forEach> + </ol> + </c:if> <mm:form> - <caption><mm:nodeinfo nodetype="$nodetype" type="guitype" /></caption> <table> + <caption><mm:nodeinfo nodetype="$nodetype" type="guitype" /></caption> <mm:fieldlist nodetype="$nodetype" fields="$fields"> <tr> <td><mm:fieldinfo type="guiname" /></td> @@ -45,9 +61,9 @@ <mm:import externid="orderby" from="request">number</mm:import> <mm:import externid="directions" from="request">${orderby eq 'number' ? 'DOWN' : 'UP'}</mm:import> <mm:import externid="search" /> - <table summary="Users"> + <table summary="Contexts"> - <mm:listnodescontainer type="$nodetype"> + <mm:listnodescontainer referid="query"> <mm:import externid="offset">0</mm:import> <mm:present referid="search"> @@ -115,7 +131,7 @@ <a onclick="document.getElementById('object${_node}').className = 'active'; " href="${_}"> <fmt:message key="update" /> - <img src="${mm:link('images/mmbase-edit.gif')}" + <img src="${mm:link('/mmbase/style/images/edit.png')}" alt="" title="" /> </a> </mm:link> Index: groups.jspx =================================================================== RCS file: /var/cvs/applications/cloudcontext/blocks/groups.jspx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- groups.jspx 5 Jan 2009 12:43:23 -0000 1.2 +++ groups.jspx 5 Jan 2009 12:57:43 -0000 1.3 @@ -20,8 +20,8 @@ </mm:maycreate> </p> <mm:form> - <caption><mm:nodeinfo nodetype="$nodetype" type="guitype" /></caption> <table> + <caption><mm:nodeinfo nodetype="$nodetype" type="guitype" /></caption> <mm:fieldlist nodetype="$nodetype" type="search"> <tr> <td><mm:fieldinfo type="guiname" /></td> Index: users.jspx =================================================================== RCS file: /var/cvs/applications/cloudcontext/blocks/users.jspx,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- users.jspx 5 Jan 2009 12:43:23 -0000 1.6 +++ users.jspx 5 Jan 2009 12:57:43 -0000 1.7 @@ -25,8 +25,8 @@ </mm:maycreate> </p> <mm:form> - <caption><mm:nodeinfo nodetype="$nodetype" type="guitype" /></caption> <table> + <caption><mm:nodeinfo nodetype="$nodetype" type="guitype" /></caption> <mm:fieldlist nodetype="$nodetype" fields="$fields"> <tr> <td><mm:fieldinfo type="guiname" /></td> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs