Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv23197
Modified Files:
roles.jsp roles_cmd.jsp
Log Message:
jspx, cleaned up, removed dependency on progress app
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
Index: roles.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/roles.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- roles.jsp 28 Sep 2007 14:43:31 -0000 1.16
+++ roles.jsp 1 Feb 2008 15:29:33 -0000 1.17
@@ -1,25 +1,18 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%>
-<mm:content postprocessor="reducespace">
-<mm:cloud method="delegate">
-<jsp:directive.include file="/shared/setImports.jsp" />
-<jsp:directive.include file="roles_defs.jsp" />
+<jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <mm:content postprocessor="none">
+ <mm:cloud method="delegate">
+ <mm:import id="wizardlang">${language}</mm:import>
+ <jsp:directive.include file="mode.include.jsp" />
-<mm:import id="wizardlang">en</mm:import>
-<mm:compare referid="language" value="nl">
- <mm:import id="wizardlang" reset="true">nl</mm:import>
-</mm:compare>
-
-<mm:import id="wizardjsp"><mm:treefile write="true"
page="/mmbase/edit/wizard/jsp/wizard.jsp" objectlist="$includePath"
/>?referrer=/education/wizards/ok.jsp&language=<mm:write referid="wizardlang"
/></mm:import>
-<mm:import externid="command">-1</mm:import>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>Roles editen</title>
+ <title>Roles editen</title> <!-- DUTCH -->
</head>
<style type="text/css">
+ <!-- horrible class names -->
table.tightborder {
border-color: #000000;
border-style: solid;
@@ -28,7 +21,7 @@
border-right-width: 0px;
border-bottom-width: 0px;
}
- td.tightborder {
+ table.tightborder td {
border-color: #000000;
border-style: solid;
border-left-width: 0px;
@@ -37,89 +30,93 @@
border-bottom-width: 1px;
}
</style>
- <%--
- <script type="text/javascript" src="<mm:treefile
page="/editwizards/javascript/list.js" objectlist="$includePath"
referids="$referids"/>"></script>--%>
<body>
- <mm:import id="editcontextname" reset="true">rollen</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
- <form name="roleform" action="<mm:treefile
page="/education/wizards/roles_cmd.jsp" objectlist="$includePath"
referids="$referids"/>" method="post">
- <input type="hidden" name="command" value="-1">
+ <di:has editcontext="rollen">
+ <mm:treefile id="url" page="/education/wizards/roles_cmd.jsp"
objectlist="$includePath" referids="$referids" write="false" />
+ <form name="roleform" action="${url}" method="post">
+ <input type="hidden" name="command" value="-1" />
<mm:import id="numofroles" jspvar="numOfRoles"
vartype="Integer">0</mm:import>
<table class="tightborder" border="1" cellpadding="0"
cellspacing="0">
<tr align="center">
- <td class="tightborder"> </td>
+ <td>
+ &nbsp;
+ </td>
<mm:listnodes type="roles" orderby="name">
- <mm:import id="numofroles" jspvar="numOfRoles"
vartype="Integer" reset="true"><mm:size/></mm:import>
- <mm:field name="name" jspvar="name" vartype="String">
- <% name =
name.replaceAll("\\s+","_").replaceAll("\"","''"); %>
- <mm:import id="template"
reset="true">s(150!x30!)+font(mm:fonts/didactor.ttf)+fill(000000)+pointsize(13)+gravity(NorthWest)+text(0,20,"<%=
name %>")+rotate(-90)</mm:import>
- </mm:field>
- <td class="tightborder">
- <mm:node number="progresstextbackground">
- <img src="<mm:image template="$template"/>">
- </mm:node>
+ <td>
+ <di:rotatedtext text="${_node.name}" />
</td>
</mm:listnodes>
- <td class="tightborder" width="30"> </td>
+ <td width="30">&nbsp;</td>
</tr>
<tr align="center" valign="middle" height="25">
- <td class="tightborder"> </td>
- <mm:islessthan inverse="true" referid="rights"
referid2="RIGHTS_RWD">
+ <td>&nbsp;</td>
+ <di:has editcontext="rollen" action="rwd">
<mm:listnodes type="roles" orderby="name">
- <td class="tightborder"><a href="<mm:treefile
page="/education/wizards/roles_cmd.jsp" objectlist="$includePath"
referids="$referids">
+ <mm:link referid="url" referids="[EMAIL PROTECTED]">
<mm:param name="command">deleterole</mm:param>
- <mm:param name="rolenumber"><mm:field
name="number"/></mm:param>
- </mm:treefile>" onClick="return doDelete('<di:translate
key="education.areyousuredelrole" />');"
- target="text"><img src="<mm:treefile
page="/education/wizards/gfx/minus.gif"
- objectlist="$includePath" referids="$referids"/>"
border="0"
- title="<di:translate key="education.deletethisrole"/>"
alt="<di:translate key="education.deletethisrole"/>" /></a></td>
+ <td>
+ <a href="${_}"
+ onClick="return
doDelete('${di:translate('education.areyousuredelrole')}');"
+ target="text">
+ <img
src="${mm:treelink('/education/wizards/gfx/minus.gif', includePath)}"
+ border="0"
+
title="${di:translate('education.deletethisrole')}"
+
alt="${di:translate('education.deletethisrole')}"
+ />
+ </a>
+ </td>
+ </mm:link>
</mm:listnodes>
- </mm:islessthan>
- <mm:islessthan referid="rights" referid2="RIGHTS_RWD">
- <% for(int i=0; i<numOfRoles.intValue();i++) { %>
- <td class="tightborder"> </td>
- <% } %>
- </mm:islessthan>
- <td class="tightborder"><a href='<mm:write
referid="wizardjsp"/>&wizard=config/role/roles&objectnumber=new'
target="text"><img src="<mm:treefile page="/education/wizards/gfx/plus.gif"
objectlist="$includePath" referids="$referids"/>" border="0"
- title="<di:translate
key="education.createnewrole"/>" alt="<di:translate
key="education.createnewrole"/>" /></a></td>
+ </di:has>
+ <di:has editcontext="rollen" action="rwd" inverse="true">
+ <mm:listnodes type="roles" orderby="name">
+ <td>&nbsp;</td>
+ </mm:listnodes>
+ </di:has>
+ <td>
+ <mm:link referid="wizardjsp">
+ <mm:param name="wizard">config/role/roles</mm:param>
+ <mm:param name="objectnumber">new</mm:param>
+ <a href="${_}" target="text">
+ <img
src="${mm:treelink('/education/wizards/gfx/plus.gif', includePath)}"
+ border="0"
+ title="${di:translate('education.createnewrole')}"
+ alt="${di:translate('education.createnewrole')}"
+ />
+ </a>
+ </mm:link>
+ </td>
</tr>
- <% String sSelectName = ""; %>
- <mm:listnodes type="editcontexts" orderby="number">
- <mm:field name="number" id="this_editcontext" jspvar="dummy"
vartype="String">
- <% sSelectName = "select_" + dummy + "_"; %>
- </mm:field>
+ <mm:listnodes type="editcontexts" orderby="number"
id="this_editcontext">
<tr>
- <td class="tightborder"><mm:field name="name"/></td>
+ <td><mm:field name="name"/></td>
<mm:listnodes type="roles" orderby="name">
- <% String sSelectFullName = ""; %>
- <mm:field name="number" jspvar="dummy" vartype="String">
- <% sSelectFullName = sSelectName + dummy; %>
- </mm:field>
- <mm:import id="rights" reset="true">0</mm:import>
<mm:related path="posrel,editcontexts"
constraints="editcontexts.number='$this_editcontext'">
- <mm:import id="rights" reset="true"><mm:field
name="posrel.pos"/></mm:import>
+ <mm:field id="right" name="posrel.pos" write="false"/>
</mm:related>
- <td class="tightborder">
- <select name="<%= sSelectFullName%>">
- <option value="0" style="background-color:#FF3300"
<mm:compare referid="rights"
referid2="RIGHTS_NO">selected</mm:compare>></option>
- <option value="2" style="background-color:#FFFF00"
<mm:compare referid="rights"
referid2="RIGHTS_RW">selected</mm:compare>>rw</option>
- <option value="3" style="background-color:#33FF00"
<mm:compare referid="rights"
referid2="RIGHTS_RWD">selected</mm:compare>>rwd</option>
+ <td>
+ <select name="select_${this_editcontext}_${_node}">
+ <mm:option value="0" compare="${right}"
style="background-color:#FF3300">ro</mm:option>
+ <mm:option value="2" compare="${right}"
style="background-color:#FFFF00">rw</mm:option>
+ <mm:option value="3" compare="${right}"
style="background-color:#33FF00">rwd</mm:option>
</select>
</td>
</mm:listnodes>
- <td class="tightborder"> </td>
+ <td >&nbsp;</td>
</tr>
</mm:listnodes>
</table>
</form>
<span style="background-color:#33FF00">rwd</span> = <di:translate
key="education.abbreviationrwd" /><br/>
- <span style="background-color:#FFFF00">rw </span> = <di:translate
key="education.abbreviationrw" /><br/>
+ <span style="background-color:#FFFF00">rw&nbsp;</span> =
<di:translate key="education.abbreviationrw" /><br/>
<br/>
- <input type="button" class="formbutton"
onClick="roleform.command.value='accept';roleform.submit()"
value="<di:translate key="education.save" />">
- <input type="button" class="formbutton" onClick="roleform.reset()"
value="<di:translate key="education.reset" />">
- </mm:islessthan>
+ <input type="button" class="formbutton"
onClick="roleform.command.value='accept';roleform.submit()"
+ value="${di:translate('education.save')}" />
+ <input type="button" class="formbutton" onClick="roleform.reset()"
+ value="${di:translate('education.reset')}" />
+ </di:has>
</body>
</html>
-</mm:cloud>
-</mm:content>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
Index: roles_cmd.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/roles_cmd.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- roles_cmd.jsp 1 Nov 2006 10:10:37 -0000 1.5
+++ roles_cmd.jsp 1 Feb 2008 15:29:33 -0000 1.6
@@ -1,61 +1,51 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"%>
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di" %>
-
-<mm:content postprocessor="reducespace">
-<mm:cloud method="delegate">
-<mm:notpresent referid="user">
- <jsp:directive.include file="/shared/setImports.jsp" />
-</mm:notpresent>
-<jsp:directive.include file="roles_defs.jsp" />
-
-
-<mm:import externid="command">-1</mm:import>
-<mm:compare referid="command" value="deleterole">
- <mm:import id="editcontextname" reset="true">rollen</mm:import>
- <[EMAIL PROTECTED] file="/education/wizards/roles_chk.jsp" %>
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RWD">
-
+<jsp:root version="2.0"
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <mm:content postprocessor="none">
+ <mm:cloud method="delegate">
+ <mm:import externid="command">-1</mm:import>
+ <mm:compare referid="command" value="deleterole">
+ <di:has editcontext="rollen" action="rwd">
<mm:import externid="rolenumber"/>
- <mm:node number="$rolenumber" notfound="skip">
+ <mm:node number="$rolenumber">
<mm:deletenode deleterelations="true"/>
</mm:node>
-
- </mm:islessthan>
-</mm:compare>
-<mm:compare referid="command" value="accept">
- <mm:import id="editcontextname" reset="true">rollen</mm:import>
- <[EMAIL PROTECTED] file="/education/wizards/roles_chk.jsp" %>
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
-
- <% String sSelectName = ""; %>
- <mm:listnodes type="editcontexts" orderby="number">
- <mm:field name="number" id="this_editcontext" jspvar="dummy"
vartype="String">
- <% sSelectName = "select_" + dummy + "_"; %>
- </mm:field>
- <mm:listnodes type="roles" orderby="number">
- <% String sSelectFullName = ""; %>
- <mm:remove referid="old_rel"/>
- <mm:field name="number" id="this_role" jspvar="dummy" vartype="String">
- <% sSelectFullName = sSelectName + dummy; %>
- </mm:field>
- <mm:import externid="<%= sSelectFullName %>">0</mm:import>
+ </di:has>
+ <di:has editcontext="rollen" action="rwd" inverse="true">
+ <p>No rights to delete role</p>
+ </di:has>
+ </mm:compare>
+ <mm:compare referid="command" value="accept">
+ <di:has editcontext="rollen" action="rw">
+ <mm:listnodes type="editcontexts" orderby="number"
id="this_editcontext">
+ <mm:listnodes type="roles" orderby="number" id="this_role">
+ <mm:import id="select"
externid="select_${this_editcontext}_${this_role}">0</mm:import>
<mm:related path="posrel,editcontexts"
constraints="editcontexts.number='$this_editcontext'">
<mm:node element="posrel" id="old_rel">
- <mm:setfield name="pos"><mm:write referid="<%= sSelectFullName
%>"/></mm:setfield>
+ <mm:field name="pos" write="false">
+ <c:if test="${_ ne select}">
+ <p>Setting relation ${_node}.pos=${_node.pos} ->
${select}</p>
+ <mm:setfield>${select}</mm:setfield>
+ </c:if>
+ </mm:field>
</mm:node>
</mm:related>
<mm:notpresent referid="old_rel">
<mm:createrelation role="posrel" source="this_role"
destination="this_editcontext">
- <mm:setfield name="pos"><mm:write referid="<%= sSelectFullName
%>"/></mm:setfield>
+ <p>Creating relation ${this_role} -> ${this_editcontext}</p>
+ <mm:setfield name="pos">${select}</mm:setfield>
</mm:createrelation>
</mm:notpresent>
</mm:listnodes>
</mm:listnodes>
-
- </mm:islessthan>
-</mm:compare>
-
-
-<jsp:forward page="roles.jsp"/>
-</mm:cloud>
-</mm:content>
+ </di:has>
+ <di:has editcontext="rollen" action="rw" inverse="true">
+ <p>No rights to edit role</p>
+ </di:has>
+ </mm:compare>
+ </mm:cloud>
+ <jsp:include page="roles.jsp"/>
+ </mm:content>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
