Update of /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form
In directory
james.mmbase.org:/tmp/cvs-serv9403/applications/vpro-wizards/tagfiles/form
Modified Files:
view.tag container.tag createrelation.tag richtextfield.tag
wizard.tag
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/tagfiles/form
Index: view.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/view.tag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- view.tag 22 Sep 2008 14:26:24 -0000 1.4
+++ view.tag 8 Oct 2008 08:28:57 -0000 1.5
@@ -17,7 +17,6 @@
<%@ attribute name="create" type="java.lang.Boolean"%>
<%@ 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."
%>
@@ -64,7 +63,7 @@
<c:if test="${empty sortfield}">
<c:set var="sortfield" value="pos" />
</c:if>
- <c:if test="${emtpy relationrole}">
+ <c:if test="${empty relationrole}">
<c:set var="relationrole" value="posrel" />
</c:if>
</c:if>
@@ -111,13 +110,13 @@
<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=${nodenr}${newwizardparam}&${extra_params}"
class="addButton">nieuw
- <img
src="${pageContext.request.contextPath}/edit/system/img/new.png" class="icon"
border="0" title="Nieuw">
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new.png"
class="icon" border="0" title="Nieuw">
</a>
</c:when>
<c:otherwise>
<a
href="${relatedpage}.jsp?nodenr=${nodenr}&create=true&relationrole=${relationrole}&searchdir=${searchdir}&${extra_params}"
class="addButton">nieuw <img
-
src="${pageContext.request.contextPath}/edit/system/img/new2.png"
+
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new2.png"
class="icon" border="0" alt=""></a>
</c:otherwise>
</c:choose>
@@ -132,7 +131,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}/edit/system/img/new2.png" class="icon"
border="0" alt="">
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/new2.png"
class="icon" border="0" alt="">
</a>
</c:if>
</div>
@@ -185,7 +184,7 @@
<mm:last inverse="true">
<a style="text-decoration:none"
href="${urldown}" class="movedown" onclick="return checkSearch(this);">
- <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_down.png"
class="icon" border="0" />
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/arrow_down.png"
class="icon" border="0" />
</a>
</mm:last>
@@ -204,10 +203,10 @@
</mm:first>
<mm:first inverse="true">
<%--
- <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="${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="${urlup}" class="moveup" onclick="return checkSearch(this);">
- <img
src="${pageContext.request.contextPath}/edit/system/img/arrow_up.png"
class="icon" border="0" />
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/arrow_up.png"
class="icon" border="0" />
</a>
</mm:first>
@@ -227,7 +226,7 @@
<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}/edit/system/img/unlink.png"
class="icon" border="0" alt="" title="Koppel los"/>
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/unlink.png"
class="icon" border="0" alt="" title="Koppel los"/>
</a>
</mm:link>
</c:if>
@@ -238,14 +237,14 @@
<c:choose>
<c:when test="${not empty openwizard}">
<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"/>
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/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}&searchdir=${searchdir}&${extra_params}"
class="edit">
- <img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" alt="" title="Aanpassen"/>
+ <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit.png"
class="icon" border="0" alt="" title="Aanpassen"/>
</a>
</c:when>
<c:otherwise>
Index: container.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/container.tag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- container.tag 22 Sep 2008 14:26:24 -0000 1.3
+++ container.tag 8 Oct 2008 08:28:57 -0000 1.4
@@ -47,11 +47,12 @@
<%--set the default fields for this action in the form--%>
<c:if test="${modifier == 'create'}">
<input type="hidden" name="actions[${modifier}${action}][].id"
value="new"/>
- <input type="hidden" name="actions[${modifier}${action}][].type"
value="${nodetype}"/>
+ <input type="hidden"
name="actions[${modifier}${action}][].nodeType" value="${nodetype}"/>
+ <input type="hidden"
name="actions[${modifier}${action}][].nodeAsParam" value="nodenr"/>
</c:if>
<%--if --%>
<c:if test="${modifier == 'update'}">
- <input type="hidden"
name="actions[${modifier}${action}][${nodenr}].number" value="${nodenr}"/>
+ <input type="hidden"
name="actions[${modifier}${action}][${nodenr}].nodenr" value="${nodenr}"/>
</c:if>
<c:out value="${body}" escapeXml="false"/>
Index: createrelation.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/createrelation.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- createrelation.tag 22 Sep 2008 14:26:24 -0000 1.2
+++ createrelation.tag 8 Oct 2008 08:28:57 -0000 1.3
@@ -43,16 +43,16 @@
<c:if test="${not empty referSource}">
- <input type="hidden"
name="actions[createRelation][${relationid}].referSource"
value="${referSource}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].sourceNodeRef"
value="${referSource}" />
</c:if>
<c:if test="${not empty source}">
- <input type="hidden"
name="actions[createRelation][${relationid}].source" value="${source}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].sourceNodeNumberr"
value="${source}" />
</c:if>
<c:if test="${not empty referDestination}">
- <input type="hidden"
name="actions[createRelation][${relationid}].referDestination"
value="${referDestination}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].destinationNodeRef"
value="${referDestination}" />
</c:if>
<c:if test="${not empty destination}">
- <input type="hidden"
name="actions[createRelation][${relationid}].destination"
value="${destination}" />
+ <input type="hidden"
name="actions[createRelation][${relationid}].destinationNodeNumber"
value="${destination}" />
</c:if>
<c:if test="${not empty role}">
<input type="hidden"
name="actions[createRelation][${relationid}].role" value="${role}" />
Index: richtextfield.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/richtextfield.tag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- richtextfield.tag 22 Sep 2008 14:26:24 -0000 1.3
+++ richtextfield.tag 8 Oct 2008 08:28:57 -0000 1.4
@@ -17,8 +17,7 @@
if(fieldValue == null){
fieldValue = "";
}
- //out.write("<p>test:"+fieldValue+"</p>");
- boolean isHTML =
nl.vpro.dvt.communities.util.HTMLFilterUtils.isHTML(fieldValue);
+ boolean isHTML =
org.mmbase.applications.vprowizards.spring.util.HTMLFilterUtils.isHTML(fieldValue);
jspContext.setAttribute("textIsHtml",new Boolean(isHTML),
PageContext.PAGE_SCOPE);
%>
<div class="inputBlock">
@@ -34,6 +33,7 @@
</c:choose>
</mm:import>
+ <input type="hidden"
name="actions[${modifier}${action}][${actionnr}].htmlField" value="${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>
@@ -41,7 +41,7 @@
<script type="text/javascript">
var oFCKeditor = new FCKeditor( 'field_${nodetype}_${field}' ) ;
- oFCKeditor.BasePath =
'${pageContext.request.contextPath}/edit/system/javascript/FCKeditor/';
+ oFCKeditor.BasePath =
'${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/FCKeditor/';
oFCKeditor.Config['ToolbarStartExpanded'] = true ;
<%-- TODO deze check eruit halen --%>
<c:choose>
Index: wizard.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/wizard.tag,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- wizard.tag 22 Sep 2008 14:26:24 -0000 1.5
+++ wizard.tag 8 Oct 2008 08:28:57 -0000 1.6
@@ -41,20 +41,22 @@
<!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" >
+<mm:cloud jspvar="cloud" rank="basic user" method="loginpage"
loginpage="/mmbase/vpro-wizards/system/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>
- <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}/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>
+ <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">
+ <script>
+ var contextPath='${pageContext.request.contextPath}';
+ </script>
+ <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>
<jsp:invoke fragment="header"/>
</head>
<body>
@@ -72,23 +74,8 @@
disableRelated();
</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}/edit/system/javascript/pngfix.js"></script>
+ <script defer type="text/javascript"
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/pngfix.js"></script>
<![endif]-->
</body>
</html>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
