Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv21396
Modified Files:
code.jsp index.jsp ok.jsp roles_chk.jsp roles_defs.jsp
tree_top_menu.jsp
Added Files:
navigation.jspx
Log Message:
several cleanups
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
navigation.jspx is new
Index: code.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/code.jsp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- code.jsp 28 Jan 2008 16:44:03 -0000 1.108
+++ code.jsp 1 Feb 2008 14:06:25 -0000 1.109
@@ -1,10 +1,10 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%><mm:content postprocessor="reducespace">
-<mm:cloud>
+<jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <mm:content postprocessor="none">
+ <mm:cloud>
<mm:import externid="mode">components</mm:import>
- <jsp:directive.include file="/shared/setImports.jsp" />
- <jsp:directive.include file="roles_defs.jsp" />
<mm:link page="/education/js/tree.jsp" referids="mode">
<script type="text/javascript" src="${_}"><!-- help IE --></script>
</mm:link>
@@ -31,8 +31,9 @@
</mm:link>
<div id="mode-${mode}">
- <mm:include page="modes/${mode}.jsp" />
+ <mm:include debug="html" page="modes/${mode}.jsp" />
</div>
</mm:cloud>
-</mm:content>
+ </mm:content>
+</jsp:root>
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/index.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- index.jsp 28 Jan 2008 16:43:51 -0000 1.28
+++ index.jsp 1 Feb 2008 14:06:25 -0000 1.29
@@ -2,67 +2,36 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
- <mm:content postprocessor="none" expires="0">
- <mm:cloud rank="editor">
- <jsp:directive.include file="/shared/setImports.jsp" />
- <mm:treeinclude page="/cockpit/cockpit_header.jsp"
objectlist="$includePath" referids="$referids">
- <mm:param name="extraheader">
- <title><di:translate key="education.editwizards" /></title>
- <style type="text/css">
- a {
- font-size: 11px;
- }
- .menu_font{
- font-size: 11px;
- }
- .folderBodyTree {
- width: 20%;
- height: 90%;
- overflow: scroll;
- }
- .contentBody {
-
- top: 0em;
- left: 0em;
- right: 0em;
- bottom: 0em;
- height: 100%;
- padding: 0em;
- }
- .componentBody {
- }
- </style>
- </mm:param>
- <mm:param name="extrabody">
- onLoad="loadTree();" onUnload="storeTree();"
- </mm:param>
- </mm:treeinclude>
+ <di:html
+ type="text/html"
+ styleClass="editwizards"
+ title_key="education.editwizards"
+ rank="editor" expires="0">
+ <!--
+ <script type="text/javascript">
+ addEventHandler(window, 'load', loadTree);
+ addEventHandler(window, 'unload', storeTree);
+ </script>
+ -->
+ <div class="rows" id="rows">
+ <di:include debug="html" page="/education/wizards/navigation.jspx" />
+ <div class="mainContent">
<table cellpadding="0" cellspacing="0" border="0" width="100%"
height="100%">
- <tr class="navigationbar">
- <td colspan="2" class="titlebar">
- <img src="${mm:treefile('/gfx/icon_agenda.gif', pageContext,
includePath)}"
- title="${di:translate('education.editwizards')}"
alt="${di:translate('education.editwizards')}" />
- <span class="menu_font">Editwizards:</span>
- <mm:treeinclude page="/education/wizards/tree_top_menu.jsp"
objectlist="$includePath" />
- </td>
- </tr>
<tr>
- <td style="width:20%">
- <div id="left_menu" style="overflow:auto; width:100%; height:100%"
>
+ <td id="left_menu">
<mm:treeinclude debug="html" page="/education/wizards/code.jsp"
objectlist="$includePath" />
- </div>
</td>
-
- <td width="100%">
- <mm:treefile id="ok" page="/education/wizards/ok.jsp"
objectlist="$includePath" referids="$referids" write="false" />
- <iframe id="text" name="text" width="99%" height="100%"
marginwidth="0" marginheight="0" border="1" src="${ok}"></iframe>
+ <td class="content">
+ <mm:treefile id="ok" page="/education/wizards/ok.jsp"
+ objectlist="$includePath" referids="$referids"
write="false">
+ <iframe id="text" name="text" width="99%" height="100%"
marginwidth="0" marginheight="0" border="1" src="${ok}"><jsp:text>
</jsp:text></iframe>
+ </mm:treefile>
</td>
</tr>
</table>
-
- <mm:treeinclude page="/cockpit/cockpit_footer.jsp"
objectlist="$includePath" referids="$referids"/>
- </mm:cloud>
- </mm:content>
+ </div>
+ </div>
+ </di:html>
</jsp:root>
Index: ok.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/ok.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ok.jsp 1 Jun 2007 14:20:48 -0000 1.7
+++ ok.jsp 1 Feb 2008 14:06:25 -0000 1.8
@@ -1,7 +1,9 @@
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%><[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><mm:content>
-<html>
+<jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <mm:content>
+ <html>
<head>
<title>OK</title>
</head>
@@ -13,11 +15,11 @@
</script>
</mm:present>
<mm:cloud method="asis">
- <jsp:directive.include file="/shared/setImports.jsp" />
- <img src="${mm:treefile('/education/wizards/gfx/ok.gif', pageContext,
includePath)}"
+ <img src="${mm:treelink('/education/wizards/gfx/ok.gif',
includePath)}"
onClick="window.top.reloadMode();"
title="OK" alt="OK" />
</mm:cloud>
</body>
-</html>
-</mm:content>
+ </html>
+ </mm:content>
+</jsp:root>
Index: roles_chk.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/roles_chk.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- roles_chk.jsp 15 Jan 2008 15:45:54 -0000 1.6
+++ roles_chk.jsp 1 Feb 2008 14:06:25 -0000 1.7
@@ -1,4 +1,6 @@
-<%-- in: user, editcontextname --%>
+<%--
+ This is horrible
+in: user, editcontextname --%>
<%-- out: rights, forbidtemplate (for EW) --%>
<%-- need: definition of RIGHTS_NO --%>
Index: roles_defs.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/roles_defs.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: tree_top_menu.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/tree_top_menu.jsp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
