Update of /var/cvs/contributions/didactor2/src/core/templates
In directory james.mmbase.org:/tmp/cvs-serv29547
Modified Files:
index.jsp logout.jsp version.jsp welcome.jsp
Removed Files:
cockpit.jsp declined.jsp firstcontent.jsp listleft.jsp
login_plain.jsp loginbox.jsp rightcolumn.jsp
Log Message:
cleaning up, documentation
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates
Index: index.jsp
===================================================================
RCS file: /var/cvs/contributions/didactor2/src/core/templates/index.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- index.jsp 5 Jul 2007 09:14:56 -0000 1.25
+++ index.jsp 20 Mar 2008 11:12:39 -0000 1.26
@@ -1,6 +1,9 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><mm:content postprocessor="reducespace" expires="0" type="text/html">
-<mm:cloud method="asis">
+<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" expires="0" type="text/html">
+ <mm:cloud method="asis">
<mm:import externid="reset" />
@@ -10,7 +13,12 @@
</mm:hasrank>
<mm:hasrank minvalue="didactor user">
- <mm:treefile page="cockpit.jsp" objectlist="$includePath"
referids="$referids,reset?"
+ <!--
+ Would want to drop /index.jspx, but:
+
+ http://www.mmbase.org/jira/browse/MMB-1440
+ -->
+ <mm:treefile page="/cockpit/index/index.jspx"
objectlist="$includePath" referids="$referids,reset?"
id="redirpage" write="false" />
<mm:redirect referid="redirpage" />
</mm:hasrank>
@@ -18,9 +26,10 @@
</mm:hasnode>
<mm:hasnode number="component.portal" inverse="true">
- <mm:treefile page="cockpit.jsp" objectlist="$includePath"
referids="$referids,reset?"
+ <mm:treefile page="/cockpit/index/index.jspx"
objectlist="$includePath" referids="$referids,reset?"
id="redirpage" write="false" />
<mm:redirect referid="redirpage" />
</mm:hasnode>
-</mm:cloud>
-</mm:content>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
Index: logout.jsp
===================================================================
RCS file: /var/cvs/contributions/didactor2/src/core/templates/logout.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- logout.jsp 14 Mar 2008 15:51:02 -0000 1.15
+++ logout.jsp 20 Mar 2008 11:12:39 -0000 1.16
@@ -12,7 +12,4 @@
<mm:cloud method="logout">
<mm:cloudinfo type="user" />
</mm:cloud>
-
<mm:redirect page="/" />
-
-
Index: version.jsp
===================================================================
RCS file: /var/cvs/contributions/didactor2/src/core/templates/version.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- version.jsp 23 May 2007 15:45:36 -0000 1.7
+++ version.jsp 20 Mar 2008 11:12:39 -0000 1.8
@@ -1,3 +1,9 @@
+<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";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";
+ >
<html>
<head>
<title>Didactor version.</title>
@@ -9,5 +15,8 @@
<p><b>Build name:</b> ${war.name}</p>
<p><b>Build date:</b> ${war.time}</p>
<p><b>Components:</b> ${components}</p>
+ <p><b>Provider:</b> ${provider}</p>
+ <p><b>Education:</b> ${education}</p>
</body>
</html>
+</jsp:root>
Index: welcome.jsp
===================================================================
RCS file: /var/cvs/contributions/didactor2/src/core/templates/welcome.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- welcome.jsp 21 Feb 2008 09:39:13 -0000 1.14
+++ welcome.jsp 20 Mar 2008 11:12:39 -0000 1.15
@@ -5,10 +5,12 @@
<mm:cloud method="asis">
<mm:node referid="provider">
<mm:countrelations type="flashpages" write="false">
+
<mm:islessthan value="1">
<h1><di:translate key="core.welcome" /></h1>
<h3><di:translate key="core.welcomemessage" /></h3>
</mm:islessthan>
+
</mm:countrelations>
<di:include page="/shared/related.flashpages.jsp" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
