xlawrence 2005/12/13 10:33:02 CET
Modified files:
core/src/webapp/jsp/jahia/engines/shared page_field.jsp
Log:
improved display of selected linked page and moved page
Revision Changes Path
1.20 +10 -22
jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp.diff?r1=1.19&r2=1.20&f=h
Index: page_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- page_field.jsp 13 Dec 2005 09:06:02 -0000 1.19
+++ page_field.jsp 13 Dec 2005 09:33:01 -0000 1.20
@@ -342,19 +342,11 @@
<a href="javascript:callSelectPageMove()"><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.selectPageToMove.label"/></a>
<input type="hidden" name="moveSourcePageID"
value="<%=sourcePageID%>"/>
- <% if (Page_Field.MOVE_PAGE.equals(pageBean.getOperation())) { %>
- (<jahia:engineResourceBundle
-
resourceName="org.jahia.pageId.label"/> : <%=sourcePageID%>)
- <%
- if (sourcePageID != -1) {
- final Enumeration pageTitlesEnum = titles.elements();
- %>
+ <% if (Page_Field.MOVE_PAGE.equals(pageBean.getOperation())) {
+ if (sourcePageID != -1) { %>
<ul>
- <%
- while (pageTitlesEnum.hasMoreElements()) {
- final String pageTitle = (String)
pageTitlesEnum.nextElement(); %>
- <li><%=JahiaTools.text2html(pageTitle)%></li>
- <% } %>
+
<li><%=JahiaTools.text2html(title)%> (<jahia:engineResourceBundle
+
resourceName="org.jahia.pageId.label"/>: <%=sourcePageID%>)</li>
</ul>
<% } else { %>
<jahia:engineResourceBundle
@@ -391,16 +383,12 @@
<%
if (Page_Field.LINK_JAHIA_PAGE.equals(pageBean.getOperation())) {
- %> : (<jahia:engineResourceBundle
-
resourceName="org.jahia.pageId.label"/>: <%=sourcePageID%>)<%
- if (sourcePageID != -1) {
- final Enumeration pageTitlesEnum = titles.elements();
- while (pageTitlesEnum.hasMoreElements()) {
- final String pageTitle = (String)
pageTitlesEnum.nextElement(); %>
- <li><%=JahiaTools.text2html(pageTitle)%></li>
- <%
- }
- } else {
+ if (sourcePageID != -1) { %>
+ <ul>
+
<li><%=JahiaTools.text2html(title)%> (<jahia:engineResourceBundle
+
resourceName="org.jahia.pageId.label"/>: <%=sourcePageID%>)</li>
+ </ul>
+ <% } else {
%>
<jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.noPageSelected.label"/>.
