Update of /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list
In directory
james.mmbase.org:/tmp/cvs-serv24771/applications/vpro-wizards/tagfiles/list
Modified Files:
parentsearchlist.tag searchfields.tag search.tag add.tag
searchrow.tag wizard.tag querysearchlist.tag
Added Files:
searchfield.tag
Removed Files:
highlightedteasers.tag highlighted.tag containerfaq.tag
Log Message:
work in progress on the tagfiles
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/tagfiles/list
searchfield.tag is new
Index: parentsearchlist.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/parentsearchlist.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- parentsearchlist.tag 9 Jun 2008 18:29:48 -0000 1.2
+++ parentsearchlist.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -65,10 +65,6 @@
into the request.
--%>
<c:if test="${not empty parentnodenr}">
- <%--check on parent and relation role--%>
- <c:if test="${empty relationrole}">
- <c:set var="relationrole" value="related" />
- </c:if>
<%--derive the parent node type--%>
<mm:cloud >
Index: searchfields.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/searchfields.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- searchfields.tag 9 Jun 2008 18:29:48 -0000 1.2
+++ searchfields.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -10,12 +10,17 @@
<%@ 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="list" tagdir="/WEB-INF/tags/vpro-wizards/list" %>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util" %>
-<%@ attribute name="fields" required="true" %>
+<%@ attribute name="fields" description="the fields you want to show search
input elements for." %>
<%@ attribute name="extrafields" fragment="true" %>
<%@ attribute name="defaultminage" description="Defaults to zero days."%>
<%@ attribute name="defaultmaxage" description="Defaults to seven days." %>
+<c:if test="${empty fields && empty extrafields}">
+ <util:throw message="searchfiels tag: You have to set either the 'fields'
or the 'extrafields' attributes (or both)."/>
+</c:if>
+
<%-- default searchall checkbox laten zien --%>
<c:set var="searchfields" scope="request">${fields}</c:set>
@@ -45,12 +50,14 @@
<jsp:invoke fragment="extrafields"/>
<%--the input for the searchfields--%>
+ <c:if test="${not empty fields}">
<mm:fieldlist nodetype="${searchtype}" fields="${searchfields}">
<div class="inputBlock">
<div class="fieldName"><mm:fieldinfo type="guiname" /></div>
<div class="fieldValue"><mm:fieldinfo type="searchinput"
options="date" /></div>
</div>
</mm:fieldlist>
+ </c:if>
<%-- add the extra params--%>
<c:forEach var="p" items="${___params}" >
Index: search.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/search.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- search.tag 9 Jun 2008 18:29:48 -0000 1.2
+++ search.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -51,18 +51,18 @@
<c:if test="${collapsed == false}"><c:set var="_style"
>display:none</c:set></c:if>
<div id="searchclosed" style="${_style}">
<a href="javascript:hideshow('searchclosed','searchopen')"
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"/>
zoeken
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/search.png"
class="icon" border="0" alt=""></a>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/search.png"
class="icon" border="0" alt=""></a>
</div>
<c:remove var="_style"/>
<c:if test="${collapsed == true}"><c:set var="_style"
>display:none</c:set></c:if>
<div id="searchopen" style="${_style}" >
<a href="javascript:hideshow('searchopen','searchclosed')"
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"/>
zoeken
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/search.png"
class="icon" border="0"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/search.png"
class="icon" border="0"/>
</a>
<jsp:doBody/>
</div>
Index: add.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/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:48 -0000 1.2
+++ add.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -40,5 +40,5 @@
<c:otherwise>
nieuw(e) ${wizardfile}</c:otherwise>
</c:choose>
- <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>
\ No newline at end of file
Index: searchrow.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/searchrow.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- searchrow.tag 9 Jun 2008 18:29:48 -0000 1.2
+++ searchrow.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -121,18 +121,18 @@
<c:if test="${not empty maydelete}">
<c:set var="url" >
<mm:url page="/wizard/post">
- <mm:param
name="deleteNodeActions[1].number" value="${nodenrrow}" />
+ <mm:param
name="actions[deleteNode][1].number" value="${nodenrrow}" />
<c:if test="${not empty flushname}">
<mm:param name="flushname"
value="${flushname}" />
</c:if>
</mm:url>
</c:set>
<a class="delete" href="${url}" onClick="return
doConfirm(true, 'Weet je zeker dat je dit wilt verwijderen? Deze actie is niet
ongedaan te maken.')">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/delete.png"
class="icon" border="0" alt="" title="Verwijder">
+ <img
src="${pageContext.request.contextPath}/edit/system/img/delete.png"
class="icon" border="0" alt="" title="Verwijder">
</a>
</c:if>
<c:if test="${empty maydelete}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/delete.png"
class="icon" border="0" alt="" title="Verwijder"></a>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/delete.png"
class="icon" border="0" alt="" title="Verwijder"></a>
</c:if>
</c:if>
<c:remove var="maydelete"/>
@@ -176,18 +176,18 @@
<c:if test="${not empty maydelete}">
<c:set var="url" >
<mm:url page="/wizard/post">
- <mm:param
name="deleteNodeActions[1].number" value="${link}"/>
+ <mm:param
name="actions[deleteNode][1].number" value="${link}"/>
<c:if test="${not empty
flushname}">
<mm:param name="flushname"
value="${flushname}" />
</c:if>
</mm:url>
</c:set>
<a class="delete" href="${url}"
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>
</c:if>
<c:if test="${empty maydelete}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/unlink_soft.png"
class="icon" border="0" alt="" title="Koppel los"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/unlink_soft.png"
class="icon" border="0" alt="" title="Koppel los"/>
</c:if>
</c:if>
<c:remove var="maydelete"/>
@@ -215,11 +215,11 @@
<c:if test="${not empty maycreate}">
<c:set var="url" >
<mm:url page="/wizard/post">
- <mm:param
name="createRelationActions[${nodenrrow}].source" value="${parentnodenr}" />
- <mm:param
name="createRelationActions[${nodenrrow}].destination" value="${nodenrrow}" />
+ <mm:param
name="actions[createRelation][${nodenrrow}].source" value="${parentnodenr}" />
+ <mm:param
name="actions[createRelation][${nodenrrow}].destination" value="${nodenrrow}" />
- <mm:param
name="createRelationActions[${nodenrrow}].role" value="${relationrole}" />
- <mm:param
name="createRelationActions[${nodenrrow}].sortPosition" value="end" />
+ <mm:param
name="actions[createRelation][${nodenrrow}].role" value="${relationrole}" />
+ <mm:param
name="actions[createRelation][${nodenrrow}].sortPosition" value="end" />
<c:if test="${not empty
flushname}">
<mm:param name="flushname"
value="${flushname}" />
</c:if>
@@ -227,11 +227,11 @@
</mm:url>
</c:set>
<a class="link" href="${url}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/link.png"
class="icon" border="0" alt="" title="Koppel vast">
+ <img
src="${pageContext.request.contextPath}/edit/system/img/link.png" class="icon"
border="0" alt="" title="Koppel vast">
</a>
</c:if>
<c:if test="${empty maycreate}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/link_soft.png"
class="icon" border="0" alt="" title="Koppel vast">
+ <img
src="${pageContext.request.contextPath}/edit/system/img/link_soft.png"
class="icon" border="0" alt="" title="Koppel vast">
</c:if>
</c:if>
</c:otherwise>
@@ -249,11 +249,11 @@
</c:set>
<c:if test="${not empty flushnameparam}"><c:set
var="flushnameparam" value="&${flushnameparam}"/></c:if>
<a class="edit"
href="${url}&${extraparams}${flushnameparam}">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit.png"
class="icon" border="0" alt="" title="Aanpassen"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/edit.png" class="icon"
border="0" alt="" title="Aanpassen"/>
</a>
</mm:maywrite>
<mm:maywrite inverse="true">
- <img
src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/img/edit_soft.png"
class="icon" border="0" alt="" title="Aanpassen"/>
+ <img
src="${pageContext.request.contextPath}/edit/system/img/edit_soft.png"
class="icon" border="0" alt="" title="Aanpassen"/>
</mm:maywrite>
</c:if>
Index: wizard.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/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
@@ -1,51 +1,52 @@
<%@ 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/vpro-wizards/system/util"%>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"%>
<%@ attribute name="title" description="the title of the page" %>
<%@ attribute name="flushname" %>
<%@ 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:content expires="0" type="text/html" encoding="utf-8" language="nl">
- <mm:cloud jspvar="cloud" method="loginpage"
loginpage="/mmbase/vpro-wizards/login.jsp">
- <%-- add the parameters that must be passed on with every url in this
wizard--%>
- <c:if test="${not empty param.nodenr}">
+<%-- add the parameters that must be passed on with every url in this
wizard--%>
+<%--
+--%>
+<c:if test="${not empty param.nodenr}">
<util:addParam name="nodenr" parameter="nodenr"/>
- </c:if>
+ <c:if test="${not empty param.relationrole}"><util:addParam
name="relationrole" parameter="relationrole"/></c:if>
+</c:if>
- <%-- 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>
- <%--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}"/>
- <%--TODO: depricated. is replaced by util:...params tags.--%>
- <c:if test="${not empty param.path_url}">
+<%--TODO: depricated. is replaced by util:...params tags.--%>
+<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";>
+<mm:content expires="0" type="text/html" encoding="utf-8">
+ <mm:cloud jspvar="cloud" rank="basic user" method="loginpage"
loginpage="/edit/login.jsp" >
+ <c:set var="requestcloud" scope="request" value="${cloud}"/>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<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"/>
- <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/jquery/jquery.js"></script>
+ <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/edit/stylesheets/edit.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/jquery/jquery.js"></script>
<jsp:invoke fragment="header"/>
</head>
<body>
<util:header/>
<jsp:doBody/>
<!--[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: querysearchlist.tag
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/list/querysearchlist.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
