Update of /var/cvs/applications/cloudcontext/blocks
In directory james.mmbase.org:/tmp/cvs-serv29490/blocks
Modified Files:
contexts.jspx group.jspx groups.jspx user.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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- contexts.jspx 29 Dec 2008 16:08:36 -0000 1.2
+++ contexts.jspx 5 Jan 2009 12:43:23 -0000 1.3
@@ -9,8 +9,10 @@
<jsp:output omit-xml-declaration="true" />
<mm:import externid="tab" vartype="integer" from="request">0</mm:import>
- <mm:function set="cloudcontext" name="authorization" write="false"><c:set
var="nodetypes" value="${_.contextProvider.contextBuilders}" /></mm:function>
- <mm:import id="nodetype">${nodetypes[tab].tableName}</mm:import>
+ <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>
<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>
Index: group.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/group.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- group.jspx 5 Jan 2009 12:11:59 -0000 1.1
+++ group.jspx 5 Jan 2009 12:43:23 -0000 1.2
@@ -4,12 +4,17 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:sec="http://www.mmbase.org/tags/mm/security";
+
class="mm_c c_cloudcontent b_context ${requestScope.className}"
id="${requestScope.componentId}">
<jsp:output omit-xml-declaration="true" />
<mm:import externid="node" required="true" />
-
+ <script type="text/javascript">
+ $(document).ready(function() {
+ Widgets.instance.twoMultiples("#mm_ingroups,#mm_containsgroups");
+ });
+ </script>
<mm:form>
<input type="hidden" name="node" value="${node}" />
<mm:node referid="node">
Index: groups.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/groups.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- groups.jspx 5 Jan 2009 12:11:59 -0000 1.1
+++ groups.jspx 5 Jan 2009 12:43:23 -0000 1.2
@@ -12,7 +12,7 @@
<p class="action">
<mm:maycreate type="$nodetype">
<mm:link page="create_user">
- <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">
Index: user.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/user.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- user.jspx 5 Jan 2009 12:11:59 -0000 1.3
+++ user.jspx 5 Jan 2009 12:43:23 -0000 1.4
@@ -11,7 +11,7 @@
<mm:import externid="node" required="true" />
<script type="text/javascript">
$(document).ready(function() {
- Widgets.instance.twoMultiples("#mm_groups");
+ Widgets.instance.twoMultiples("#mm_ingroups,#mm_containsgroups");
});
</script>
<mm:node referid="node">
@@ -25,11 +25,6 @@
</tr>
</mm:fieldlist>
</table>
- <mm:function set="cloudcontext" name="authorization"
write="false"><c:set var="queries" value="${_.contextProvider.contextQueries}"
/></mm:function>
- <c:forEach items="${queries}" var="query">
- <sec:table query="${query}" />
- </c:forEach>
- <input type="submit" value="submit" name="submit" />
<mm:import externid="submit" />
<mm:present referid="submit">
<mm:valid>
@@ -37,6 +32,13 @@
<p>Committed</p>
</mm:valid>
</mm:present>
+ <mm:function set="cloudcontext" name="authorization"
write="false"><c:set var="queries" value="${_.contextProvider.contextQueries}"
/></mm:function>
+ <table class="rights">
+ <c:forEach items="${queries}" var="query">
+ <sec:tbody query="${query}" />
+ </c:forEach>
+ </table>
+ <input type="submit" value="submit" name="submit" />
</mm:form>
</mm:node>
Index: users.jspx
===================================================================
RCS file: /var/cvs/applications/cloudcontext/blocks/users.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- users.jspx 29 Dec 2008 16:08:36 -0000 1.5
+++ users.jspx 5 Jan 2009 12:43:23 -0000 1.6
@@ -17,7 +17,7 @@
<p class="action">
<mm:maycreate type="$nodetype">
<mm:link page="create_user">
- <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">
@@ -124,7 +124,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>
@@ -137,7 +137,7 @@
<a onclick="confirm.js"
href="${_}">
<fmt:message key="delete" />
- <img
src="${mm:link('location/images/mmbase-delete.gif')}"
+ <img src="${mm:link('/mmbase/style/images/delete.png')}"
alt="" title="" />
</a>
</mm:link>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
