Update of /var/cvs/contributions/didactor2/src/core/templates/shared
In directory james.mmbase.org:/tmp/cvs-serv15224
Modified Files:
navigation.jspx render.jspx
Added Files:
subnavigation.jspx titlebar.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates/shared
subnavigation.jspx is new
titlebar.jspx is new
Index: navigation.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/shared/navigation.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- navigation.jspx 17 Aug 2008 19:18:22 -0000 1.3
+++ navigation.jspx 21 Nov 2008 14:09:10 -0000 1.4
@@ -9,8 +9,9 @@
<mm:import externid="object" />
<mm:import externid="name" />
- <div class="titlebar"><!--nothing here --></div>
+ <di:include page="/shared/titlebar.jspx" />
<h1><di:translate key="${name}.name" /></h1>
- </div>
+
+ </div>
</jsp:root>
\ No newline at end of file
Index: render.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/shared/render.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- render.jspx 28 Aug 2008 15:12:50 -0000 1.4
+++ render.jspx 21 Nov 2008 14:09:10 -0000 1.5
@@ -11,10 +11,12 @@
<mm:import externid="name" required="true" />
<mm:import externid="block" required="true" />
<mm:import externid="node" from="request" required="true" />
+
<di:html
expires="0"
type="application/xhtml+xml"
rank="didactor user">
+
<jsp:attribute name="head">
<mm:node number="${node}">
<mm:component name="${name}" block="${block}" render="head" />
@@ -23,9 +25,11 @@
<div class="rows">
<di:include debug="html" page="/shared/navigation.jspx" />
+ <di:include page="/shared/subnavigation.jspx" />
+
<div class="mainContent">
- <div class="contentBodywit">
+ <div class="contentBodywit">
<mm:node number="${node}">
<mm:component name="${name}" block="${block}" />
</mm:node>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs