Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes
In directory james.mmbase.org:/tmp/cvs-serv21396/modes
Modified Files:
components.jsp content_metadata.jsp roles.jsp
Log Message:
several cleanups
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes
Index: components.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/components.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- components.jsp 22 Jan 2008 17:27:27 -0000 1.2
+++ components.jsp 1 Feb 2008 14:06:25 -0000 1.3
@@ -3,7 +3,7 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
<mm:cloud rank="basic user">
- <di:has action="rw" editcontext="componenten"> <!-- dutch -->
+ <di:has action="rw" editcontext="componenten" > <!-- dutch -->
<mm:listnodes type="components" orderby="name">
<mm:treefile id="file" page="/components/edit.jsp"
objectlist="$includePath"
referids="[EMAIL PROTECTED]" write="false" />
Index: content_metadata.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/content_metadata.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- content_metadata.jsp 31 Jan 2007 12:51:08 -0000 1.2
+++ content_metadata.jsp 1 Feb 2008 14:06:25 -0000 1.3
@@ -1,102 +1,98 @@
-<[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" %>
-<jsp:directive.page
import="java.util.*,nl.didactor.component.education.utils.*,org.mmbase.bridge.*"
/>
-<jsp:scriptlet>
- String imageName = "";
- String sAltText = "";
-</jsp:scriptlet>
-<mm:cloud method="delegate" authenticate="asis" jspvar="cloud">
- <jsp:directive.include file="/shared/setImports.jsp" />
+<jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <jsp:output omit-xml-declaration="yes" />
+ <mm:cloud method="delegate" authenticate="asis">
<jsp:directive.include file="../mode.include.jsp" />
- <jsp:directive.include file="/education/wizards/roles_defs.jsp" />
- <% //----------------------- Metadata for components comes from here
----------------------- %>
- <mm:import id="editcontextname" reset="true">contentelementen</mm:import>
- <[EMAIL PROTECTED] file="/education/wizards/roles_chk.jsp" %>
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
- <a href='javascript:clickNode("content_metadata_0")'><img
src='gfx/tree_pluslast.gif' width="16" border='0' align='center'
valign='middle' id='img_content_metadata_0'/></a> <img
src='gfx/menu_root.gif' border='0' align='center'
valign='middle'/> <nobr><a
href='javascript:clickNode("content_metadata_0")' title="<di:translate
key="education.educationmenucontentmetadata" />"><di:translate
key="education.educationmenucontentmetadata" /></a></nobr>
- <br>
+ <di:has editcontext="contentelementen">
+ <a href="javascript:clickNode('content_metadata_0')">
+ <img src='gfx/tree_pluslast.gif' width="16" border='0' align='center'
valign='middle' id='img_content_metadata_0' />
+ </a>
+ <jsp:text>&nbsp;</jsp:text>
+ <img src='gfx/menu_root.gif' border='0' align='center' valign='middle'/>
+ <jsp:text>&nbsp;</jsp:text>
+ <nobr>
+ <a href="javascript:clickNode('content_metadata_0')"
+ title="${di:translate('education.educationmenucontentmetadata')}">
+ <di:translate key="education.educationmenucontentmetadata" />
+ </a>
+ </nobr>
+ <br /> <!-- brs are stupid -->
<mm:import jspvar="langLocale"><mm:write referid="language"
/></mm:import>
<div id='content_metadata_0' style='display: none'>
- <%
- // sigh, how is this good?
- // does this java -code contribute anything to make it beter
understandable?
- // why not using a anonymous new array, inb stead of a zillion
statements.
- String[][] arrstrContentMetadataConfig = new String[5][4];
- java.util.Locale loc = new java.util.Locale(langLocale);
- int singular = NodeManager.GUI_SINGULAR;
-
- arrstrContentMetadataConfig[0][0] =
cloud.getNodeManager("images").getGUIName(singular, loc);
- arrstrContentMetadataConfig[1][0] =
cloud.getNodeManager("attachments").getGUIName(singular, loc);
- arrstrContentMetadataConfig[2][0] =
cloud.getNodeManager("audiotapes").getGUIName(singular, loc);
- arrstrContentMetadataConfig[3][0] =
cloud.getNodeManager("videotapes").getGUIName(singular, loc);
- arrstrContentMetadataConfig[4][0] =
cloud.getNodeManager("urls").getGUIName(singular, loc);
-
- arrstrContentMetadataConfig[0][1] = "config/image/image";
- arrstrContentMetadataConfig[1][1] = "config/attachment/attachment";
- arrstrContentMetadataConfig[2][1] = "config/audiotape/audiotapes";
- arrstrContentMetadataConfig[3][1] = "config/videotape/videotapes";
- arrstrContentMetadataConfig[4][1] = "config/url/urls";
-
- arrstrContentMetadataConfig[0][2] = "images";
- arrstrContentMetadataConfig[1][2] = "attachments";
- arrstrContentMetadataConfig[2][2] = "audiotapes";
- arrstrContentMetadataConfig[3][2] = "videotapes";
- arrstrContentMetadataConfig[4][2] = "urls";
-
- arrstrContentMetadataConfig[0][3] = "title";
- arrstrContentMetadataConfig[1][3] = "title";
- arrstrContentMetadataConfig[2][3] = "title";
- arrstrContentMetadataConfig[3][3] = "title";
- arrstrContentMetadataConfig[4][3] = "name";
-
-
- session.setAttribute("content_metadata_names",
arrstrContentMetadataConfig);
-
- for (int f = 0; f < arrstrContentMetadataConfig.length; f++)
- {
- %>
+ <mm:import id="types"
vartype="list">images,attachments,audiotapes,videotapes,urls</mm:import>
+ <c:forEach items="${types}" var="type">
+ <mm:hasnodemanager name="${type}">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
<td><img src="gfx/tree_vertline-leaf.gif" border="0"
align="middle"/></td>
<td><img src="gfx/learnblock.gif" border="0"
align="middle" /></td>
- <mm:import id="template" reset="true"><mm:write
referid="listjsp"/>&wizard=<%= arrstrContentMetadataConfig[f][1]
%>&nodepath=<%= arrstrContentMetadataConfig[f][2]%>&search=yes&orderby=<%=
arrstrContentMetadataConfig[f][3] %>&metadata=yes<mm:write
referid="forbidtemplate" escape="text/plain" /></mm:import>
- <td><nobr> <a href='<mm:write referid="template"
escape="text/plain" />&path=' title='<di:translate key="education.edit" /> <%=
arrstrContentMetadataConfig[f][0] %>' target="text"><%=
arrstrContentMetadataConfig[f][0] %></a></nobr></td>
+ <mm:link referid="listjsp">
+ <mm:param name="wizard"><mm:property name="wizard"
nodemanager="${type}" /></mm:param>
+ <mm:param name="nodepath">${type}</mm:param>
+ <mm:param name="search">yes</mm:param>
+ <mm:param name="orderby"><mm:property name="orderby"
nodemanager="${type}" /></mm:param>
+ <mm:param name="metadata">yes</mm:param>
+ <mm:param name="path"></mm:param>
+ <!--<mm:write referid="forbidtemplate" escape="text/plain"
/> -->
+ <td>
+ <nobr>
+ &nbsp;
+ <a href="${_}" title="${di:translate('education.edit')}"
+ target="text"><mm:nodeinfo type="guinodemanager"
nodetype="${type}" />
+ </a>
+ </nobr>
+ </td>
+ </mm:link>
</tr>
</table>
- <%
- }
- %>
+ </mm:hasnodemanager>
+ </c:forEach>
+
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
<td><img src="gfx/tree_vertline-leaf.gif" border="0"
align="middle"/></td>
<td><img src="gfx/learnblock.gif" border="0"
align="middle" /></td>
- <td><nobr> <a href='<mm:write
referid="listjsp"/>&wizard=config/provider/providers&nodepath=providers&searchfields=name&fields=name&orderby=name&path='
target="text">Content paginas (CMS)</a></nobr></td>
+ <mm:link referid="listjsp">
+ <mm:param name="wizard">config/provider/providers</mm:param>
+ <mm:param name="nodepath">providers</mm:param>
+ <mm:param name="searchfields">name</mm:param>
+ <mm:param name="fields">name</mm:param>
+ <mm:param name="orderyby">name</mm:param>
+ <mm:param name="path"></mm:param>
+ <td>
+ <nobr>
+ &nbsp;
+ <a href="${_}" target="text">
+ Content paginas (CMS)</a>
+ </nobr>
+ </td>
+ </mm:link>
</tr>
</table>
- <% //////////////////////////////////////////////// CMS
///////////////////////////////////////////////// %>
- <% // add portalpages %>
- <mm:node number="component.portalpages" notfound="skip">
- <mm:treeinclude
page="/portalpages/backoffice/add_portalpages.jsp" objectlist=""
referids="listjsp,wizardjsp" />
- </mm:node>
-
- <% // add help %>
- <mm:node number="component.cmshelp" notfound="skip">
- <mm:treeinclude page="/cmshelp/backoffice/add_help.jsp"
objectlist="" referids="listjsp,wizardjsp" />
- </mm:node>
-
- <% // add faq %>
- <mm:node number="component.faq" notfound="skip">
- <mm:treeinclude page="/faq/backoffice/add_faq.jsp" objectlist=""
referids="listjsp,wizardjsp" />
- </mm:node>
-
- <% // add news %>
- <mm:node number="component.news" notfound="skip">
- <mm:treeinclude page="/news/backoffice/add_news.jsp"
objectlist="" referids="listjsp,wizardjsp" />
- </mm:node>
- <% //////////////////////////////////////////////// CMS
///////////////////////////////////////////////// %>
+ <mm:hasnode number="component.portalpages">
+ <mm:treeinclude debug="html"
page="/portalpages/backoffice/add_portalpages.jsp" objectlist=""
referids="listjsp,wizardjsp" />
+ </mm:hasnode>
+
+ <mm:hasnode number="component.cmshelp">
+ <mm:treeinclude debug="html" page="/cmshelp/backoffice/add_help.jsp"
objectlist="" referids="listjsp,wizardjsp" />
+ </mm:hasnode>
+
+ <mm:hasnode number="component.faq">
+ <mm:treeinclude debug="html" page="/faq/backoffice/add_faq.jsp"
objectlist="" referids="listjsp,wizardjsp" />
+ </mm:hasnode>
+
+ <mm:hasnode number="component.news">
+ <mm:treeinclude debug="html" page="/news/backoffice/add_news.jsp"
objectlist="" referids="listjsp,wizardjsp" />
+ </mm:hasnode>
+
</div>
- </mm:islessthan>
-</mm:cloud>
+ </di:has>
+ </mm:cloud>
+</jsp:root>
Index: roles.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/roles.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- roles.jsp 12 Oct 2007 16:38:32 -0000 1.11
+++ roles.jsp 1 Feb 2008 14:06:25 -0000 1.12
@@ -1,36 +1,35 @@
-<[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"
-%><jsp:scriptlet>
- String imageName = "";
- String sAltText = "";
-</jsp:scriptlet>
-<mm:cloud rank="basic user">
-
- <jsp:directive.include file="/shared/setImports.jsp" />
+<jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <jsp:output omit-xml-declaration="yes" />
+ <mm:cloud rank="basic user">
<jsp:directive.include file="../mode.include.jsp" />
- <jsp:directive.include file="../roles_defs.jsp" />
- <mm:import id="editcontextname" >rollen</mm:import><!-- why is this in dutch
-->
- <jsp:directive.include file="../roles_chk.jsp" />
-
<mm:import externid="e">${education}</mm:import>
-
- <mm:islessthan referid="rights" referid2="RIGHTS_RW">
- ${rights} < ${RIGHTS_RW}
- </mm:islessthan>
- <mm:islessthan inverse="true"
- referid="rights" referid2="RIGHTS_RW">
- <a href='javascript:clickNode("persons_0")'><img
src='gfx/tree_pluslast.gif' width="16" border='0' align='center'
valign='middle' id='img_persons_0' /></a> <img src='gfx/menu_root.gif'
border='0' align='center' valign='middle'/><nobr> <a
href='javascript:clickNode("persons_0")'><di:translate
key="education.personstab" /></nobr></a>
- <br>
+ <di:has editcontext="rollen" inverse="true">
+ No rights
+ </di:has>
+ <di:has editcontext="rollen">
+ <a href="javascript:clickNode('persons_0')">
+ <img src='gfx/tree_pluslast.gif' width="16" border='0' align='center'
valign='middle' id='img_persons_0' />
+ </a>
+ <jsp:text>&nbsp;</jsp:text>
+ <img src='gfx/menu_root.gif' border='0' align='center' valign='middle'/>
+ <nobr>&nbsp;
+ <a href="javascript:clickNode('persons_0')"><di:translate
key="education.personstab" /></a></nobr>
+ <br />
<div id='persons_0' style='display: none'>
- <%// edit people,rolerel, education %>
- <%-- doesn't work properly, so commented it out for the moment
+ <!--
+ edit people,rolerel, education
+ doesn't work properly, so commented it out for the moment
rolestree.addItem("<di:translate
key="education.editpeoplerolereleducation" />",
"<mm:treefile write="true"
page="/education/wizards/roles.jsp" objectlist="$includePath" />",
null,
"<di:translate
key="education.editpeoplerolereleducationdescription" />",
"<mm:treefile write="true"
page="/education/wizards/gfx/new_education.gif" objectlist="$includePath" />");
- --%>
- <%// create new role %>
+ -->
+ <!--create new role-->
<table border="0" cellpadding="0" cellspacing="0">
<tr>
@@ -39,7 +38,7 @@
<td><img src="gfx/learnblock.gif" border="0" align="middle"
/></td>
<td>
<nobr>
-
+ &nbsp;
<mm:link referid="listjsp">
<mm:param name="wizard">config/people/people</mm:param>
<mm:param name="nodepath">people</mm:param>
@@ -47,7 +46,7 @@
<mm:param
name="searchfields">firstname,suffix,lastname,username,externid</mm:param>
<mm:param name="search">yes</mm:param>
<a href="${_}${forbidtemplate}"
- title='<di:translate key="education.persons" />'
target="text">
+ title="${di:translate('education.persons')}"
target="text">
<di:translate key="education.persons" />
</a>
</mm:link>
@@ -56,12 +55,13 @@
</tr>
<mm:listnodes type="roles">
<tr>
+ <!-- I hate spacers -->
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
<td><img src="gfx/tree_vertline.gif" border="0"
align="middle"/></td>
<td />
<td>
<nobr>
-
+ &nbsp;
<mm:link referid="listjsp" referids="[EMAIL
PROTECTED],education">
<mm:param
name="wizard">config/people/people_unlink</mm:param>
<mm:param name="nodepath">roles,people</mm:param>
@@ -72,7 +72,7 @@
<mm:param name="relationRole">related</mm:param>
<mm:param name="relationOriginNode">${_node}</mm:param>
<a href="${_}${forbidtemplate}"
- title='${di:translate('education.persons')}'
target="text">
+ title="${di:translate('education.persons')}"
target="text">
<mm:field name="name" />
</a>
</mm:link>
@@ -95,7 +95,7 @@
<mm:param name="orderby">number</mm:param>
<mm:param name="directions">down</mm:param>
<nobr>
-
+ &nbsp;
<a href="${_}${forbidtemplate}"
title="${di:translate('education.classes')}"
target="text">
@@ -118,7 +118,8 @@
<mm:param name="search">yes</mm:param>
<mm:param name="orderby">number</mm:param>
<mm:param name="directions">down</mm:param>
- <nobr>
+ <nobr>
+ &nbsp;
<a href="${_}${forbidtemplate}"
title="${di:translate('education.workgroups')}"
target="text">
<di:translate key="education.workgroups" />
@@ -134,7 +135,13 @@
<td><img src="gfx/tree_leaflast.gif" border="0"
align="middle"/></td>
<td><img src="gfx/learnblock.gif" border="0" align="middle"
/></td>
- <td><nobr> <a href='roles.jsp' title='<di:translate
key="education.roles" />' target="text"><di:translate key="education.roles"
/></a></nobr></td>
+ <td>
+ <nobr>
+ &nbsp;
+ <a href="roles.jsp" title="${di:translate('education.roles')}"
+ target="text"><di:translate key="education.roles" /></a>
+ </nobr>
+ </td>
</tr>
</table>
<table border="0" cellpadding="0" cellspacing="0">
@@ -150,7 +157,8 @@
<mm:param name="search">yes</mm:param>
<mm:param name="orderby">number</mm:param>
<mm:param name="directions">down</mm:param>
- <nobr>
+ <nobr>
+ &nbsp;
<a href="${_}${forbidtemplate}"
target="text">
<mm:nodeinfo nodetype="disallowedusernames"
type="plural_guinodemanager" />
@@ -160,49 +168,62 @@
</td>
</tr>
</table>
- <mm:node number="component.report" notfound="skip">
- <%-- <di:hasrole role="teacher"> --%>
+ <!-- sigh -->
+ <mm:hasnode number="component.report">
+ <!-- <di:hasrole role="teacher"> -->
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
<td><img src="gfx/tree_leaflast.gif" border="0"
align="middle"/></td>
<td><img src="gfx/learnblock.gif" border="0"
align="middle" /></td>
- <td><nobr> <a href='../../report/index.jsp'
target="text">Rapport</a></nobr></td>
+ <td><nobr>&nbsp;<a href='../../report/index.jsp'
target="text">Rapport</a></nobr></td>
</tr>
</table>
- <%-- </di:hasrole> --%>
- </mm:node>
+ <!-- </di:hasrole> -->
+ </mm:hasnode>
- <mm:node number="component.isbo" notfound="skip">
- <%-- <di:hasrole role="systemadministrator"> --%>
+ <mm:hasnode number="component.isbo">
+ <!-- <di:hasrole role="systemadministrator"> -->
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
<td><img src="gfx/tree_leaflast.gif" border="0"
align="middle"/></td>
<td><img src="gfx/learnblock.gif" border="0"
align="middle" /></td>
- <td><nobr> <a href='../../isbo/index.jsp'
title='<di:translate key="education.isboimport" />' target="text"><di:translate
key="education.isboimport" /></a></nobr></td>
+ <td>
+ <nobr>
+ &nbsp;
+ <a href='../../isbo/index.jsp'
title="${di:translate('education.isboimport')}"
+ target="text"><di:translate key="education.isboimport"
/></a>
+ </nobr>
+ </td>
</tr>
</table>
- <%-- </di:hasrole> --%>
- </mm:node>
+ <!-- </di:hasrole> -->
+ </mm:hasnode>
- <mm:node number="component.assessment" notfound="skip">
- <%-- <di:hasrole role="systemadministrator"> --%>
+ <mm:hasnode number="component.assessment">
+ <!-- <di:hasrole role="systemadministrator"> -->
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
<td><img src="gfx/tree_leaflast.gif" border="0"
align="middle"/></td>
<td><img src="gfx/learnblock.gif" border="0"
align="middle" /></td>
- <td><nobr> <a
href='../../assessment/email_notification/index.jsp' title='<di:translate
key="education.wizard_people_assessment" />' target="text"><di:translate
key="education.wizard_people_assessment" /></a></nobr></td>
+ <td>
+ <nobr>
+ &nbsp;
+ <a href='../../assessment/email_notification/index.jsp'
title="${di:translate('education.wizard_people_assessment')}"
+ target="text"><di:translate
key="education.wizard_people_assessment" /></a>
+ </nobr>
+ </td>
</tr>
</table>
- <%-- </di:hasrole> --%>
- </mm:node>
-
+ <!-- </di:hasrole> -->
+ </mm:hasnode>
</div>
- </mm:islessthan>
-</mm:cloud>
+ </di:has>
+ </mm:cloud>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
