Update of /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/related
In directory
james.mmbase.org:/tmp/cvs-serv24771/applications/vpro-wizards/tagfiles/related
Modified Files:
createrelation.tag wizard.tag add.tag view.tag
Log Message:
work in progress on the tagfiles
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/tagfiles/related
Index: createrelation.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/related/createrelation.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- createrelation.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ createrelation.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -17,17 +17,17 @@
<c:set var="relationid" scope="request" value="${relationid+1}"/>
<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>
Index: wizard.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/related/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
@@ -31,7 +31,7 @@
<util:addParam name="editnodenr" parameter="editnodenr"/>
--%>
-<mm:content type="text/html" expires="0" encoding="utf-8" language="nl">
+<mm:content type="text/html" expires="0" encoding="utf-8" >
<c:set var="relationrole" scope="request" value="${relationrole}" />
<%-- set the current url in the referrer cookie--%>
@@ -66,29 +66,25 @@
<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 class="related">
- <mm:cloud jspvar="cloud" method="loginpage"
loginpage="/mmbase/vpro-wizards/system/login.jsp" >
+ <mm:cloud jspvar="cloud" rank="basic user" method="loginpage"
loginpage="/edit/login.jsp" >
+ <c:set var="requestcloud" scope="request" value="${cloud}"/>
<util:header/>
- </mm:cloud>
-
<c:if test="${showback}">
<div class="terug">
<a href="${back}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/arrow_back.png"
class="icon" border="0" alt="0"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_back.png"
class="icon" border="0" alt="0"/>
terug
</a>
</div>
@@ -96,16 +92,6 @@
<%--do the body, and catch an exception if there is one--%>
<div class="relatedview">
- <%--
- <util:try setMessageAs="m" setExceptionAs="ex"
stacktrace="false">
- <jsp:attribute name="catchit">
- <div class="error">Error: ${m}</div>
- </jsp:attribute>
- <jsp:body>
- <jsp:doBody/>
- </jsp:body>
- </util:try>
- --%>
<jsp:doBody/>
</div>
@@ -115,8 +101,9 @@
function disableRelated(){ }
</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]-->
+ </mm:cloud>
</body>
</html>
</mm:content>
\ No newline at end of file
Index: add.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/related/add.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- add.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ add.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -24,15 +24,15 @@
<div class="addFields">
<div id="addclosed" <c:if test="${param.create eq true}">
style="display:none;"</c:if>>
<a href="javascript:hideshow('addclosed','addopen')" class="header">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/fold_closed.png"
class="icon fold" border="0"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/fold_closed.png"
class="icon fold" border="0"/>
nieuw
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new.png"
class="icon" border="0"/></a>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/new.png" class="icon"
border="0"/></a>
</div>
<div id="addopen" <c:if test="${param.create ne true}">
style="display:none;"</c:if>>
<a href="javascript:hideshow('addopen','addclosed')" class="header">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/fold_open.png"
class="icon fold" border="0"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/fold_open.png"
class="icon fold" border="0"/>
nieuw
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new.png"
class="icon" border="0" />
+ <img
src="${pageContext.request.contextPath}/edit/system/img/new.png" class="icon"
border="0" />
</a>
<jsp:doBody var="body"/>
@@ -46,8 +46,8 @@
<c:if test="${not empty flushname}">
<input type="hidden" name="flushname" value="${flushname}" />
</c:if>
- <input type="hidden" name="createNodeActions[].id" value="new"/>
- <input type="hidden" name="createNodeActions[].type"
value="${nodetype}"/>
+ <input type="hidden" name="actions[createNode][].id" value="new"/>
+ <input type="hidden" name="actions[createNode][].type"
value="${nodetype}"/>
<%--
<jsp:doBody/>
--%>
Index: view.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/related/view.tag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- view.tag 30 Jun 2008 13:09:52 -0000 1.3
+++ view.tag 22 Sep 2008 14:26:24 -0000 1.4
@@ -89,8 +89,8 @@
<input type="hidden" name="nodenr"
value="${_nodenr}" />
--%>
- <input type="hidden"
name="updateNodeActions[${_nodenr}].type" value="${nodetype}"/>
- <input type="hidden"
name="updateNodeActions[${_nodenr}].number" value="${_nodenr}"/>
+ <input type="hidden"
name="actions[updateNode][${_nodenr}].type" value="${nodetype}"/>
+ <input type="hidden"
name="actions[updateNode][${_nodenr}].number" value="${_nodenr}"/>
<%--toon de velden die geedit kunnen worden--%>
<%--
@@ -136,33 +136,37 @@
<c:if test="${sortable == true}">
<c:set var="urlup">
<mm:url page="/wizard/post">
- <mm:param
name="posrelSortActions[${_relationnr}].number" value="${_nodenr}" />
- <mm:param
name="posrelSortActions[${_relationnr}].containerNode" value="${nodenr}" />
- <mm:param
name="posrelSortActions[${_relationnr}].direction" value="up" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].destinationNodeNumber"
value="${_nodenr}" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].sourceNodeNumber" value="${nodenr}"
/>
+ <mm:param
name="actions[sortRelation][${_relationnr}].direction" value="up" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].role" value="posrel" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].sortField" value="pos" />
<mm:param name="flushname"
value="${flushname}" />
</mm:url>
</c:set>
<c:set var="urldown">
<mm:url page="/wizard/post">
- <mm:param
name="posrelSortActions[${_relationnr}].number" value="${_nodenr}" />
- <mm:param
name="posrelSortActions[${_relationnr}].containerNode" value="${nodenr}" />
- <mm:param
name="posrelSortActions[${_relationnr}].direction" value="down" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].destinationNodeNumber"
value="${_nodenr}" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].sourceNodeNumber" value="${nodenr}"
/>
+ <mm:param
name="actions[sortRelation][${_relationnr}].direction" value="down" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].role" value="posrel" />
+ <mm:param
name="actions[sortRelation][${_relationnr}].sortField" value="pos" />
<mm:param name="flushname"
value="${flushname}" />
</mm:url>
</c:set>
<%--arrow down--%>
<mm:last inverse="true">
- <%-- <a
style="text-decoration:none"
href="/mmbase/vpro-wizards/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=up${params}"
class="movedown" onclick="return checkSearch(this);"> --%>
+ <%-- <a
style="text-decoration:none"
href="/edit/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=up${params}"
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" title="Sorteer"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_down.png"
class="icon" border="0" title="Sorteer"/>
</a>
</mm:last>
<%--arrow up--%>
<mm:first inverse="true">
- <%-- <a
style="text-decoration:none"
href="/mmbase/vpro-wizards/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=down${params}"
class="moveup" onclick="return checkSearch(this);"> --%>
+ <%-- <a
style="text-decoration:none"
href="/edit/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=down${params}"
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" title="Sorteer"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_up.png"
class="icon" border="0" title="Sorteer"/>
</a>
</mm:first>
</c:if>
@@ -174,31 +178,68 @@
<c:if test="${delete && not empty
maydelete}">
<c:set var="url" >
<mm:url 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}" />
</mm:url>
</c:set>
- <a href="${url}" 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" title="Koppel los"/></a>
+ <a href="${url}" class="delete"
onclick="return doConfirm(${confirmdelete}, 'Weet je zeker dat je dit object
wilt loskoppelen?')"><img
src="${pageContext.request.contextPath}/edit/system/img/unlink.png"
class="icon" border="0" title="Koppel los"/></a>
</c:if>
<c:remove var="maydelete"/>
<%--edit button--%>
+ <%--
+ <c:if test="${edit}">
+ <a
href="${pageContext.request.contextPath}${pageContext.request.servletPath}?${params}&editnodenr=${_nodenr}"
class="edit"><img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" title="Aanpassen!!"/></a>
+ </c:if>
+ <c:if test="${not empty param.openwizard}">
+ <a
href="${param.openwizard}?nodenr=${_nodenr}&${params}" class="edit"><img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" title="Aanpassen!!"/></a>
+ </c:if>
+ --%>
+
+ <%--edit button--%>
<c:if test="${edit}">
<c:choose>
<c:when test="${not empty
param.openwizard}">
<a
href="${param.openwizard}?nodenr=${_nodenr}&${params}" class="edit">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit.png"
class="icon" border="0" title="Aanpassen!!"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" title="Aanpassen!!"/>
</a>
</c:when>
<c:otherwise>
<a
href="${pageContext.request.contextPath}${pageContext.request.servletPath}?${params}&editnodenr=${_nodenr}"
class="edit">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit.png"
class="icon" border="0" title="Aanpassen!!"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" title="Aanpassen!!"/>
</a>
</c:otherwise>
</c:choose>
</c:if>
+
</div>
<%--
+ <c:choose>
+ <c:when test="${nodetype eq 'images'}">
+ <util:image nodenr="${_nodenr}"
urlvar="url"/>
+ <util:image nodenr="${_nodenr}"
template="+s(40)+part(0x0x40x40)+s(!40x!40)" urlvar="previewurl"/>
+ <a target="image" href="${url}">
+ <img src="${previewurl}"
class="image" border="0"/>
+ </a>
+ </c:when>
+
+ <c:when test="${nodetype eq
'attachments'}">
+ <mm:node element="${nodetype}">
+ <c:set var="number" ><mm:field
name="number" /></c:set>
+ <util:attachment
nodenr="${number}" urlvar="url"/>
+ <a href="${url}"><mm:field
name="title" /></a>
+ </mm:node>
+ </c:when>
+
+ <c:otherwise>
+ <mm:node element="${nodetype}">
+ <mm:field name="gui()"/>
+ </mm:node>
+ </c:otherwise>
+ </c:choose>
+ --%>
+
+ <%--
show the gui value for this node.
when the 'display' fragment is set, use
that
--%>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
