Update of /var/cvs/contributions/didactor2/src/education/templates/education
In directory james.mmbase.org:/tmp/cvs-serv21863
Modified Files:
bookmark.jspx main.jspx navigation.jspx popcheck.jsp
prev_next.jsp show.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education
Index: bookmark.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/bookmark.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- bookmark.jspx 11 Jan 2008 15:28:27 -0000 1.1
+++ bookmark.jspx 4 Feb 2008 13:31:09 -0000 1.2
@@ -3,6 +3,14 @@
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";>
+ <!--
+ A system is present which maintains in the session how the
+ navigation tree is unfolded at the moment.
+ So that it can again be unfolded that way if you go away and come back.
+
+ IIRC this stuff is about that, i.e..
+
+ -->
<mm:import externid="reset" />
<mm:present referid="reset">
<mm:write session="learnobject_${education}" value="" />
Index: main.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/main.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- main.jspx 11 Jan 2008 15:28:27 -0000 1.1
+++ main.jspx 4 Feb 2008 13:31:09 -0000 1.2
@@ -4,18 +4,18 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
>
- <!--
- We are using it to show only one node in the tree
- For cross-education references
- -->
<div class="mainContent">
- <div class="contentHeader">
- <jsp:text> </jsp:text>
- </div>
+
+ <di:include debug="html" page="/education/contentHeader.jspx" />
+
<div class="contentBodywit" id="contentBodywit"> <!-- '-wit' is a very
stupid name for a class -->
<mm:import externid="the_only_node_to_show"/>
<mm:present referid="the_only_node_to_show">
+ <!--
+ We are using this to show only one node in the tree
+ For cross-education references
+ -->
<mm:import externid="fb_madetest" required="true" />
<mm:import externid="return_to" required="true" />
<mm:import externid="return_to_type" required="true" />
@@ -31,7 +31,9 @@
</mm:present>
<img id="ajax_loader" src="${mm:treelink('/gfx/ajax-loader.gif',
includePath)}" style="display: none;" />
- <div id="contentFrame"><jsp:text>...</jsp:text></div>
+ <div id="contentFrame">
+ <jsp:text>...</jsp:text>
+ </div>
</div>
</div>
Index: navigation.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/navigation.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- navigation.jspx 18 Jan 2008 17:40:33 -0000 1.3
+++ navigation.jspx 4 Feb 2008 13:31:09 -0000 1.4
@@ -11,7 +11,7 @@
<mm:link page="/education/js/frontend_tree.jsp" referids="$referids">
<script type="text/javascript" src="${_}">
- <!-- help IE -->
+ <jsp:text><!-- help IE --> </jsp:text>
</script>
</mm:link>
Index: popcheck.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/popcheck.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- popcheck.jsp 20 Nov 2006 14:08:08 -0000 1.2
+++ popcheck.jsp 4 Feb 2008 13:31:09 -0000 1.3
@@ -2,7 +2,7 @@
<[EMAIL PROTECTED] import="java.util.*" %>
<mm:import id="lonumber" jspvar="lonumber" vartype="String"
reset="true"><mm:write referid="learnobjectnumber"/></mm:import>
-<mm:import id="dummy" jspvar="username" vartype="String"
reset="true"><mm:write referid="user"/></mm:import>
+<mm:import jspvar="username" vartype="String" reset="true"><mm:write
referid="user"/></mm:import>
<mm:cloud jspvar="cloud">
<%
Index: prev_next.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/prev_next.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- prev_next.jsp 18 Jan 2008 17:41:13 -0000 1.11
+++ prev_next.jsp 4 Feb 2008 13:31:09 -0000 1.12
@@ -11,6 +11,7 @@
alt="${di:translate('education.previous')}" />
</a>
<a href="javascript:parent.previousContent();"
class="path"><di:translate key="education.previous" /></a>
+ <jsp:text> </jsp:text>
<mm:link page="/education/show.jspx">
<a class="popup"
href="#"
@@ -22,6 +23,7 @@
<di:translate key="education.pop" />
</a>
</mm:link>
+ <jsp:text> </jsp:text>
<a href="javascript:parent.nextContent();" class="path"><di:translate
key="education.next" /></a>
<a href="javascript:parent.nextContent();">
<img src="${mm:treelink('/gfx/icon_arrow_next.gif', includePath)}"
width="14" height="14" border="0"
Index: show.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/show.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- show.jspx 19 Jul 2007 16:06:15 -0000 1.1
+++ show.jspx 4 Feb 2008 13:31:09 -0000 1.2
@@ -11,8 +11,8 @@
<mm:cloud
rank="didactor user">
-
<mm:import externid="block" />
+
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<mm:link page="/core/js/sarissa/sarissa.js">
@@ -24,7 +24,7 @@
<mm:link page="/core/js/utils.js">
<script src="${_}"><!-- Help IE --></script>
</mm:link>
- <link rel="stylesheet" type="text/css"
href="${mm:treefile('/css/base.css', pageContext, includePath)}" />
+ <link rel="stylesheet" type="text/css"
href="${mm:treelink('/css/base.css', includePath)}" />
<style>
.prev_next {
display: none;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
