Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv21830
Modified Files:
tree_top_menu.jsp
Log Message:
cleaned up sowewhat
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
Index: tree_top_menu.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/tree_top_menu.jsp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- tree_top_menu.jsp 10 Jan 2008 15:08:47 -0000 1.41
+++ tree_top_menu.jsp 22 Jan 2008 17:46:07 -0000 1.42
@@ -6,8 +6,6 @@
xmlns:di="http://www.didactor.nl/ditaglib_1.0">
<mm:content>
<mm:cloud rank="editor">
- <jsp:directive.include file="/shared/setImports.jsp" />
- <jsp:directive.include file="/education/wizards/roles_defs.jsp" />
<mm:import externid="e" jspvar="chosen_education"
vartype="string">${education}</mm:import>
<style type="text/css">
@@ -36,120 +34,98 @@
Follows lots of code duplication, why not iterate over all modes or
so?
Will the sillyness ever stop.
-->
-
- <mm:import id="editcontextname" reset="true">componenten</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <di:has editcontext="component">
<mm:link referids="e?" page=".">
<mm:param name="mode">components</mm:param>
<a class="${mode eq 'components' ? education_top_menu_selected : ''}"
href="${_}"><di:translate key="education.educationmenucomponents"
/></a>
</mm:link>
- </mm:islessthan>
+ </di:has>
- <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">
+ <di:has editcontext="rollen">
<mm:link page="." referids="e?">
<mm:param name="mode">roles</mm:param>
<a class="education_top_menu ${mode eq 'roles' ? 'selected' : ''}"
- href="${_}"><di:translate key="education.educationmenupersons"
/></a>
- </mm:link>
+ href="${_}"><di:translate key="education.educationmenupersons"
/></a> </mm:link>
- </mm:islessthan>
+ </di:has>
- <mm:node number="component.pop" notfound="skipbody">
+ <mm:hasnode number="component.pop">
<!--
A user will see a Competence submenu only if POP component is
switched ON
-->
<mm:relatednodes type="providers"
constraints="providers.number=$provider"> <!-- WTF -->
- <mm:import id="editcontextname" reset="true">competentie</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <di:has editcontext="competentie">
<mm:link page="." referids="e?">
<mm:param name="mode">compentence</mm:param>
<a class="education_top_menu ${mode eq 'compentence' ?
'selected' : ''}"
href="${_}">
<di:translate key="education.educationmenucompetence" /></a>
</mm:link>
- </mm:islessthan>
+ </di:has>
</mm:relatednodes>
- </mm:node>
+ </mm:hasnode>
- <mm:node number="component.metadata" notfound="skipbody">
- <mm:import id="editcontextname" reset="true">metadata</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <mm:hasnode number="component.metadata" >
+ <di:has editcontext="metadata">
<mm:link page="." referids="e?">
<mm:param name="mode">metadata</mm:param>
<a class="education_top_menu ${mode eq 'metadata' ? 'selected' :
''}"
href="${_}">
<di:translate key="education.educationmenumetadata" /></a>
</mm:link>
- </mm:islessthan>
- </mm:node>
+ </di:has>
+ </mm:hasnode>
- <mm:import id="editcontextname" reset="true">contentelementen</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <di:has editcontext="contentelementen">
<mm:link page="." referids="e?">
<mm:param name="mode">content_metadata</mm:param>
<a class="education_top_menu ${mode eq 'content_metadata' ?
'selected' : ''}"
href="${_}">
<di:translate key="education.educationmenucontentmetadata" /></a>
</mm:link>
- </mm:islessthan>
+ </di:has>
- <mm:node number="component.filemanagement" notfound="skipbody">
- <mm:import id="editcontextname" reset="true">filemanagement</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <mm:hasnode number="component.filemanagement">
+ <di:has editcontext="filemanagment">
<mm:link page="." referids="e?">
<mm:param name="mode">filemanagement</mm:param>
<a class="education_top_menu ${mode eq 'filemanagement' ?
'selected' : ''}"
href="${_}">
<di:translate key="filemanagement.filemanagement" /></a>
</mm:link>
- </mm:islessthan>
- </mm:node>
+ </di:has>
+ </mm:hasnode>
<!-- this is stupid -->
- <mm:node number="component.virtualclassroom" notfound="skipbody">
- <mm:import id="editcontextname"
reset="true">virtualclassroom</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <mm:hasnode number="component.virtualclassroom">
+ <di:has editcontext="virtualclassroom">
<a class="education_top_menu ${mode eq 'virtualclassroom' ?
'selected' : ''}"
href="?mode=virtualclassroom" style="font-weight:bold;">
<di:translate key="virtualclassroom.virtualclassroom" />
</a>
- </mm:islessthan>
- </mm:node>
+ </di:has>
+ </mm:hasnode>
- <mm:node number="component.proactivemail" notfound="skipbody">
- <mm:import id="editcontextname" reset="true">proactivemail</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <mm:hasnode number="component.proactivemail">
+ <di:has editcontext="proactivemail">
<a class="education_top_menu ${mode eq 'proactivemail' ? 'selected'
: ''}"
href="?mode=proactivemail"
style="font-weight:bold;"><di:translate key="proactivemail.proactivemail" /></a>
- </mm:islessthan>
- </mm:node>
+ </di:has>
+ </mm:hasnode>
- <mm:import id="editcontextname" reset="true">toetsen</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <di:has editcontext="toetsen">
<mm:link page="." referids="e?">
<mm:param name="mode">tests</mm:param>
<a class="education_top_menu ${mode eq 'tests' ? 'selected' : ''}"
href="${_}">
<di:translate key="education.educationmenutests" /></a>
</mm:link>
- </mm:islessthan>
+ </di:has>
- <mm:import id="editcontextname" reset="true">opleidingen</mm:import>
- <jsp:directive.include file="roles_chk.jsp" />
- <mm:islessthan inverse="true" referid="rights" referid2="RIGHTS_RW">
+ <di:has editcontext="opleidingen">
<span class="education_top_menu ${mode eq 'educations' ? 'selected' :
''}">
<mm:link page="." referids="e?">
<mm:param name="mode">educations</mm:param>
@@ -179,7 +155,7 @@
</select>
</c:if>
</span>
- </mm:islessthan>
+ </di:has>
</mm:cloud>
</mm:content>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs