Update of /var/cvs/contributions/didactor2/src/core/templates/login
In directory james.mmbase.org:/tmp/cvs-serv12263
Modified Files:
index.jspx main.jspx navigation.jspx
Added Files:
leftcolumn.jsp middlecolumn.jsp
Log Message:
further split up
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates/login
leftcolumn.jsp is new
middlecolumn.jsp is new
Index: index.jspx
===================================================================
RCS file: /var/cvs/contributions/didactor2/src/core/templates/login/index.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.jspx 20 Mar 2008 12:30:55 -0000 1.4
+++ index.jspx 20 Mar 2008 15:30:45 -0000 1.5
@@ -12,12 +12,13 @@
happens on 'cockpit') but you are not yet logged in.
So, stuff specific to the education can be shown.
-
- This pages contains odd logic, which depending on certain installed
components makes itself render differently
-->
+ <div class="rows" id="rows">
+ <di:script src="/content/js/open.jsp" />
<di:include debug="html" page="/login/navigation.jspx" />
<di:include debug="html" page="/login/main.jspx" />
+ </div>
</di:html>
Index: main.jspx
===================================================================
RCS file: /var/cvs/contributions/didactor2/src/core/templates/login/main.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- main.jspx 20 Mar 2008 12:30:55 -0000 1.1
+++ main.jspx 20 Mar 2008 15:30:45 -0000 1.2
@@ -2,32 +2,10 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
- class="columns">
- <jsp:output omit-xml-declaration="true" />
- <div class="columnLeft">
- <img src="${mm:treelink('/gfx/logo_didactor.gif', includePath)}"
- width="100%" height="106" border="0" title="Didactor logo"
alt="Didactor logo" />
+ class="mainContent">
- <mm:hasnode number="component.portalpages">
- <di:include page="/portalpages/frontoffice/index.jsp" />
- </mm:hasnode>
- <mm:hasnode number="component.portalpages" inverse="true">
- <!-- show login box on the left -->
- <div class="ListLeft">
- <mm:include page="loginbox.jsp" />
- </div>
- </mm:hasnode>
- </div>
- <div class="columnMiddle">
- <div id="contentFrame">
- <mm:import externid="object" />
- <mm:notpresent referid="object">
- <di:include page="/login/firstcontent.jsp" />
- </mm:notpresent>
- <mm:present referid="object">
- <mm:include page="/content/" />
- </mm:present>
- </div>
- </div>
+ <jsp:output omit-xml-declaration="true" />
+ <di:include page="/login/leftcolumn.jsp" />
+ <di:include page="/login/middlecolumn.jsp" />
<di:include page="/login/rightcolumn.jsp" />
</div>
Index: navigation.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/login/navigation.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- navigation.jspx 20 Mar 2008 12:30:55 -0000 1.1
+++ navigation.jspx 20 Mar 2008 15:30:45 -0000 1.2
@@ -1,8 +1,10 @@
-<div
+<jsp:root version="2.0"
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:jsp="http://java.sun.com/JSP/Page";
- xmlns:di="http://www.didactor.nl/ditaglib_1.0";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
- class="educationMenubarCockpit" style="white-space: nowrap">
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+ <div class="navigationbar">
+ <div class="educationMenubarCockpit">
<jsp:output omit-xml-declaration="true" />
<jsp:text> </jsp:text>
<!-- sigh -->
@@ -13,5 +15,6 @@
<mm:hasnode number="component.cmshelp">
<di:include page="/cmshelp/cockpit/general.jsp" />
</mm:hasnode>
-
-</div>
+ </div>
+ </div>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
