Update of /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles
In directory
james.mmbase.org:/tmp/cvs-serv24771/applications/vpro-wizards/tagfiles
Modified Files:
sessionpath.tag path.tag header.tag
Log Message:
work in progress on the tagfiles
See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/tagfiles
Index: sessionpath.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/sessionpath.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sessionpath.tag 2 Jun 2008 17:13:04 -0000 1.1
+++ sessionpath.tag 22 Sep 2008 14:26:24 -0000 1.2
@@ -3,6 +3,7 @@
<c:forEach var="entry" items="${__path}" >
<c:set var="name" value="${entry.name}" />
<c:set var="url" value="${entry.url}" />
+ <c:set var="session" value="${entry.key}" />
<c:choose>
<c:when test="${not empty url}">
<script type="text/javascript">
Index: path.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/path.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- path.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ path.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -9,13 +9,13 @@
<%@ attribute name="reset" type="java.lang.Boolean" description="when this is
true, the list with session path elements is cleard." %>
<c:if test="${empty url}">
- <c:set var="url"
>${pageContext.request.contextPath}${pageContext.request.servletPath}<c:if
test="${not empty
pageContext.request.queryString}">?</c:if>${pageContext.request.queryString}</c:set>
+ <c:set var="url" >${pageContext.request.servletPath}<c:if test="${not
empty
pageContext.request.queryString}">?</c:if>${pageContext.request.queryString}</c:set>
</c:if>
<%--
<%@ attribute name="globalurl" %>
--%>
-<%@ attribute name="session" description="write this path element to a map in
the session. value is 'same' to write the same url to the session map, or an
url to overwrite 'url'" %>
+<%@ attribute name="session" description="write this path element to a map in
the session." %>
<c:set var="_name" >
@@ -45,9 +45,7 @@
String name = (String)jspContext.getAttribute("_name");
String url = (String)jspContext.getAttribute("url");
String key = (String)jspContext.getAttribute("session");
- if((url == null || "".equals(url)) && !"same".equals(key)){
- url = key;
- }
+
//check if it is there yet.
int addAt = -1;
for(int i = 0; i < list.size(); i++){
@@ -59,12 +57,10 @@
Map map = new HashMap();
map.put("name", name);
map.put("key", key);
- if(url != null && !"".equals(url)){
map.put("url",url);
- }
if(addAt > -1){
//replace the entry, and remove everything after it.
- while(list.size() >addAt){
+ while(list.size() > addAt){
list.remove(addAt);
}
}
Index: header.tag
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/tagfiles/header.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- header.tag 9 Jun 2008 18:29:49 -0000 1.2
+++ header.tag 22 Sep 2008 14:26:24 -0000 1.3
@@ -1,7 +1,7 @@
<%@ tag body-content="empty" %>
<[EMAIL PROTECTED] prefix="mm" uri="http://www.mmbase.org/mmbase-taglib-1.0"%>
<[EMAIL PROTECTED] prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/mmbase/vpro-wizards/stylesheets/edit2.css"/>
+<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/edit/stylesheets/edit2.css"/>
<mm:cloud jspvar="cloud" method="asis">
<%@ include file="header.jsp" %>
</mm:cloud>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
