Update of /var/cvs/contributions/didactor2/src/faq/templates/faq/cockpit
In directory james.mmbase.org:/tmp/cvs-serv24559/templates/faq/cockpit
Modified Files:
menuitem.jsp rolerelated.jsp
Log Message:
dropped silly 'faqcontainers' of which could exist only one (so, you can as wel
have none), If faqnodes had to be linked to something, I propose the education
or so.
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/faq/templates/faq/cockpit
Index: menuitem.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/faq/templates/faq/cockpit/menuitem.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- menuitem.jsp 24 Nov 2008 09:06:47 -0000 1.8
+++ menuitem.jsp 24 Nov 2008 10:19:53 -0000 1.9
@@ -1,29 +1,30 @@
-<[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" jspvar="cloud">
-<[EMAIL PROTECTED] file="/shared/setImports.jsp" %>
-<mm:import id="scope" externid="scope"/>
-
-<mm:compare referid="scope" value="education">
- <mm:listnodes type="faqcontainers">
- <mm:first>
- <mm:field id="faqcontainer" name="number" write="false" />
- </mm:first>
- </mm:listnodes>
- <mm:node number="$faqcontainer" notfound="skipbody">
- <mm:relatednodes type="faqnodes" id="faq">
- <mm:import id="faqname" reset="true"><mm:field name="name"/></mm:import>
- <mm:related path="educations,people" constraints="people.number='$user'">
- <div class="menuSeparator"></div>
+<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:content postprocessor="none">
+ <mm:cloud method="delegate">
+ <mm:import id="scope" externid="scope" />
+ <mm:compare referid="scope" value="education">
+ <mm:listnodescontainer path="faqnodes,educations,people"
element="faqnodes" id="q">
+ <mm:constraint field="people.number" value="${user}" />
+ <mm:constraint field="educations.number" value="${education}" />
+ <mm:listnodes max="1">
+ <div class="menuSeparator">
+ <jsp:text> </jsp:text>
+ </div>
<div class="menuItem">
- <mm:treefile page="/faq/frontoffice/index.jsp"
objectlist="$includePath" referids="$referids,[EMAIL PROTECTED]">
- <a title="<mm:write referid="faqname"/>" href="${_}"
class="menubar"><mm:write referid="faqname"/></a>
+ <mm:treefile page="/faq/frontoffice/index.jsp"
objectlist="$includePath"
+ referids="$referids,[EMAIL PROTECTED]">
+ <a title="${faqname}" href="${_}" class="menubar"><mm:field
name="name"/></a>
</mm:treefile>
</div>
- </mm:related>
- </mm:relatednodes>
- </mm:node>
-</mm:compare>
-</mm:cloud>
-</mm:content>
+ </mm:listnodes>
+ </mm:listnodescontainer>
+ </mm:compare>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
Index: rolerelated.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/faq/templates/faq/cockpit/rolerelated.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- rolerelated.jsp 24 Nov 2008 09:10:06 -0000 1.7
+++ rolerelated.jsp 24 Nov 2008 10:19:53 -0000 1.8
@@ -1,37 +1,33 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"%>
-<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di" %>
-<mm:content postprocessor="reducespace">
-<mm:cloud jspvar="cloud" method="delegate">
-<[EMAIL PROTECTED] 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:content postprocessor="none">
+ <mm:cloud method="delegate">
-<mm:listnodes type="faqcontainers">
- <mm:first>
- <mm:field id="faqcontainer" name="number" write="false" />
- </mm:first>
-</mm:listnodes>
-
-<mm:node number="$faqcontainer" notfound="skipbody">
- <mm:relatednodes type="faqnodes" id="faq">
- <mm:import id="faqname" reset="true"><mm:field name="name"/></mm:import>
- <mm:remove referid="faqnodeshown" />
+ <mm:listnodescontainer path="educations,faqnodes"
+ element="faqnodes" id="q">
+ <mm:constraint field="educations.number" value="${education}" />
+ <mm:listnodes id="faq">
+ <mm:field id="faqname" name="name" write="false"/>
<mm:relatednodes type="roles">
- <mm:import id="role" jspvar="role" reset="true"><mm:field
name="name"/></mm:import>
- <mm:node number="$user" notfound="skipbody">
- <di:hasrole role="<%=role%>">
- <mm:notpresent referid="faqnodeshown">
+ <mm:field id="role" name="name" write="false" />
+ <mm:node number="$user">
+ <di:hasrole role="${role}">
<div class="menuSeparatorApplicationMenubar"></div>
<div class="menuItemApplicationMenubar">
<mm:treefile page="/faq/frontoffice/index.jspx"
objectlist="$includePath" referids="$referids,[EMAIL PROTECTED]" write="false">
- <a title="<mm:write referid="faqname"/>" href="${_}"
class="menubar"><mm:write referid="faqname"/></a>
+ <a title="${faqname}" href="${_}"
class="menubar"><mm:write referid="faqname"/></a>
</mm:treefile>
</div>
- <mm:import id="faqnodeshown" />
- </mm:notpresent>
</di:hasrole>
</mm:node>
</mm:relatednodes>
- </mm:relatednodes>
-</mm:node>
-</mm:cloud>
-</mm:content>
+ </mm:listnodes>
+ </mm:listnodescontainer>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
