Update of
/var/cvs/contributions/CMSContainer_Modules/subsite/src/webapp/editors/subsite
In directory
james.mmbase.org:/tmp/cvs-serv25296/subsite/src/webapp/editors/subsite
Modified Files:
personalpages.jsp
Log Message:
CMSC-635 - big updates on subsite-module, also enhanced PagePublisher.java
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/subsite/src/webapp/editors/subsite
See also: http://www.mmbase.org/jira/browse/CMSC-635
Index: personalpages.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- personalpages.jsp 5 Feb 2008 17:42:06 -0000 1.3
+++ personalpages.jsp 18 Feb 2008 10:55:44 -0000 1.4
@@ -6,7 +6,7 @@
<mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
-<cmscedit:head title="search.title">
+<cmscedit:head title="site.personal.personalpages">
<script src="<cmsc:staticurl page='/editors/repository/content.js'/>"
type="text/javascript"></script>
<script src="<cmsc:staticurl page='/editors/repository/search.js'/>"
type="text/javascript"></script>
</cmscedit:head>
@@ -27,12 +27,9 @@
<mm:import externid="results" jspvar="nodeList" vartype="List" />
<mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
<mm:import externid="offset" jspvar="offset" vartype="Integer">0</mm:import>
-<!--
<mm:import externid="returnurl"/>
-<mm:import externid="parentchannel" jspvar="parentchannel"/>
--->
-<mm:import externid="subsite" jspvar="subsite" from="parameters"
vartype="Integer" />
+<mm:import externid="subsite" from="parameters" />
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
@@ -47,65 +44,63 @@
</div>
</div>
</div>
-</div><!--
-
-
-List of pagesNodes:<br><br>
-<ul>
-<c:forEach var="results" items="${results}">
- <li><b>${results}</b></li>
-</c:forEach>
-</ul>
-
-
+</div>
---><div class="editor">
+<div class="editor">
<html:form action="/editors/subsite/SubSiteAction" method="post">
<html:hidden property="action" value="${action}"/>
- <html:hidden property="subsite" value="${subsite}"/>
<html:hidden property="search" value="true"/>
<html:hidden property="offset"/>
<html:hidden property="order"/>
<html:hidden property="direction"/>
+ <mm:present referid="returnurl"><input type="hidden" name="returnurl"
value="<mm:write referid="returnurl"/>"/></mm:present>
<table>
<tr>
- <td><fmt:message key="subsitedelete.subtitle" /></td>
- <td colspan="3"><html:text property="title"
style="width:200px"/></td><!--
+ <td><fmt:message key="subsite.name" />:</td>
+ <td>
+ <cmsc:select var="subsite">
+ <mm:listnodes type="subsite">
+ <mm:field name="number" id="subsitenumber" write="false"
vartype="String" />
+ <cmsc:option value="${subsitenumber}" name="${_node.title}"
/>
+ </mm:listnodes>
+ </cmsc:select>
+ </td>
</tr>
+
<tr>
- <td><fmt:message key="searchform.keywords" /></td>
- <td colspan="3"><html:text property="keywords"
style="width:200px"/></td>
- --><td>
+ <td><fmt:message key="subsitedelete.subtitle" /></td>
+ <td colspan="3"><html:text property="title"
style="width:200px"/></td>
+ <td>
<input type="submit" class="button" name="submitButton"
onclick="setOffset(0);" value="<fmt:message key="site.personal.search" />"/>
</td>
+ <td style="width:20px">
+ </td>
+ <td>
+ <a
href="../subsite/PersonalPageCreate.do?parentpage=${subsite}"><img
src="../gfx/icons/new.png" width="16" height="16" title="<fmt:message
key="site.personal.new.page" />"
+ alt="<fmt:message
key="site.personal.new.page" />"/></a>
+ <a
href="../subsite/PersonalPageCreate.do?parentpage=${subsite}"><fmt:message
key="site.personal.new.page" /></a>
+ </td>
</tr>
</table>
</html:form>
</div>
-
-
-
<div class="editor">
-<a href="../subsite/PersonalPageCreate.do?parentpage=${subsite}">
-<img src="../gfx/icons/new.png" width="16" height="16" title="<fmt:message
key="site.personal.new.page" />"
- alt="<fmt:message
key="site.personal.new.page" />"/>
-Nieuwe persoonlijke pagina</a>
-<br /><br />
+<br />
<div class="ruler_green"><div><fmt:message
key="site.personal.personalpages"/></div></div>
<div class="body">
-<c:set var="listSize" value="${fn:length(results)}"/>
-<c:set var="resultsPerPage" value="50"/>
-<c:set var="offset" value="${param.offset}"/>
-<c:set var="extraparams" value="&parentchannel=${param.parentchannel}"/>
+<c:set var="listSize" value="${resultCount}"/>
+<c:set var="resultsPerPage" value="${SearchForm.keywords}"/>
+<c:set var="offset" value="${SearchForm.offset}"/>
+<c:set var="extraparams"
value="&subsite=${subsite}&title=${SearchForm.title}&order=${SearchForm.order}"/>
<mm:isempty referid="results" inverse="true">
-<%@ include file="../pages.jsp" %>
+ <%@ include file="../pages.jsp" %>
</mm:isempty>
<table>
@@ -120,18 +115,13 @@
</thead>
<tbody class="hover">
-<mm:list referid="results" jspvar="node" max="${resultsPerPage}"
offset="${offset*resultsPerPage}">
+<mm:list referid="results" jspvar="node" max="${resultsPerPage}">
<mm:field name="personalpage.number" id="number">
<mm:node number="${number}">
<tr <mm:even inverse="true">class="swap"</mm:even>>
<td style="white-space: nowrap;">
<mm:field name="number" write="false" id="nodenumber">
- <a href="<cmsc:contenturl number="${nodenumber}"/>"
- title="<fmt:message key="searchform.icon.preview.title" />"
target="_blank"><img src="../gfx/icons/preview.png" width="16" height="16"
-
title="<fmt:message key="searchform.icon.preview.title" />"
-
alt="<fmt:message
key="searchform.icon.preview.title" />"/></a>
-
<a href="../subsite/SubSiteEdit.do?number=${nodenumber}"
title="<fmt:message key="content.edit" />"><img
src="../gfx/icons/edit.png" width="16" height="16"
title="<fmt:message key="content.edit" />"
@@ -140,6 +130,12 @@
title="<fmt:message key="content.delete" />"><img
src="../gfx/icons/delete.png" width="16" height="16"
title="<fmt:message key="content.delete" />"
alt="<fmt:message key="content.delete" />"/></a>
+ <a href="<cmsc:contenturl number="${nodenumber}"/>"
+ title="<fmt:message key="searchform.icon.preview.title" />"
target="_blank"><img src="../gfx/icons/preview.png" width="16" height="16"
+
title="<fmt:message key="searchform.icon.preview.title" />"
+ alt="<fmt:message
key="searchform.icon.preview.title" />"/></a>
+
+
</mm:field>
</td>
<td>
@@ -159,6 +155,10 @@
</mm:node>
</mm:field>
</mm:list>
+<%-- Now print if no results --%>
+<mm:isempty referid="results">
+ <tr><td><b><fmt:message key="site.personal.nonefound" /></b></td></tr>
+</mm:isempty>
</tbody>
</table>
@@ -168,10 +168,7 @@
<br />
-<%-- Now print if no results --%>
-<mm:isempty referid="results">
- <fmt:message key="searchform.searchpages.nonefound" />
-</mm:isempty>
+
</div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
