Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv15225/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
search.jsp content.jsp
Log Message:
CMSC-1119 Dynamic form results can be seen again.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1119
Index: search.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- search.jsp 22 Oct 2008 07:58:37 -0000 1.34
+++ search.jsp 28 Oct 2008 13:27:03 -0000 1.35
@@ -453,7 +453,7 @@
</c:url>
<a href="#" onclick="openPopupWindow('versioning',
750, 550, '${showVersions}')"><img src="../gfx/icons/versioning.png"
alt="<fmt:message key="searchform.icon.versioning.title" />"
title="<fmt:message key="searchform.icon.versioning.title" />" /></a>
</mm:haspage>
- <cmsc:hasfeature name="savedformmodule">
+ <cmsc:hasfeature name="responseform">
<c:set var="typeval">
<mm:nodeinfo type="type" />
</c:set>
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- content.jsp 27 Oct 2008 05:42:18 -0000 1.40
+++ content.jsp 28 Oct 2008 13:27:03 -0000 1.41
@@ -31,7 +31,13 @@
<form name="initForm" action="../WizardInitAction.do" method="post"
style="display:inline;text-decoration:none">
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="creation" value="<mm:write
referid="parentchannel" />"/>
+ <mm:haspage page="/editors/versioning">
+ <input type="hidden" name="returnurl" value="picktags.jsp"/>
+ <c:set var="hasTags" value="true"/>
+ </mm:haspage>
+ <c:if test="${empty hasTags}">
<input type="hidden" name="returnurl" value="<%= returnurl %>"/>
+ </c:if>
<input type="hidden" name="order" value="${orderby}" />
<input type="hidden" name="direction" value="${direction}"/>
<input type="hidden" name="offset" value="${param.offset}"/>
@@ -154,6 +160,14 @@
<a href="javascript:info('<mm:field name="number" />')"><img
src="../gfx/icons/info.png" width="16" height="16"
title="<fmt:message key="content.info" />"
alt="<fmt:message key="content.info" />"/></a>
+
+ 1<% if (role != null && SecurityUtil.isWriter(role)) { %>
+ 2<mm:haspage page="/editors/picktags.jsp">
+ 3<a href="/editors/picktags.jsp?ewnodelastedited=<mm:field
name="number"/>"><img
+ src="../gfx/icons/tagcloud.png" title="tags"
alt="tags"/></a>
+ </mm:haspage>
+ <% } %>
+
<mm:haspage page="/editors/versioning">
<c:url value="/editors/versioning/ShowVersions.do" var="showVersions">
<c:param name="nodenumber"><mm:field name="number"/></c:param>
@@ -171,6 +185,22 @@
target="selectchannel" onclick="moveContent(<mm:field name="number" />,
${parentchannel} )">
<img src="../gfx/icons/page_move.png" title="<fmt:message
key="searchform.icon.move.title" />"/></a>
<% } %>
+
+ <cmsc:hasfeature name="responseform">
+ <c:set var="typeval">
+ <mm:nodeinfo type="type"/>
+ </c:set>
+ <c:if test="${typeval == 'responseform'}">
+ <mm:url page="/editors/savedform/ShowSavedForm.do"
id="showSavedForms" write="false">
+ <mm:param name="nodenumber"><mm:field
name="number"/></mm:param>
+ <mm:param name="initreturnurl" value="${returnurl}"/>
+ </mm:url>
+ <a href="<mm:write referid="showSavedForms"/>"><img
src="../gfx/icons/application_form_magnify.png"
+
title="<fmt:message key="content.icon.savedform.title" />"
+
alt="<fmt:message key="content.icon.savedform.title" />"/></a>
+ </c:if>
+ </cmsc:hasfeature>
+
<% if (role != null && SecurityUtil.isEditor(role)) { %>
<mm:first inverse="true">
@@ -187,20 +217,6 @@
<% } %>
- <cmsc:hasfeature name="savedformmodule">
- <c:set var="typeval">
- <mm:nodeinfo type="type"/>
- </c:set>
- <c:if test="${typeval == 'responseform'}">
- <mm:url page="/editors/savedform/ShowSavedForm.do"
id="showSavedForms" write="false">
- <mm:param name="nodenumber"><mm:field
name="number"/></mm:param>
- <mm:param name="initreturnurl" value="${returnurl}"/>
- </mm:url>
- <a href="<mm:write referid="showSavedForms"/>"><img
src="../gfx/icons/application_form_magnify.png"
-
title="<fmt:message key="content.icon.savedform.title" />"
-
alt="<fmt:message key="content.icon.savedform.title" />"/></a>
- </c:if>
- </cmsc:hasfeature>
</td>
<td onMouseDown="objClick(this);">
<mm:nodeinfo type="guitype"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
