Update of /var/cvs/contributions/didactor2/src/register/templates/register
In directory james.mmbase.org:/tmp/cvs-serv3290
Modified Files:
form.jspx index.jsp people.fields.jspx register_form.jsp
submit.jspx thanks.jspx
Added Files:
path.jsp
Log Message:
started on a refactoring of this stuff
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/register/templates/register
path.jsp is new
Index: form.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/register/templates/register/form.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- form.jspx 13 Dec 2007 15:39:47 -0000 1.6
+++ form.jspx 3 Mar 2008 16:09:44 -0000 1.7
@@ -50,7 +50,7 @@
<mm:commit />
- <mm:treefile id="thanks" cloud="cloud" page="/register/index.jsp"
+ <mm:treefile id="thanks" page="/register/index.jsp"
objectlist="$includePath" referids="$referids,nextform?">
<mm:param name="formsubmit">true</mm:param>
</mm:treefile>
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/register/templates/register/index.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- index.jsp 12 Oct 2007 16:37:56 -0000 1.23
+++ index.jsp 3 Mar 2008 16:09:44 -0000 1.24
@@ -1,32 +1,38 @@
-<[EMAIL PROTECTED] session="true" language="java" contentType="text/html;
charset=UTF-8"
-%><[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:cloud>
- <mm:content postprocessor="reducespace" language="$language" expires="0">
-
- <mm:treeinclude page="/cockpit/cockpit_intro_header.jsp"
objectlist="$includePath" referids="$referids">
- <mm:param name="extraheader">
- <link rel="stylesheet" type="text/css"
href="${mm:treefile('/register/css/register.css', pageContext, includePath)}"
/>
- <jsp:directive.include file="/mmbase/validation/javascript.jspxf" />
- </mm:param>
- </mm:treeinclude>
-
- <mm:import externid="formsubmit">false</mm:import>
-
- <mm:compare referid="formsubmit" value="true">
- <mm:import externid="nextform" />
- <mm:log>Submitted, next form '<mm:write referid="nextform" />'</mm:log>
- <mm:isempty referid="nextform">
- <mm:treeinclude page="/register/register_done.jsp"
objectlist="$includePath" referids="$referids" />
- </mm:isempty>
- <mm:isnotempty referid="nextform">
- <mm:log>Next form</mm:log>
- <mm:treeinclude page="/register/register_form.jsp"
objectlist="$includePath" referids="$referids,[EMAIL PROTECTED]" />
- </mm:isnotempty>.
- </mm:compare>
- <mm:compare referid="formsubmit" value="false">
- <mm:treeinclude page="/register/register_form.jsp"
objectlist="$includePath" referids="$referids" />
- </mm:compare>
+<jsp:root version="2.0"
+ xmlns:t="urn:jsptagdir:/WEB-INF/tags/mm/u"
+ 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";
+ >
+ <!--
+ xmlns:di-t="urn:jsptagdir:/WEB-INF/tags/di/core"
+ -->
+ <di:html
+ css="/register/css/register.css"
+ type="text/html"
+ rank="anonymous"
+ title_key="register.registration"
+ component="register">
-</mm:content>
-</mm:cloud>
+ <div class="columns">
+ <div class="columnLeft"><jsp:text> </jsp:text></div>
+
+ <div class="columnMiddle">
+ <h2><di:translate key="register.registration" /></h2>
+
+ <mm:import id="path">
+ <di:include page="/register/path.jsp" />
+ </mm:import>
+
+ <t:tabs
+ styleClass="registerTable"
+ directory="/register/"
+ objectlist="${includePath}"
+ path="${path}" />
+
+ </div>
+
+ </div>
+
+ </di:html>
+</jsp:root>
Index: people.fields.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/register/templates/register/people.fields.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- people.fields.jspx 12 Oct 2007 16:37:56 -0000 1.4
+++ people.fields.jspx 3 Mar 2008 16:09:44 -0000 1.5
@@ -4,7 +4,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
>
<jsp:output omit-xml-declaration="true" />
- <mm:import externid="formtest" />
+
<mm:fieldlist id="people" nodetype="people"
fields="gender,${di:setting('core',
'admin_personfields')},dayofbirth,email,username">
<tr>
<td><mm:fieldinfo type="guiname" />:</td>
Index: register_form.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/register/templates/register/register_form.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- register_form.jsp 12 Oct 2007 16:37:56 -0000 1.14
+++ register_form.jsp 3 Mar 2008 16:09:44 -0000 1.15
@@ -1,7 +1,7 @@
<[EMAIL PROTECTED] session="true" language="java" contentType="text/html;
charset=UTF-8"
%><[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:cloud id="cloud" method="asis">
+%><mm:cloud method="asis">
<mm:content postprocessor="none">
<mm:import externid="formId"></mm:import>
<div class="columns">
Index: submit.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/register/templates/register/submit.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- submit.jspx 12 Oct 2007 16:37:56 -0000 1.4
+++ submit.jspx 3 Mar 2008 16:09:44 -0000 1.5
@@ -1,4 +1,5 @@
-<mm:cloud
+<jsp:root
+ version="2.0"
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:jsp="http://java.sun.com/JSP/Page";
@@ -13,11 +14,12 @@
<mm:fieldinfo type="useinput" />
</mm:fieldlist>
<mm:setfield name="password"><mm:function id="password" set="utils"
name="generatePassword" referids="template" /></mm:setfield>
+ <mm:setfield name="username">
</mm:createnode>
- <mm:createrelation cloud="cloud" role="related" source="education"
destination="person" />
+ <mm:createrelation role="related" source="education" destination="person" />
<mm:log>Created person ${person.username}, for education
${education}</mm:log>
<mm:write session="registerPerson" referid="person" escape="none"/>
<mm:write session="registerPassword" referid="password" escape="none" />
-</mm:cloud>
+</jsp:root>
Index: thanks.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/register/templates/register/thanks.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- thanks.jspx 3 Jul 2007 08:18:12 -0000 1.2
+++ thanks.jspx 3 Mar 2008 16:09:44 -0000 1.3
@@ -4,7 +4,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
authenticate="asis">
<jsp:output omit-xml-declaration="true" />
- <jsp:directive.include file="/shared/setImports.jsp" />
+ <div>
<p>
<di:translate key="register.thankyou" />
</p>
@@ -20,5 +20,6 @@
</a>
</mm:treefile>
</p>
+ </div>
</mm:cloud>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
