Update of /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form
In directory
james.mmbase.org:/tmp/cvs-serv24771/applications/vpro-wizards/tagfiles/form
Modified Files:
radiofield.tag checkboxrelation.tag hiddenfield.tag
textareafield.tag datefield.tag wizard.tag view.tag
radiobuttonrelation.tag container.tag optionfield.tag
filefield.tag createrelation.tag textfield.tag
richtextfield.tag
Log Message:
work in progress on the tagfiles
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/tagfiles/form
Index: radiofield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/radiofield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- radiofield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ radiofield.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -26,7 +26,7 @@
</c:choose>
<input type="radio" class="radio"
onchange="disableRelated();"
-
name="${modifier}${action}Actions[${actionnr}].fields[${field}]"
+
name="action[${modifier}${action}][${actionnr}].fields[${field}]"
value="${option.value}"
${checked}
id="field_${nodetype}_${field}_${option.value}"/>${option.label}<br>
Index: checkboxrelation.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/checkboxrelation.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- checkboxrelation.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ checkboxrelation.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -58,7 +58,7 @@
</mm:cloud>
</c:otherwise>
</c:choose>
- <c:set var="_action" value="${modifier}${action}Actions[${relationid}]"/>
+ <c:set var="_action" value="actions[${modifier}${action}][${relationid}]"/>
<%--do the form--%>
<div class="inputBlock">
Index: hiddenfield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/hiddenfield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hiddenfield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ hiddenfield.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -3,4 +3,4 @@
<[EMAIL PROTECTED] prefix="mm" uri="http://www.mmbase.org/mmbase-taglib-1.0";
%>
<%@ include file="fieldinit.tagf" %>
-<input type="hidden"
name="${modifier}${action}Actions[${actionnr}].fields[${field}]"
value="${fieldvalue}" id="field_${nodetype}_${field}">
+<input type="hidden"
name="actions[${modifier}${action}][${actionnr}].fields[${field}]"
value="${fieldvalue}" id="field_${nodetype}_${field}">
Index: textareafield.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/textareafield.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- textareafield.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ textareafield.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -14,7 +14,7 @@
<div class="inputBlock">
<div class="fieldName">${fieldname}</div>
<div class="fieldValue">
- <c:set var="_action"
value="${modifier}${action}Actions[${actionnr}].fields[${field}]" />
+ <c:set var="_action"
value="actions[${modifier}${action}][${actionnr}].fields[${field}]" />
<textarea onkeydown="disableRelated();" class="${size}"
id="field_${nodetype}_${field}" name="${_action}">${fieldvalue}</textarea>
</div>
</div>
\ No newline at end of file
Index: datefield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/datefield.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- datefield.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ datefield.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -21,7 +21,7 @@
--%>
<%@ include file="fieldinit.tagf" %>
-<c:set var="_action"
value="${modifier}${action}Actions[${actionnr}].dateFields[${field}]" />
+<c:set var="_action"
value="actions[${modifier}${action}][${actionnr}].dateFields[${field}]" />
<c:if test="${empty timeFormat}"><c:set var="timeFormat" value="HH:mm"
/></c:if>
<c:if test="${empty dateFormat}"><c:set var="dateFormat" value="dd-MM-yyyy"
/></c:if>
@@ -55,11 +55,6 @@
</c:if>
</c:when>
<c:otherwise>
- <%--
- why?
- <input type="hidden" onchange="disableRelated();"
name="${_action}.date" id="date_${field}" value="${_date}" >
- <input type="hidden" onchange="disablebRelated();"
name="${_action}.time" id="time_${field}" value="${_time}">
- --%>
<%--show the date / time without a form field--%>
<c:choose>
Index: wizard.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/wizard.tag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- wizard.tag 30 Jun 2008 14:20:24 -0000 1.4
+++ wizard.tag 22 Sep 2008 14:26:24 -0000 1.5
@@ -10,54 +10,51 @@
<%@ attribute name="noreferrer" type="java.lang.Boolean" description="by
default a referer cookie is set to indicate the current page, and it is used by
other pages to return to it. if you include an editor, you may not want to set
this here"%>
<%@ attribute name="header" fragment="true" description="include some stuff in
the html header element" %>
-<mm:cloud jspvar="cloud" method="loginpage"
loginpage="/mmbase/vpro-wizards/system/login.jsp" >
- <mm:content expires="0" type="text/html" encoding="utf-8" language="nl" >
- <%--
+<%--
Deze tag vormt de root van het hoofdformulier. De huidige pagina url
wordt in een cookie gezet.
De flush parameters worden in de request gezet
De css en javascript wordt geinclude
- --%>
+--%>
- <%-- set the current url in the referrer cookie--%>
- <c:if test="${empty noreferrer}">
+<%-- set the current url in the referrer cookie--%>
+<c:if test="${empty noreferrer}">
<util:setreferrer/>
- </c:if>
+</c:if>
- <c:set var="name" scope="request">${name}</c:set>
- <c:set var="wizardfile" scope="request">${wizardfile}</c:set>
- <c:set var="nodenr" scope="request">
+<c:set var="name" scope="request">${name}</c:set>
+<c:set var="wizardfile" scope="request">${wizardfile}</c:set>
+<c:set var="nodenr" scope="request">
<c:choose>
<c:when test="${not empty param.nodenr}">${param.nodenr}</c:when>
<c:otherwise>${nodenr}</c:otherwise>
</c:choose>
- </c:set>
+</c:set>
- <%--if flushname is not set, perhaps there is a parameter--%>
- <util:flushname value="${flushname}"/>
+<%--if flushname is not set, perhaps there is a parameter--%>
+<util:flushname value="${flushname}"/>
- <c:if test="${not empty param.path_url}">
+<c:if test="${not empty param.path_url}">
<c:set var="params"
scope="request">&path_url=${param.path_url}&path_name=${param.path_name}</c:set>
- </c:if>
-
+</c:if>
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+<mm:cloud jspvar="cloud" rank="basic user" method="loginpage"
loginpage="/edit/login.jsp" >
+ <c:set var="requestcloud" scope="request" value="${cloud}"/>
+ <mm:content expires="0" type="text/html" encoding="utf-8" >
<html>
<head>
<title>${title}</title>
- <script language="javascript">
- var contextPath = '${pageContext.request.contextPath}';
- </script>
- <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/mmbase/vpro-wizards/stylesheets/edit.css"/>
- <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/calendar.css">
+ <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/edit/stylesheets/edit.css"/>
+ <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/edit/system/javascript/calendar/calendar.css">
- <script type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/javascript.js"></script>
- <script type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/calendar.js"
></script>
- <script type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/clock.js"
></script>
- <script type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/FCKeditor/fckeditor.js"></script>
- <script type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/jquery/jquery.js"></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/edit/system/javascript/javascript.js"></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/edit/system/javascript/calendar/calendar.js"
></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/edit/system/javascript/calendar/clock.js"
></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/edit/system/javascript/FCKeditor/fckeditor.js"></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/edit/system/javascript/jquery/jquery.js"></script>
<jsp:invoke fragment="header"/>
</head>
<body>
@@ -76,8 +73,22 @@
</script>
</c:if>
+ <script type="text/javascript">
+ // Standaard save & annuleerknop uit.
+ //not a clue what it's for, and we don't seem to need it...
+ /*
+ var save = document.getElementById('save');
+ var annuleren = document.getElementById('annuleren');
+ var enableButtons =
document.getElementById('enableButtons');
+ enableButtons.style.display = 'block';
+ enableButtons.style.left = getleft(save)+'px';
+ enableButtons.style.top = gettop(save)+'px';
+ enableButtons.style.height = save.offsetHeight+'px';
+ enableButtons.style.width =
annuleren.offsetLeft-save.offsetLeft + annuleren.offsetWidth+'px';
+ */
+ </script>
<!--[if lt IE 7]>
- <script defer type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/pngfix.js"></script>
+ <script defer type="text/javascript"
src="${pageContext.request.contextPath}/edit/system/javascript/pngfix.js"></script>
<![endif]-->
</body>
</html>
Index: view.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/view.tag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- view.tag 23 Jun 2008 16:05:06 -0000 1.3
+++ view.tag 22 Sep 2008 14:26:24 -0000 1.4
@@ -15,8 +15,9 @@
<%@ attribute name="confirmdelete" type="java.lang.Boolean"
description="wether the user must confirm the deletion of the relation node.
defaults to true" %>
<%@ attribute name="search" type="java.lang.Boolean"%>
<%@ attribute name="create" type="java.lang.Boolean"%>
-<%@ attribute name="sortable" type="java.lang.Boolean" description="When this
is true, and there is a sort field, arrows are shown to push the nodes up and
down in the list." %>
-<%@ attribute name="sortfield" description="when you want to sort on
non-posrel relations"%>
+<%@ attribute name="sortable" type="java.lang.Boolean" description="When this
is true arrows are shown to push the nodes up and down in the list." %>
+<%@ attribute name="sortfield" description="when you want to sort on
non-posrel relations. it defaults to 'pos'"%>
+<%@ attribute name="relationrole" description="when you want to sort on
non-posrel relations. it defaults to 'posrel'"%>
<%@ attribute name="newwizard" description="create a new object with a given
wizard. If you dont give this a wizard name is created (assumed)." %>
<%@ attribute name="openwizard" %>
<%@ attribute name="relatedpage" description="this value will override the
generated url to the 'related' page. normally it is ${wizardfile}_$nodetype}.
this forces you to put the reled page in the current dir, what prevents reuse."
%>
@@ -58,25 +59,28 @@
-<c:if test="${sortable == true && empty relationrole}">
+<%--when only sortable is set, we assume a posrel relation (unless explicitely
overruled)--%>
+<c:if test="${sortable == true}">
+ <c:if test="${empty sortfield}">
+ <c:set var="sortfield" value="pos" />
+ </c:if>
+ <c:if test="${emtpy relationrole}">
<c:set var="relationrole" value="posrel" />
+ </c:if>
</c:if>
-<%-- default relatie insrel --%>
+<%-- default relation: insrel, no sort --%>
<c:if test="${empty relationrole}">
<c:set var="relationrole" value="related" />
<c:set var="sortable" value="false" />
+ <c:remove var="sortfield" />
</c:if>
-<%-- Als het om een posrel relatie gaat sorteer deze dan ook goed --%>
+<%-- set the orderby properly --%>
<c:choose>
- <c:when test="${relationrole eq 'posrel'}">
- <c:set var="orderby" value="posrel.pos" />
- </c:when>
- <c:when test="${not empty sortfield}">
+ <c:when test="${sortable == true}">
<c:set var="orderby" value="${relationrole}.${sortfield}" />
- <!--orderby: ${orderby}-->
</c:when>
<c:otherwise>
<c:set var="orderby" value="${nodetype}.number" />
@@ -106,14 +110,14 @@
<c:choose>
<c:when test="${not empty newwizard}">
<c:set var="newwizardparam" ><c:if test="${not empty
relationrole}">&relationrole=${relationrole}</c:if></c:set>
- <a
href="${newwizard}?parentnodenr=${param.nodenr}${newwizardparam}&${extra_params}"
class="addButton">nieuw
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new.png"
class="icon" border="0" title="Nieuw">
+ <a
href="${newwizard}?parentnodenr=${nodenr}${newwizardparam}&${extra_params}"
class="addButton">nieuw
+ <img
src="${pageContext.request.contextPath}/edit/system/img/new.png" class="icon"
border="0" title="Nieuw">
</a>
</c:when>
<c:otherwise>
- <a
href="${relatedpage}.jsp?nodenr=${nodenr}&create=true&apm;parentnodenr=${param.nodenr}&relationrole=${relationrole}&searchdir=${searchdir}&${extra_params}"
+ <a
href="${relatedpage}.jsp?nodenr=${nodenr}&create=true&relationrole=${relationrole}&searchdir=${searchdir}&${extra_params}"
class="addButton">nieuw <img
-
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new2.png"
+
src="${pageContext.request.contextPath}/edit/system/img/new2.png"
class="icon" border="0" alt=""></a>
</c:otherwise>
</c:choose>
@@ -128,7 +132,7 @@
<c:if test="${edit == true && empty openwizard}"><c:set
var="editparam" value="&edit=true"/></c:if>
<c:if test="${not empty openwizard}"><c:set var="editparam"
value="&openwizard=${openwizard}"/></c:if>
<a
href="${relatedpage}.jsp?nodenr=${nodenr}&search=true${editparam}&relationrole=${relationrole}&searchdir=${searchdir}&${extra_params}"
class="searchButton">zoeken
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new2.png"
class="icon" border="0" alt="">
+ <img
src="${pageContext.request.contextPath}/edit/system/img/new2.png" class="icon"
border="0" alt="">
</a>
</c:if>
</div>
@@ -160,47 +164,55 @@
<c:set var="urlup">
<mm:url page="/wizard/post">
- <mm:param
name="posrelSortActions[1].number" value="${_nodenr}" />
- <mm:param
name="posrelSortActions[1].containerNode" value="${nodenr}" />
- <mm:param
name="posrelSortActions[1].direction" value="up" />
- <c:if test="${relationrole !=
'posrel'}">
- <mm:param
name="posrelSortActions[1].role" value="${relationrole}" />
- </c:if>
+ <mm:param
name="actions[sortRelation][1].sourceNodeNumber" value="${nodenr}" />
+ <mm:param
name="actions[sortRelation][1].destinationNodeNumber" value="${_nodenr}" />
+ <mm:param
name="actions[sortRelation][1].direction" value="up" />
+ <mm:param
name="actions[sortRelation][1].role" value="${relationrole}" />
+ <mm:param
name="actions[sortRelation][1].sortField" value="${sortfield}" />
<mm:param name="flushname"
value="${flushname}" />
</mm:url>
</c:set>
<c:set var="urldown">
<mm:url page="/wizard/post">
- <mm:param
name="posrelSortActions[1].number" value="${_nodenr}" />
- <mm:param
name="posrelSortActions[1].containerNode" value="${nodenr}" />
- <mm:param
name="posrelSortActions[1].direction" value="down" />
- <c:if test="${relationrole !=
'posrel'}">
- <mm:param
name="posrelSortActions[1].role" value="${relationrole}" />
- </c:if>
+ <mm:param
name="actions[sortRelation][1].sourceNodeNumber" value="${nodenr}" />
+ <mm:param
name="actions[sortRelation][1].destinationNodeNumber" value="${_nodenr}" />
+ <mm:param
name="actions[sortRelation][1].direction" value="down" />
+ <mm:param
name="actions[sortRelation][1].role" value="${relationrole}" />
+ <mm:param
name="actions[sortRelation][1].sortField" value="${sortfield}" />
<mm:param name="flushname"
value="${flushname}" />
</mm:url>
</c:set>
+
<mm:last inverse="true">
- <%--
- <a style="text-decoration:none"
href="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=up&type=${type}#${anchor}"
class="movedown" onclick="return checkSearch(this);">
- --%>
<a style="text-decoration:none"
href="${urldown}" class="movedown" onclick="return checkSearch(this);">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/arrow_down.png"
class="icon" border="0" />
+ <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_down.png"
class="icon" border="0" />
</a>
</mm:last>
+
+ <mm:last>
+ <%--placeholder to align te icons--%>
+ <span style="float:left; width:
16px;"> </span>
+ </mm:last>
+
<c:if test="${not empty _pos}">
- <span class="position"
style="float:left">${_pos}</span>
+ <span class="position"
style="float:left"><c:if test="${_pos lt 10}">0</c:if>${_pos}</span>
</c:if>
+
+ <mm:first>
+ <%--placeholder to align te icons--%>
+ <span style="float:left; width:
18px;"> </span>
+ </mm:first>
<mm:first inverse="true">
<%--
- <a style="text-decoration:none"
href="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=down&type=${type}#${anchor}"
class="moveup" onclick="return checkSearch(this);">
+ <a style="text-decoration:none"
href="${pageContext.request.contextPath}/edit/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=down&type=${type}#${anchor}"
class="moveup" onclick="return checkSearch(this);">
--%>
<a style="text-decoration:none"
href="${urlup}" class="moveup" onclick="return checkSearch(this);">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/arrow_up.png"
class="icon" border="0" />
+ <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_up.png"
class="icon" border="0" />
</a>
</mm:first>
+
</c:if>
</div>
@@ -212,10 +224,10 @@
<c:if test="${delete && not empty maydelete}">
<mm:link page="/wizard/post">
- <mm:param
name="deleteNodeActions[1].number" value="${_relationnr}" />
+ <mm:param
name="actions[deleteNode][1].number" value="${_relationnr}" />
<mm:param name="flushname"
value="${flushname}" />
<a href="${_}" class="delete"
onclick="return doConfirm(${confirmdelete}, 'Weet je zeker dat je dit object
wilt loskoppelen?')">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/unlink.png"
class="icon" border="0" alt="" title="Koppel los"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/unlink.png"
class="icon" border="0" alt="" title="Koppel los"/>
</a>
</mm:link>
</c:if>
@@ -225,15 +237,15 @@
<mm:maywrite>
<c:choose>
<c:when test="${not empty openwizard}">
- <a
href="${openwizard}?nodenr=${_nodenr}&parentnodenr=${param.nodenr}&relationrole=${relationrole}&${extra_params}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit.png"
class="icon" border="0" alt="" title="Aanpassen"/>
+ <a
href="${openwizard}?nodenr=${_nodenr}&parentnodenr=${param.nodenr}&relationrole=${relationrole}&searchdir=${searchdir}${extra_params}">
+ <img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" alt="" title="Aanpassen"/>
</a>
</c:when>
<c:when test="${edit}">
<c:remove var="editparam" />
<c:if test="${empty
openwizard}"><c:set var="editparam" value="&edit=true" /></c:if>
- <a
href="${relatedpage}.jsp?nodenr=${nodenr}${editparam}&parentnodenr=${param.nodenr}&relationrole=${relationrole}&editnodenr=${currentnode.number}&${extra_params}"
class="edit">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit.png"
class="icon" border="0" alt="" title="Aanpassen"/>
+ <a
href="${relatedpage}.jsp?nodenr=${nodenr}${editparam}&parentnodenr=${param.nodenr}&relationrole=${relationrole}&editnodenr=${currentnode.number}&searchdir=${searchdir}&${extra_params}"
class="edit">
+ <img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" alt="" title="Aanpassen"/>
</a>
</c:when>
<c:otherwise>
@@ -254,7 +266,7 @@
<c:choose>
<c:when test="${nodetype eq 'images'}">
<util:image urlvar = "url"
nodenr="${_nodenr}"/>
- <util:image urlvar = "previewurl"
nodenr="${_nodenr}" template="s(50)"/>
+ <util:image urlvar = "previewurl"
nodenr="${_nodenr}" template="+s(40)+part(0x0x40x40)+s(!40x!40)"/>
<a target="image" href="${url}">
<img alt="gerelateerde afbeelding"
src="${previewurl}" class="image" border="0" />
</a>
Index: radiobuttonrelation.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/radiobuttonrelation.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- radiobuttonrelation.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ radiobuttonrelation.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -16,36 +16,36 @@
<div class="fieldValue">
<c:choose>
<c:when test="${empty nodenr}">
- <c:set var="actiontype"
scope="request">createCheckboxRelationActions</c:set>
+ <c:set var="actiontype"
scope="request">actions[toggleRelation]</c:set>
<c:remove var="checked" /><c:if test="${not
defaultrelated}"><c:set var="checked" >checked="checked"</c:set></c:if>
- <input class="radio" type="radio" onclick="disableRelated();"
name="createCheckboxRelationActions[${relationid}].relate" ${checked}
value="false" id="field_${nodetype}_${field}_false"/>${decouplename}<br>
+ <input class="radio" type="radio" onclick="disableRelated();"
name="actions[toggleRelation][${relationid}].relate" ${checked} value="false"
id="field_${nodetype}_${field}_false"/>${decouplename}<br>
<c:remove var="checked" /><c:if test="${defaultrelated}"><c:set
var="checked" >checked="checked"</c:set></c:if>
- <input class="radio" type="radio" onclick="disableRelated();"
name="createCheckboxRelationActions[${relationid}].relate"${checked}
value="true" id="field_${nodetype}_${field}_true"/>${relatename}<br>
+ <input class="radio" type="radio" onclick="disableRelated();"
name="actions[toggleRelation][${relationid}].relate"${checked} value="true"
id="field_${nodetype}_${field}_true"/>${relatename}<br>
- <input type="hidden"
name="createCheckboxRelationActions[${relationid}].referSource" value="new" />
- <input type="hidden"
name="createCheckboxRelationActions[${relationid}].destination"
value="${destinationnode}" />
- <input type="hidden"
name="createCheckboxRelationActions[${relationid}].role"
value="${relationrole}" />
+ <input type="hidden"
name="actions[toggleRelation][${relationid}].sourceNodeRef" value="new" />
+ <input type="hidden"
name="actions[toggleRelation][${relationid}].destinationNodeNumber"
value="${destinationnode}" />
+ <input type="hidden"
name="actions[toggleRelation][${relationid}].role" value="${relationrole}" />
</c:when>
<c:otherwise>
<mm:cloud method="asis">
- <c:set var="actiontype"
scope="request">updateCheckboxRelationActions</c:set>
+ <c:set var="actiontype"
scope="request">actions[toggleRelation]</c:set>
<c:set var="destnode"><mm:node
number="${destinationnode}"><mm:field name="number"/></mm:node></c:set>
<c:set var="destnodetype"><mm:node
number="${destinationnode}"><mm:nodeinfo type="type"/></mm:node></c:set>
<mm:node number="${nodenr}">
<c:set var="relationExists">false</c:set>
<c:set var="relationExists"><mm:relatednodes
type="${destnodetype}" constraints="number=${destnode}"
max="1">true</mm:relatednodes></c:set>
- <input class="radio" type="radio" onclick="disableRelated();"
name="updateCheckboxRelationActions[${relationid}].relate" value="false"
+ <input class="radio" type="radio" onclick="disableRelated();"
name="actions[toggleRelation][${relationid}].relate" value="false"
<c:if test="${not relationExists}">checked="checked"</c:if>
/> ${decouplename}<br>
- <input class="radio" type="radio" onclick="disableRelated();"
name="updateCheckboxRelationActions[${relationid}].relate" value="true"
+ <input class="radio" type="radio" onclick="disableRelated();"
name="actions[toggleRelation][${relationid}].relate" value="true"
<c:if test="${relationExists}">checked="checked"</c:if>
/> ${relatename}<br>
- <input type="hidden"
name="updateCheckboxRelationActions[${relationid}].source" value="${nodenr}" />
- <input type="hidden"
name="updateCheckboxRelationActions[${relationid}].destination"
value="${destinationnode}" />
- <input type="hidden"
name="updateCheckboxRelationActions[${relationid}].role"
value="${relationrole}" />
+ <input type="hidden"
name="actions[toggleRelation][${relationid}].sourceNodeNumber"
value="${nodenr}" />
+ <input type="hidden"
name="actions[toggleRelation][${relationid}].destinationNodeNumber"
value="${destinationnode}" />
+ <input type="hidden"
name="actions[toggleRelation][${relationid}].role" value="${relationrole}" />
</mm:node>
</mm:cloud>
</c:otherwise>
Index: container.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/container.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- container.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ container.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -30,7 +30,7 @@
<%--do the body, and catch an exception if there is one. --%>
<c:set var="body">
- <util:try setMessageAs="m" setExceptionAs="ex" stacktrace="true">
+ <util:try setMessageAs="m" setExceptionAs="ex" stacktrace="false">
<jsp:attribute name="catchit">
<div class="error">Er gaat iets fout bij het afdrukken van een
veld. reden: ${m}</div>
</jsp:attribute>
@@ -46,12 +46,12 @@
<%--set the default fields for this action in the form--%>
<c:if test="${modifier == 'create'}">
- <input type="hidden" name="${modifier}${action}Actions[].id"
value="new"/>
- <input type="hidden" name="${modifier}${action}Actions[].type"
value="${nodetype}"/>
+ <input type="hidden" name="actions[${modifier}${action}][].id"
value="new"/>
+ <input type="hidden" name="actions[${modifier}${action}][].type"
value="${nodetype}"/>
</c:if>
<%--if --%>
<c:if test="${modifier == 'update'}">
- <input type="hidden"
name="${modifier}${action}Actions[${nodenr}].number" value="${nodenr}"/>
+ <input type="hidden"
name="actions[${modifier}${action}][${nodenr}].number" value="${nodenr}"/>
</c:if>
<c:out value="${body}" escapeXml="false"/>
Index: optionfield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/optionfield.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- optionfield.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ optionfield.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -26,7 +26,7 @@
<div class="inputBlock">
<div class="fieldName">${fieldname}</div>
<div class="fieldValue">
- <select onchange="disableRelated();"
name="${modifier}${action}Actions[${actionnr}].fields[${field}]"
id="field_${nodetype}_${field}">
+ <select onchange="disableRelated();"
name="actions[${modifier}${action}][${actionnr}].fields[${field}]"
id="field_${nodetype}_${field}">
<c:if test="${modifier == 'create' && empty fieldvalue}">
<option value="" >-- kies een optie --</option>
</c:if>
Index: filefield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/filefield.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- filefield.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ filefield.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -28,7 +28,7 @@
</c:otherwise>
</c:choose>
</c:if>
- <input type="file"
name="${modifier}${action}Actions[${actionnr}].file" value=""
onchange="disableRelated();" class="file" id="field_${nodetype}_${field}">
+ <input type="file"
name="actions[${modifier}${action}][${actionnr}].file" value=""
onchange="disableRelated();" class="file" id="field_${nodetype}_${field}">
</div>
</div>
</mm:cloud>
Index: createrelation.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/createrelation.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- createrelation.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ createrelation.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -43,19 +43,19 @@
<c:if test="${not empty referSource}">
- <input type="hidden"
name="createRelationActions[${relationid}].referSource" value="${referSource}"
/>
+ <input type="hidden"
name="actions[createRelation][${relationid}].referSource"
value="${referSource}" />
</c:if>
<c:if test="${not empty source}">
- <input type="hidden"
name="createRelationActions[${relationid}].source" value="${source}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].source" value="${source}" />
</c:if>
<c:if test="${not empty referDestination}">
- <input type="hidden"
name="createRelationActions[${relationid}].referDestination"
value="${referDestination}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].referDestination"
value="${referDestination}" />
</c:if>
<c:if test="${not empty destination}">
- <input type="hidden"
name="createRelationActions[${relationid}].destination" value="${destination}"
/>
+ <input type="hidden"
name="actions[createRelation][${relationid}].destination"
value="${destination}" />
</c:if>
<c:if test="${not empty role}">
- <input type="hidden" name="createRelationActions[${relationid}].role"
value="${role}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].role" value="${role}" />
</c:if>
<%-- do the body--%>
Index: textfield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/textfield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- textfield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ textfield.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -9,6 +9,6 @@
<div class="inputBlock">
<div class="fieldName">${fieldname}</div>
<div class="fieldValue">
- <input onkeydown="disableRelated();" type="text" size="80"
name="${modifier}${action}Actions[${actionnr}].fields[${field}]"
value="${fieldvalue}" id="field_${nodetype}_${field}"/>
+ <input onkeydown="disableRelated();" type="text" size="80"
name="actions[${modifier}${action}][${actionnr}].fields[${field}]"
value="${fieldvalue}" id="field_${nodetype}_${field}"/>
</div>
</div>
Index: richtextfield.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/richtextfield.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- richtextfield.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ richtextfield.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -34,14 +34,14 @@
</c:choose>
</mm:import>
- <c:set var="_action"
value="${modifier}${action}Actions[${actionnr}].fields[${field}]" />
+ <c:set var="_action"
value="actions[${modifier}${action}][${actionnr}].fields[${field}]" />
<textarea onchange="disableRelated();" id="field_${nodetype}_${field}"
name="${_action}"><mm:write referid="temp" escape="trimmer"/></textarea>
</div>
</div>
<script type="text/javascript">
var oFCKeditor = new FCKeditor( 'field_${nodetype}_${field}' ) ;
- oFCKeditor.BasePath =
'${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/FCKeditor/';
+ oFCKeditor.BasePath =
'${pageContext.request.contextPath}/edit/system/javascript/FCKeditor/';
oFCKeditor.Config['ToolbarStartExpanded'] = true ;
<%-- TODO deze check eruit halen --%>
<c:choose>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
