Update of /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form
In directory
james.mmbase.org:/tmp/cvs-serv14495/applications/vpro-wizards/tagfiles/form
Modified Files:
container.tag showfield.tag richtextfield.tag optionfield.tag
wizard.tag textareafield.tag datefield.tag view.tag
filefield.tag
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/tagfiles/form
Index: container.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/container.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- container.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ container.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -1,5 +1,5 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util" %>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util" %>
<%@ attribute name="nodetype" required="true" %>
<%@ attribute name="multipart" type="java.lang.Boolean" description="don't set
this if you use a fielfield in the body. In that case it's the default" %>
@@ -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="false">
+ <util:try setMessageAs="m" setExceptionAs="ex" stacktrace="true">
<jsp:attribute name="catchit">
<div class="error">Er gaat iets fout bij het afdrukken van een
veld. reden: ${m}</div>
</jsp:attribute>
Index: showfield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/showfield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- showfield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ showfield.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -4,7 +4,7 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" tagdir="/WEB-INF/tags/edit/form" %>
+<%@ taglib prefix="form" tagdir="/WEB-INF/tags/vpro-wizards/form" %>
<%@ attribute name="guivalue" type="java.lang.Boolean" description="when true:
try to find a resource bundle for this field, and if this succeeds, show the
value that is keyd to the value of this field. if not found, show the guivalue
for this field" %>
<%@ include file="fieldinit.tagf" %>
Index: richtextfield.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/richtextfield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- richtextfield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ richtextfield.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -2,7 +2,7 @@
<%@ taglib prefix="mm" uri="http://www.mmbase.org/mmbase-taglib-1.0" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util"%>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"%>
<%@ attribute name="size" %>
<c:if test="${empty size}"><c:set var="size" value="small"/></c:if>
@@ -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: optionfield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/optionfield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- optionfield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ optionfield.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -1,6 +1,6 @@
<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0" prefix="mm" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util" %>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util" %>
<%--
<%@ variable name-given="guitype" scope="NESTED" %>
--%>
Index: wizard.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/wizard.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- wizard.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ wizard.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -1,6 +1,6 @@
<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0" prefix="mm" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util"%>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"%>
<%@ attribute name="title" description="is the page title" %>
<%@ attribute name="name" description="i don't think this is used. what's
more: it interferes with the name field of the form:related tag if you don't
specifically set the name on that one." %>
@@ -41,19 +41,19 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
-<mm:cloud jspvar="cloud" method="loginpage" loginpage="/edit/login.jsp" >
+<mm:cloud jspvar="cloud" method="loginpage"
loginpage="/mmbase/vpro-wizards/login.jsp" >
<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">
+ <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 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>
+ <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,22 +72,8 @@
</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>
Index: textareafield.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/textareafield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- textareafield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ textareafield.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -2,7 +2,7 @@
<%@ taglib prefix="mm" uri="http://www.mmbase.org/mmbase-taglib-1.0" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util"%>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"%>
<%@ attribute name="size" %>
<c:if test="${empty size}"><c:set var="size" value="small"/></c:if>
Index: datefield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/datefield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- datefield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ datefield.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -3,7 +3,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" tagdir="/WEB-INF/tags/edit/form" %>
+<%@ taglib prefix="form" tagdir="/WEB-INF/tags/vpro-wizards/form" %>
<%@ attribute name="dateFormat" %>
<%@ attribute name="timeFormat" %>
Index: view.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/view.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- view.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ view.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -1,6 +1,6 @@
<%@ taglib prefix="mm" uri="http://www.mmbase.org/mmbase-taglib-1.0" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util"%>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"%>
<%@ tag body-content="empty" %>
<%@ attribute name="nodetype" required="true"%>
@@ -107,13 +107,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=${param.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&apm;parentnodenr=${param.nodenr}&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>
@@ -128,7 +128,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>
@@ -182,10 +182,10 @@
</c:set>
<mm:last inverse="true">
<%--
- <a style="text-decoration:none"
href="${pageContext.request.contextPath}/edit/system/changeposrelnew.jsp?container=${nodenr}&node=${_nodenr}&direction=up&type=${type}#${anchor}"
class="movedown" onclick="return checkSearch(this);">
+ <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}/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>
<c:if test="${not empty _pos}">
@@ -193,10 +193,10 @@
</c:if>
<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>
@@ -215,7 +215,7 @@
<mm:param
name="deleteNodeActions[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>
@@ -226,14 +226,14 @@
<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}/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}&${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: filefield.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/form/filefield.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- filefield.tag 2 Jun 2008 17:13:01 -0000 1.1
+++ filefield.tag 9 Jun 2008 18:29:49 -0000 1.2
@@ -1,7 +1,7 @@
<%@ tag body-content="empty" %>
<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0" prefix="mm" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/edit/util" %>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util" %>
<%@ include file="fieldinit.tagf" %>
<%--set this flag in the request so the form container can set enctype on the
form element --%>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs