Update of /var/cvs/contributions/didactor2/src/portalpages/templates/portalpages
In directory james.mmbase.org:/tmp/cvs-serv7239

Modified Files:
        container_navigation.jspx navigation.jspx 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/portalpages/templates/portalpages


Index: container_navigation.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/container_navigation.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- container_navigation.jspx   7 Jan 2009 19:19:31 -0000       1.1
+++ container_navigation.jspx   8 Jan 2009 15:37:22 -0000       1.2
@@ -8,6 +8,7 @@
   <mm:time time="today" write="false" id="today" />
   <mm:import externid="openSub" />
   <mm:import externid="object" />
+  <mm:import externid="n" />
 
 
   <mm:relatednodescontainer type="portalpagesnodes" searchdirs="destination">
@@ -23,7 +24,7 @@
           </mm:notpresent>
         </mm:first>
         <mm:nodeinfo type="type" id="type" write="false" />
-        <mm:link referids="_n...@opensub" write="false">
+        <mm:link referids="_n...@opensub,n?" write="false">
           <a href="${_}"
              class="${_node eq openSub  ? 'active' : ''}${status.first ? ' 
first' : ''} ${status.last ? 'last' : ''}">
             <mm:field name="name" />
@@ -49,8 +50,8 @@
                     </mm:first>
                   </mm:isempty>
                 </mm:first>
-                <mm:import id="bookmark"><mm:link referids="openSub" 
/>#${_node}</mm:import>
-                <mm:link referids="_n...@object">
+                <mm:import id="bookmark"><mm:link referids="openSub,n?" 
/>#${_node}</mm:import>
+                <mm:link referids="_n...@object,n?">
                   <a href="${_}"
                      id="a_${_node}"
                      class="${object eq _node.number ? 'active' : 
''}${status.first ? ' first' : ''}${status.last ? ' last' :''}"
@@ -74,12 +75,13 @@
                     <mm:first>
                       <mm:remove referid="object" />
                       <mm:node id="object" />
+                      <mm:write request="object" referid="object" />
                     </mm:first>
                   </mm:isempty>
                   <mm:import id="firstItem" reset="true">first</mm:import>
                 </mm:first>
-                <mm:import id="bookmark"><mm:link referids="openSub" 
/>#${_node}</mm:import>
-                <mm:link referids="_n...@object">
+                <mm:import id="bookmark"><mm:link referids="openSub,n?" 
/>#${_node}</mm:import>
+                <mm:link referids="_n...@object,n?">
                   <a href="${_}"
                      id="a_${_node}"
                      class="${firstItem ne '' ? ' first' : ''}"


Index: navigation.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/navigation.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- navigation.jspx     7 Jan 2009 19:19:31 -0000       1.1
+++ navigation.jspx     8 Jan 2009 15:37:22 -0000       1.2
@@ -1,4 +1,5 @@
-<jsp:root version="2.0"
+<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";
@@ -7,7 +8,7 @@
   <div class="navigationbar">
     <mm:import externid="n" required="true" />
     <mm:node referid="n">
-
+      <di:include page="/portalpages/container_navigation.jspx" />
     </mm:node>
   </div>
 </jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to