Update of
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice
In directory james.mmbase.org:/tmp/cvs-serv11056/backoffice
Modified Files:
add_portalpages.jsp leaf.jspx related_portalpagesnodes.jsp
Log Message:
will replace this horrible tree stuff with jquery-tree
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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- add_portalpages.jsp 9 Jan 2009 10:16:59 -0000 1.20
+++ add_portalpages.jsp 9 Jan 2009 16:58:40 -0000 1.21
@@ -17,43 +17,36 @@
<mm:constraint field="number" operator="IN" inverse="true"
value="${relatedcontainers}" />
<mm:maxnumber value="1" />
<mm:listnodes>
- <di:leaf
- branchPath=".|"
- click="portal_root_${_node}">
+ <li>
<mm:link referid="listjsp" referids="containern...@origin,referrer">
<mm:param
name="wizard">config/portalpages/rootportalpagesnodes</mm:param>
<mm:param name="nodepath">portalpagesnodes</mm:param>
<mm:param name="fields">name</mm:param>
<mm:param name="searchfields">name</mm:param>
<mm:param name="metadata">yes</mm:param>
- <td><nobr><a href="${_}" title="portal pagina's"
target="text">Portal Pagina's</a></nobr></td> <!-- I18N ? -->
+ <a href="${_}" title="portal pagina's" target="text">Portal
Pagina's</a> <!-- I18N ? -->
</mm:link>
- </di:leaf>
- <div id="portal_root_${_node}">
<mm:include page="leaf.jspx" />
- </div>
+ </li>
</mm:listnodes>
</mm:listnodescontainer>
<mm:listnodes id="e" type="educations" varStatus="status">
- <di:leaf branchPath=".${status.last ? '.' : '|'}"
- click="portal_root_${_node}">
+ <li>
+ <span class="folder">
<mm:link referid="wizardjsp" referids="_n...@objectnumber,referrer">
<mm:param
name="wizard">config/portalpages/posrel-portalpagescontainers</mm:param>
- <a href="${_}" target="text">
- Portal pages for <mm:nodeinfo type="gui" />
- </a>
+ <a href="${_}" target="text">Portal pages for <mm:nodeinfo
type="gui" /></a>
</mm:link>
- </di:leaf>
- <div id="portal_root_${_node}">
+ </span>
+ <ul>
<mm:relatednodes role="posrel" type="portalpagescontainers">
- <di:leaf branchPath=".||">
+ <li>
<mm:field name="name" />
- </di:leaf>
- <mm:include page="leaf.jspx">
- <mm:param name="branchPath">.|||</mm:param>
- </mm:include>
+ <mm:include page="leaf.jspx" />
+ </li>
</mm:relatednodes>
- </div>
+ </ul>
+ </li>
</mm:listnodes>
</jsp:root>
Index: leaf.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/leaf.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- leaf.jspx 9 Jan 2009 10:16:59 -0000 1.3
+++ leaf.jspx 9 Jan 2009 16:58:40 -0000 1.4
@@ -9,65 +9,47 @@
<mm:import externid="branchPath">.||</mm:import>
<mm:node id="container">
- <di:leaf
- icon="new_education"
- branchPath="${branchPath}"
- >
+ <ul>
+ <li>
+ <di:icon name="new_education" />
<mm:link referid="wizardjsp" referids="_n...@origin,referrer">
<mm:param
name="wizard">config/portalpages/rootportalpagesnodes</mm:param>
<mm:param name="objectnumber">new</mm:param>
- <td><a href="${_}" title="nieuwe map" target="text">nieuwe map</a></td>
<!-- WTF WTF -->
+ <a href="${_}" title="nieuwe map" target="text">nieuwe map</a> <!--
WTF WTF -->
</mm:link>
- </di:leaf>
+ </li>
<mm:relatednodescontainer type="portalpagesnodes" searchdirs="destination" >
<mm:sortorder field="number" direction="up" />
<mm:relatednodes varStatus="status">
- <di:leaf
- click="portal_node_${container}_${_node}"
- branchPath="${branchPath}${status.last ? '.' : ' '}"
- >
+ <li>
<mm:link referid="wizardjsp" referids="_n...@objectnumber,referrer">
<mm:param
name="wizard">config/portalpages/portalpagesnodes</mm:param>
- <td><a href="${_}" title="edit" target="text"><mm:field
name="name"/></a></td>
+ <a href="${_}" title="edit" target="text"><mm:field
name="name"/></a>
</mm:link>
- </di:leaf>
- <div id="portal_node_${container}_${_node}" style="display:none">
-
+ <ul>
<di:getsetting setting="new_contents" component="portalpages"
vartype="list" id="new_contents" write="false" />
<mm:stringlist referid="new_contents">
+ <li>
<c:choose>
<c:when test="${_ eq 'portalpagesnodes'}">
- <di:leaf
- icon="new_education"
- branchPath="${branchPath}${status.last ? '.' : ' '} "
- >
+ <di:icon name="new_education" />
<mm:link referid="wizardjsp" referids="_n...@origin">
<mm:param
name="wizard">config/portalpages/leafmapportalpages-origin</mm:param>
<mm:param name="objectnumber">new</mm:param>
<td><a href="${_}" title="nieuwe map" target="text">nieuwe
map</a></td>
</mm:link>
- </di:leaf>
</c:when>
<c:when test="${_ eq 'simplecontents'}">
- <di:leaf
- icon="new_education"
- branchPath="${branchPath}${status.last ? '.' : ' '} "
- >
+ <di:icon name="new_education" />
<mm:link referid="wizardjsp" referids="_n...@origin">
<mm:param
name="wizard">config/portalpages/newsimplecontents</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:when test="${_ eq 'simplexmlcontents'}">
-
-
- <di:leaf
- icon="kupu_icon"
- branchPath="${branchPath}${status.last ? '.' : ' '} "
- >
+ <di:icon name="kupu_icon" />
<di:kupulink
referrer="${referrer}"
node="new"
@@ -75,25 +57,22 @@
>
<a href="${_}" title="nieuwe content" target="text">nieuwe
content</a>
</di:kupulink>
- </di:leaf>
</c:when>
<c:otherwise>
- <di:leaf
- icon=""
- branchPath="${branchPath}${status.last ? '.' : ' '} "
- >
UNKNONWN ${_}
- </di:leaf>
+
</c:otherwise>
</c:choose>
+ </li>
</mm:stringlist>
<mm:treeinclude
page="/portalpages/backoffice/related_portalpagesnodes.jsp"
objectlist="${includePath}">
<mm:param name="branchPath">${branchPath}${status.last ? '.' : '
'}</mm:param>
</mm:treeinclude>
-
- </div>
+ </ul>
+ </li>
</mm:relatednodes>
</mm:relatednodescontainer>
+ </ul>
</mm:node>
</jsp:root>
Index: related_portalpagesnodes.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/related_portalpagesnodes.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- related_portalpagesnodes.jsp 5 Sep 2008 08:55:01 -0000 1.10
+++ related_portalpagesnodes.jsp 9 Jan 2009 16:58:40 -0000 1.11
@@ -11,45 +11,33 @@
orderby="order_number"
type="portalpagesnodes">
- <di:leaf
- branchPath="${branchPath} "
- click="portal_child_${_node}"
- >
+ <li>
<mm:link referid="wizardjsp" referids="_n...@objectnumber">
<mm:param
name="wizard">config/portalpages/leafportalpagesnodes</mm:param>
- <td><a href="${_}" title="edit" target="text"><mm:field
name="name"/></a></td>
+ <a href="${_}" title="edit" target="text"><mm:field name="name"/></a>
</mm:link>
- </di:leaf>
- <div id="portal_child_${_node}" style="display:none">
- <di:leaf
- branchPath="${branchPath}"
- icon="new_education"
- >
+ <ul>
+ <li>
+ <di:icon name="new_education" />
<mm:link referid="wizardjsp" referids="thisch...@origin">
<mm:param
name="wizard">config/portalpages/newsimplecontents</mm:param>
<mm:param name="objectnumber">new</mm:param>
- <td>
<a href="${_}" title="nieuwe content" target="text">nieuwe
content</a>
- </td>
</mm:link>
- </di:leaf>
+ </li>
<mm:relatednodes role="related" path="simplecontents" varStatus="status">
- <di:leaf
- branchPath="${branchPath} ${status.last ? '.' : ' '}"
- icon="learnblock">
+ <li>
+ <di:icon name="learnblock" />
<mm:link referid="wizardjsp" referids="_n...@objectnumber">
<mm:param
name="wizard">config/portalpages/simplecontents</mm:param>
- <td>
<a href="${_}" target="text"><mm:field name="title"/></a>
- </td>
</mm:link>
- </di:leaf>
+ </li>
</mm:relatednodes>
<mm:relatednodes role="posrel"
type="simplexmlcontents" varStatus="status">
- <di:leaf
- branchPath="${branchPath} ${status.last ? '.' : ' '}"
- icon="kupu_icon">
+ <li>
+ <di:icon name="kupu_icon" />
<di:kupulink
node="${_node}"
referrer="${referrer}"
@@ -58,9 +46,11 @@
<mm:field name="title"/>
</a>
</di:kupulink>
- </di:leaf>
+ </li>
+
</mm:relatednodes>
- </div>
+ </ul>
+ </li>
</mm:relatednodes>
<!-- WTF is the sort order here
@@ -69,27 +59,25 @@
-->
<mm:relatednodes role="related"
type="simplecontents" varStatus="status">
- <di:leaf
- branchPath="${branchPath}${status.last ? '.' : ' '}"
- icon="learnblock">
+ <li>
+ <di:icon name="learnblock" />
<mm:link referid="wizardjsp" referids="_n...@objectnumber">
<mm:param name="wizard">config/portalpages/simplecontents</mm:param>
<a href="${_}" title="edit" target="text"><mm:field name="title"/></a>
</mm:link>
- </di:leaf>
+ </li>
</mm:relatednodes>
<mm:relatednodes role="posrel"
type="simplexmlcontents" varStatus="status">
- <di:leaf
- branchPath="${branchPath}${status.last ? '.' : ' '}"
- icon="kupu_icon">
+ <li>
+ <di:icon name="kupu_icon" />
<di:kupulink
referrer="${referrer}"
wizard="config/portalpages/simplexmlcontents"
node="${_node}">
<a href="${_}" title="edit" target="text"><mm:field
name="title"/></a>
</di:kupulink>
- </di:leaf>
+ </li>
</mm:relatednodes>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
