Update of
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice
In directory james.mmbase.org:/tmp/cvs-serv8663
Modified Files:
add_portalpages.jsp related_portalpagesnodes.jsp
Log Message:
drasticly cleaned up. May give some new bugs, but this stuff was horrible and
otherwise unmaintanable
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- add_portalpages.jsp 7 Mar 2008 12:07:11 -0000 1.5
+++ add_portalpages.jsp 13 Mar 2008 17:25:28 -0000 1.6
@@ -1,32 +1,36 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"%>
-<mm:cloud>
-<mm:import externid="listjsp" from="request" required="true"/>
-<mm:import externid="wizardjsp" from="request" required="true"/>
-<script type="text/javascript">
+<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:cloud>
+ <mm:import externid="listjsp" from="request" required="true"/>
+ <mm:import externid="wizardjsp" from="request" required="true"/>
+ <script type="text/javascript">
function clickNodePortal(node) {
var level = node.split('_').length;
//saveCookie('lastnodepagina' + level, node,1);
clickNode(node);
}
-</script>
-<mm:import id="nodes_exist" reset="true">false</mm:import>
-<mm:listnodes type="portalpagesnodes">
+ </script>
+ <mm:import id="nodes_exist" reset="true">false</mm:import>
+ <mm:listnodes type="portalpagesnodes">
<mm:import id="nodes_exist" reset="true">true</mm:import>
-</mm:listnodes>
+ </mm:listnodes>
-<mm:listnodes type="portalpagescontainers">
+ <mm:listnodes type="portalpagescontainers">
<mm:first>
<!--- WTF WTF WTF. This stuff is HORRIBLE. Taking a random node. Perhaps
there is only one of this type, or so? -->
<mm:node id="containernode" />
</mm:first>
-</mm:listnodes>
+ </mm:listnodes>
-<mm:present referid="containernode">
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif" width="16px" height="16px" border="0"
align="center" valign="middle"/></td>
- <td><a href='javascript:clickNode("portal_root")'><img
src="gfx/tree_plus.gif" border="0" align="middle"
id='img_portal_root'/></a></td>
- <td><img src="gfx/folder_closed.gif" border="0" align="middle"
id='img2_portal_root'/></td>
+ <mm:present referid="containernode">
+ <di:leaf
+ branchPath="."
+ click="portal_root">
<mm:link referid="listjsp" referids="[EMAIL PROTECTED]">
<mm:param
name="wizard">config/portalpages/rootportalpagesnodes</mm:param>
<mm:param name="nodepath">portalpagesnodes</mm:param>
@@ -35,145 +39,61 @@
<mm:param name="metadata">yes</mm:param>
<td><nobr><a href="${_}" title="portal pagina's" target="text">Portal
Pagina's</a></nobr></td> <!-- I18N ? -->
</mm:link>
- </tr>
-</table>
-<div id="portal_root" style="display:none">
-<% boolean levelOneLast = false; %>
-<% boolean levelTwoLast = false; %>
-<% boolean hasChilds = false; %>
-<% boolean childHasChilds = false; %>
-<% boolean hasSimpleContents = false; %>
-<% boolean childHasSimpleContents = false; %>
-<% int nb = 0; %>
-<% int nbc = 0; %>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
- <mm:compare referid="nodes_exist" value="true">
- <td><img src="gfx/adds/tree_vertline-leaf.gif"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="nodes_exist" value="true"
inverse="true">
- <td><img src="gfx/tree_leaflast.gif"
border="0" align="center" valign="middle"/></td>
- </mm:compare>
- <td><img src="gfx/new_education.gif" width="16"
border="0" align="middle" /></td>
+ </di:leaf>
+ <div id="portal_root" style="display:none">
+ <di:leaf
+ icon="new_education"
+ branchPath=".."
+ >
<mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
<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>
</mm:link>
- </tr>
- </table>
+ </di:leaf>
<mm:listnodes type="portalpagescontainers">
<mm:relatednodescontainer type="portalpagesnodes" >
<mm:sortorder field="number" direction="up" />
- <mm:relatednodes>
- <% hasChilds = false; %>
- <% hasSimpleContents = false; %>
- <% nb++; %>
- <% childHasChilds = false; %>
- <table border="0" cellpadding="0"
cellspacing="0">
- <tr>
-
<td><img src="gfx/tree_spacer.gif" width="16px" height="16px"
border="0" align="center" valign="middle"/></td>
-
<td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
-
<mm:last inverse="true">
-
<td><img src="gfx/adds/tree_vertline-leaf.gif" border="0"
align="center" valign="middle"/></td>
-
</mm:last>
-
<mm:last>
-
<td><img src="gfx/tree_leaflast.gif" border="0"
align="center" valign="middle"/></td>
-
<% levelOneLast = true; %>
-
</mm:last>
-
<mm:import id="this" ><mm:field name="number"/></mm:import>
-
<mm:node number="$this">
-
<mm:listcontainer
path="portalpagesnodes,related,simplecontents">
-
<mm:constraint operator="equal"
field="portalpagesnodes.number" referid="this"/>
-
<mm:list>
-
<mm:first>
-
<%hasChilds = true; %>
-
</mm:first>
-
</mm:list>
-
</mm:listcontainer>
-
</mm:node>
-
<mm:relatednodes role="childppnn" type="portalpagesnodes">
-
<mm:constraint operator="equal" field="number" referid="this"/>
-
<mm:first>
-
<%hasChilds = true; %>
-
</mm:first>
-
</mm:relatednodes>
-
<td><a
href='javascript:clickNodePortal("portal_node_<%=nb%>")'><img
src="gfx/adds/tree_plus.gif" border="0" align="middle"
id='img_portal_node_<%=nb%>'/></a></td>
-
<td><img src="gfx/folder_closed.gif" border="0" align="middle"
id='img2_portal_node_<%=nb%>'/></td>
+ <mm:relatednodes varStatus="status">
+ <di:leaf
+ click="portal_node_${_node}"
+ branchPath="..${status.last ? '.' : ' '}"
+ >
<mm:link referid="wizardjsp" referids="[EMAIL
PROTECTED]">
<mm:param
name="wizard">config/portalpages/portalpagesnodes</mm:param>
<mm:param name="objectnumber">new</mm:param>
<td><a href="${_}" title="edit"
target="text"><mm:field name="name"/></a></td>
</mm:link>
-
</tr>
-
</table>
-
<div id='portal_node_<%=nb%>' style="display:none">
-
<mm:node id="current" number="$this">
-
<mm:listcontainer
path="portalpagesnodes,related,simplecontents">
-
<mm:constraint operator="equal"
field="portalpagesnodes.number" referid="this"/>
-
<mm:list>
-
<mm:first>
-
<%hasSimpleContents = true; %>
-
</mm:first>
-
</mm:list>
-
</mm:listcontainer>
-
<mm:relatednodes role="childppnn"
type="portalpagesnodes">
- <mm:constraint operator="equal" field="number"
referid="this"/>
-
<mm:first>
-
<%childHasChilds = true; %>
-
</mm:first>
- </mm:relatednodes>
-
<table border="0" cellpadding="0"
cellspacing="0">
-
<tr>
-
<td><img src="gfx/tree_spacer.gif"
width="16px" height="16px" border="0" align="center" valign="middle"/></td>
-
<td><img src="gfx/tree_vertline.gif"
border="0" align="center" valign="middle"/></td>
-
<%if(!levelOneLast){%>
-
<td><img src="gfx/tree_vertline.gif"
border="0" align="center" valign="middle"/></td>
-
<%}else{%>
-
<td><img src="gfx/tree_spacer.gif"
border="0" align="center" valign="middle"/></td>
-
<%}%>
-
<td><img
src="gfx/adds/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
-
<td><img src="gfx/new_education.gif"
width="16" border="0" align="middle" /></td>
- <mm:link referid="wizardjsp"
referids="[EMAIL PROTECTED]">
+ </di:leaf>
+ <div id="portal_node_${_node}" style="display:none">
+ <di:leaf
+ branchPath="..${status.last ? '.' : ' '} "
+ >
+ <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
<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>
-
</tr>
-
</table>
-
<table border="0" cellpadding="0"
cellspacing="0">
-
<tr>
-
<td><img src="gfx/tree_spacer.gif"
width="16px" height="16px" border="0" align="center" valign="middle"/></td>
-
<td><img src="gfx/tree_vertline.gif"
border="0" align="center" valign="middle"/></td>
-
<%if(!levelOneLast){%>
-
<td><img src="gfx/tree_vertline.gif"
border="0" align="center" valign="middle"/></td>
-
<%}else{%>
-
<td><img src="gfx/tree_spacer.gif"
border="0" align="center" valign="middle"/></td>
-
<%}%>
-
<%if(hasSimpleContents ||
childHasChilds){%>
-
<td><img
src="gfx/adds/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
-
<%}else{%>
-
<td><img src="gfx/tree_leaflast.gif"
border="0" align="center" valign="middle"/></td>
-
<%}%>
-
<td><img src="gfx/new_education.gif"
width="16" border="0" align="middle" /></td>
-
<td>
- <mm:link referid="wizardjsp"
referids="[EMAIL PROTECTED]">
+ </di:leaf>
+ <di:leaf
+ branchPath="..${status.last ? '.' : ' '} "
+ >
+ <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
<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>
- </td>
-
</tr>
-
</table>
-
<%levelTwoLast = false; %>
- <[EMAIL PROTECTED]
file="related_portalpagesnodes.jsp"%>
-
</mm:node>
+ </di:leaf>
+
+ <mm:treeinclude
page="/portalpages/backoffice/related_portalpagesnodes.jsp"
objectlist="${includePath}">
+ <mm:param name="branchPath">..${status.last ? '.' : ' '}
</mm:param>
+ </mm:treeinclude>
+
</div>
</mm:relatednodes>
</mm:relatednodescontainer>
</mm:listnodes>
-</div>
-</mm:present>
-</mm:cloud>
+ </div>
+ </mm:present>
+ </mm:cloud>
+</jsp:root>
Index: related_portalpagesnodes.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/portalpages/templates/portalpages/backoffice/related_portalpagesnodes.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- related_portalpagesnodes.jsp 15 Feb 2008 11:00:41 -0000 1.4
+++ related_portalpagesnodes.jsp 13 Mar 2008 17:25:28 -0000 1.5
@@ -1,69 +1,26 @@
-<mm:relatednodes role="childppnn" type="portalpagesnodes">
-<mm:constraint operator="equal" field="number" referid="this"/>
- <% nbc++; %>
- <%childHasSimpleContents = false; %>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
- <%if(!levelOneLast){%>
- <td><img src="gfx/tree_vertline.gif"
border="0" align="center" valign="middle"/></td>
- <%}else{%>
- <td><img src="gfx/tree_spacer.gif"
width="16px" height="16px" border="0" align="center" valign="middle"/></td>
- <%}%>
- <mm:last inverse="true">
- <td><img
src="gfx/adds/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- </mm:last>
- <mm:last>
- <%if(!hasSimpleContents){%>
- <td><img src="gfx/tree_leaflast.gif"
border="0" align="center" valign="middle"/></td>
- <%}else{%>
- <td><img
src="gfx/adds/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- <%}%>
- <% levelTwoLast = true; %>
- </mm:last>
- <mm:import id="childnb" ><mm:field
name="number"/></mm:import>
- <mm:node id="find" number="$childnb">
- <mm:listcontainer
path="portalpagesnodes,related,simplecontents">
- <mm:constraint operator="equal"
field="portalpagesnodes.number" referid="childnb"/>
- <mm:list>
- <mm:first>
-
<%childHasSimpleContents = true; %>
- </mm:first>
- </mm:list>
- </mm:listcontainer>
- </mm:node>
- <td><a
href='javascript:clickNodePortal("portal_child_<%=nbc%>")'><img
src="gfx/adds/tree_plus.gif" border="0" align="middle"
id='img_portal_child_<%=nbc%>'/></a></td>
- <td><img
src="gfx/folder_closed.gif" border="0" align="middle"
id='img2_portal_child_<%=nbc%>'/></td>
+<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:import externid="branchPath" />
+ <mm:relatednodes role="childppnn" type="portalpagesnodes">
+ <di:leaf
+ branchPath="${branchPath} "
+ click="portal_child_${_node}"
+ >
<mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
<mm:param
name="wizard">config/portalpages/leafportalpagesnodes</mm:param>
<td><a href="${_}" title="edit" target="text"><mm:field
name="name"/></a></td>
</mm:link>
- </tr>
- </table>
- <div id='portal_child_<%=nbc%>' style="display:none">
- <mm:import id="thischild"><mm:field
name="number"/></mm:import>
- <mm:node number="$thischild">
- <table border="0"
cellpadding="0" cellspacing="0">
- <tr>
- <td><img
src="gfx/tree_spacer.gif" width="16px" height="16px" border="0" align="center"
valign="middle"/></td>
- <td><img
src="gfx/tree_vertline.gif" border="0" align="center" valign="middle"/></td>
- <%if(!levelOneLast){%>
- <td><img
src="gfx/tree_vertline.gif" border="0" align="center" valign="middle"/></td>
- <%}else{%>
- <td><img
src="gfx/tree_spacer.gif" border="0" align="center" valign="middle"/></td>
- <%}%>
-
<%if((!levelTwoLast)||(hasSimpleContents)){%>
- <td><img
src="gfx/tree_vertline.gif" border="0" align="center" valign="middle"/></td>
- <%}else{%>
- <td><img
src="gfx/tree_spacer.gif" border="0" align="center" valign="middle"/></td>
- <%}%>
-
<%if(childHasSimpleContents){%>
- <td><img
src="gfx/adds/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- <%}else{%>
- <td><img
src="gfx/tree_leaflast.gif" border="0" align="center" valign="middle"/></td>
- <%}%>
- <td><img
src="gfx/new_education.gif" width="16" border="0" align="middle" /></td>
+ </di:leaf>
+ <div id="portal_child_${_node}" style="display:none">
+ <di:leaf
+ branchPath="${branchPath} "
+ icon="new_education"
+ >
<mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
<mm:param
name="wizard">config/portalpages/newsimplecontents</mm:param>
<mm:param name="objectnumber">new</mm:param>
@@ -71,73 +28,31 @@
<a href="${_}" title="nieuwe content"
target="text">nieuwe content</a>
</td>
</mm:link>
- </tr>
- </table>
- <mm:listcontainer
path="portalpagesnodes,related,simplecontents">
- <mm:constraint operator="equal"
field="portalpagesnodes.number" referid="thischild"/>
- <mm:list>
-
<table border="0" cellpadding="0" cellspacing="0">
-
<tr>
-
<td><img src="gfx/tree_spacer.gif" width="16px" height="16px"
border="0" align="center" valign="middle"/></td>
-
<td><img src="gfx/tree_vertline.gif" border="0" align="center"
valign="middle"/></td>
-
<%if(!levelOneLast){%>
-
<td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
-
<%}else{%>
-
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
-
<%}%>
-
<%if((!levelTwoLast)||(hasSimpleContents)){%>
-
<td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
-
<%}else{%>
-
<td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
-
<%}%>
-
<mm:last inverse="true">
-
<td><img src="gfx/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
-
</mm:last>
-
<mm:last>
-
<td><img src="gfx/tree_leaflast.gif" border="0" align="center"
valign="middle"/></td>
-
</mm:last>
-
<td></td>
-
<td><img src="gfx/learnblock.gif" border="0" align="middle"
id='img2_portal_node"/>'/></td>
- <mm:link referid="wizardjsp" referids="[EMAIL
PROTECTED]">
+ </di:leaf>
+ <mm:relatednodes role="related" path="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="${_}" target="text"><mm:field
name="simplecontents.title"/></a>
+ <a href="${_}" target="text"><mm:field name="title"/></a>
</td>
</mm:link>
-
</tr>
-
</table>
- </mm:list>
- </mm:listcontainer>
- </mm:node>
+ </di:leaf>
+ </mm:relatednodes>
</div>
-</mm:relatednodes>
-<mm:listcontainer path="portalpagesnodes,related,simplecontents">
-<mm:constraint operator="equal" field="portalpagesnodes.number"
referid="this"/>
- <mm:list>
- <table border="0" cellpadding="0"
cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif"
width="16px" height="16px" border="0" align="center" valign="middle"/></td>
- <td><img src="gfx/tree_vertline.gif"
border="0" align="center" valign="middle"/></td>
- <%if(!levelOneLast){%>
- <td><img
src="gfx/tree_vertline.gif" border="0" align="center" valign="middle"/></td>
- <%}else{%>
- <td><img
src="gfx/tree_spacer.gif" width="16px" height="16px" border="0" align="center"
valign="middle"/></td>
- <%}%>
- <mm:last inverse="true">
- <td><img
src="gfx/tree_vertline-leaf.gif" border="0" align="center"
valign="middle"/></td>
- </mm:last>
- <mm:last>
- <td><img
src="gfx/tree_leaflast.gif" border="0" align="center" valign="middle"/></td>
- </mm:last>
- <td></td>
- <td><img src="gfx/learnblock.gif"
border="0" align="middle" id='img2_portal_node"/>'/></td>
- <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
+ </mm:relatednodes>
+ <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="simplecontents.title"/></a>
+ <a href="${_}" title="edit" target="text"><mm:field
name="title"/></a>
</td>
</mm:link>
- </tr>
- </table>
- </mm:list>
-</mm:listcontainer>
+ </di:leaf>
+ </mm:relatednodes>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
