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

Modified Files:
        add_portalpages.jsp related_portalpagesnodes.jsp 
Log Message:
support for rich-test


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


Index: add_portalpages.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/add_portalpages.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- add_portalpages.jsp 14 Mar 2008 17:08:54 -0000      1.8
+++ add_portalpages.jsp 27 Mar 2008 11:08:08 -0000      1.9
@@ -8,6 +8,9 @@
   <mm:cloud>
     <mm:import externid="listjsp"   from="request" required="true"/>
     <mm:import externid="wizardjsp" from="request" required="true"/>
+    <mm:import from="request" externid="referrer" />
+    <mm:import id="kupu_back"><mm:url page="${referrer}" /></mm:import>
+
     <mm:import id="nodes_exist" reset="true">false</mm:import>
     <mm:listnodes type="portalpagesnodes">
       <mm:import id="nodes_exist" reset="true">true</mm:import>
@@ -60,6 +63,7 @@
               </di:leaf>
               <div id="portal_node_${_node}" style="display:none">
                 <di:leaf
+                    icon="new_education"
                     branchPath="..${status.last ? '.' : ' '} "
                     >
                   <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
@@ -68,7 +72,13 @@
                     <td><a href="${_}" title="nieuwe map" target="text">nieuwe 
map</a></td>
                   </mm:link>
                 </di:leaf>
+
+                 <di:getsetting setting="new_contents" component="portalpages" 
vartype="list" id="new_contents" write="false" />
+                 <mm:stringlist referid="new_contents">
+                   <c:choose>
+                     <c:when test="${_ eq 'simplecontents'}">
                 <di:leaf
+                           icon="new_education"
                     branchPath="..${status.last ? '.' : ' '} "
                     >
                   <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
@@ -77,6 +87,34 @@
                     <a href="${_}" title="nieuwe content" target="text">nieuwe 
content</a>
                   </mm:link>
                 </di:leaf>
+                     </c:when>
+                     <c:when test="${_ eq 'simplexmlcontents'}">
+
+
+                       <di:leaf
+                           icon="kupu_icon"
+                           branchPath="..${status.last ? '.' : ' '} "
+                           >
+                         <mm:link page="/mmbase/kupu/mmbase" referids="[EMAIL 
PROTECTED],referrer,kupu_back">
+                           <mm:param 
name="templates">/editwizards/data</mm:param>
+                           <mm:param 
name="wizard">config/portalpages/simplexmlcontents</mm:param>
+                           <mm:param 
name="link_nodetypes">${di:setting('richtext', 'link_nodetypes')}</mm:param>
+                           <mm:param 
name="language">${locale.language}</mm:param>
+                           <mm:param name="objectnumber">new</mm:param>
+                           <a href="${_}" title="nieuwe content" 
target="text">nieuwe content</a>
+                         </mm:link>
+                       </di:leaf>
+                     </c:when>
+                     <c:otherwise>
+                       <di:leaf
+                           icon=""
+                           branchPath="..${status.last ? '.' : ' '} "
+                           >
+                         UNKNONWN ${_}
+                       </di:leaf>
+                     </c:otherwise>
+                   </c:choose>
+                 </mm:stringlist>
 
                 <mm:treeinclude 
page="/portalpages/backoffice/related_portalpagesnodes.jsp" 
objectlist="${includePath}">
                   <mm:param name="branchPath">..${status.last ? '.' : ' 
'}</mm:param>


Index: related_portalpagesnodes.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/related_portalpagesnodes.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- related_portalpagesnodes.jsp        13 Mar 2008 17:34:33 -0000      1.6
+++ related_portalpagesnodes.jsp        27 Mar 2008 11:08:08 -0000      1.7
@@ -5,8 +5,12 @@
           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:import id="kupu_back"><mm:url page="${referrer}" /></mm:import>
   <mm:import externid="branchPath" />
-  <mm:relatednodes role="childppnn" type="portalpagesnodes">
+  <mm:relatednodes role="childppnn"
+                   orderby="order_number"
+                   type="portalpagesnodes">
+
     <di:leaf
         branchPath="${branchPath} "
         click="portal_child_${_node}"
@@ -41,17 +45,52 @@
           </mm:link>
         </di:leaf>
       </mm:relatednodes>
+      <mm:relatednodes role="posrel"
+                       type="simplexmlcontents" varStatus="status">
+        <di:leaf
+            branchPath="${branchPath} ${status.last ? '.' : ' '}"
+            icon="kupu_icon">
+          <mm:link page="/mmbase/kupu/mmbase" referids="[EMAIL 
PROTECTED],referrer,kupu_back">
+            <mm:param name="templates">/editwizards/data</mm:param>
+            <mm:param 
name="wizard">config/portalpages/simplexmlcontents</mm:param>
+            <mm:param name="link_nodetypes">${di:setting('richtext', 
'link_nodetypes')}</mm:param>
+            <mm:param name="language">${locale.language}</mm:param>
+            <a href="${_}" title="edit" target="text">
+              <mm:field name="title"/>
+            </a>
+          </mm:link>
+        </di:leaf>
+      </mm:relatednodes>
     </div>
   </mm:relatednodes>
-  <mm:relatednodes role="related" type="simplecontents" varStatus="status">
+
+  <!-- WTF is the sort order here
+       This is horrible.
+       Only let for legacy reasons.
+  -->
+  <mm:relatednodes role="related"
+                   type="simplecontents" varStatus="status">
     <di:leaf
         branchPath="${branchPath}${status.last ? '.' : ' '}"
         icon="learnblock">
       <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
         <mm:param name="wizard">config/portalpages/simplecontents</mm:param>
-        <td>
           <a href="${_}" title="edit" target="text"><mm:field 
name="title"/></a>
-        </td>
+      </mm:link>
+    </di:leaf>
+  </mm:relatednodes>
+
+  <mm:relatednodes role="posrel"
+                   type="simplexmlcontents" varStatus="status">
+    <di:leaf
+        branchPath="${branchPath}${status.last ? '.' : ' '}"
+        icon="kupu_icon">
+      <mm:link page="/mmbase/kupu/mmbase" referids="[EMAIL 
PROTECTED],referrer,kupu_back">
+        <mm:param name="templates">/editwizards/data</mm:param>
+        <mm:param name="wizard">config/portalpages/simplexmlcontents</mm:param>
+        <mm:param name="link_nodetypes">${di:setting('richtext', 
'link_nodetypes')}</mm:param>
+        <mm:param name="language">${locale.language}</mm:param>
+        <a href="${_}" title="edit" target="text"><mm:field name="title"/></a>
       </mm:link>
     </di:leaf>
   </mm:relatednodes>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to