shuber 2004/10/14 17:26:57 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
metadata/jbproject/jahia Jahia Libs.library
src/java/org/jahia/engines/shared Page_Field.java
src/views/jsp/jahia/engines/shared page_field.jsp
Log:
JAHIA-191 : Page Field Init: by default should be none
- Page field now defaults to "no page creation".
- Added Javascript so that as soon as title is modified, the page creation radio
button becomes selected.
Revision Changes Path
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
1.72.4.8 +2 -1 jahia/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.72.4.7&r2=1.72.4.8&f=h
1.37.4.3 +15 -6 jahia/src/views/jsp/jahia/engines/shared/page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/shared/page_field.jsp.diff?r1=1.37.4.2&r2=1.37.4.3&f=h
Index: Page_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/shared/Attic/Page_Field.java,v
retrieving revision 1.72.4.7
retrieving revision 1.72.4.8
diff -u -r1.72.4.7 -r1.72.4.8
--- Page_Field.java 1 Oct 2004 16:04:53 -0000 1.72.4.7
+++ Page_Field.java 14 Oct 2004 15:26:56 -0000 1.72.4.8
@@ -780,7 +780,8 @@
-1, // Link ID undefined
jParams.getUser().getUserKey(),
theField.getID()); // value should be < 0 if new field.
- pageBean.setOperation(isLinkOnly ? LINK_URL : CREATE_PAGE);
+ // pageBean.setOperation(isLinkOnly ? LINK_URL : CREATE_PAGE);
+ pageBean.setOperation(RESET_LINK);
} else { // We've got something in theField.object ! A page exists !
logger.debug("Get existing field page... (We've got something in
theField.object())");
JahiaPage jahiaPage = (JahiaPage)theField.getObject();
Index: page_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/shared/Attic/page_field.jsp,v
retrieving revision 1.37.4.2
retrieving revision 1.37.4.3
diff -u -r1.37.4.2 -r1.37.4.3
--- page_field.jsp 23 Sep 2004 16:34:01 -0000 1.37.4.2
+++ page_field.jsp 14 Oct 2004 15:26:57 -0000 1.37.4.3
@@ -93,6 +93,14 @@
<%=jData.gui().html().drawSelectPageLauncher(SelectPage_Engine.LINK_OPERATION,
pageBean.getParentID(), pageBean.getID())%>
}
+function titleKeyPress() {
+ if (document.mainForm.operation[<%= isLinkOnly ? 2 : 4 %>]) {
+ if (document.mainForm.operation[<%= isLinkOnly ? 2 : 4 %>].checked) {
+ document.mainForm.operation[0].checked = true;
+ }
+ }
+}
+
function setPageURL()
{
document.mainForm.action += "&loadedFromSession=true" +
@@ -156,6 +164,7 @@
<% } %>
<jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.jahiaPageTitle.label"/> :<br><br>
<input class="input" type="text" size="65" name="page_title"
+ onkeypress="javascript:titleKeyPress()"
value="<%=JahiaTools.text2html(title)%>"
maxlength="250"><br>
<input class="input" type="checkbox" name="shared_title"
<% if (pageBean.isSharedTitle()) { %>checked<% }
%>><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label"/>.<br>
@@ -227,12 +236,12 @@
}
%>
<span class="text2"><b><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.pageMoveOptions.label"/></b></span> :<br>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="text" align="left" valign="top"
width="10"> </td>
- <td class="text" align="left" valign="top"
nowrap><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label"/> : <jahia:engineResourceBundle
resourceName="org.jahia.engines.yes.label"/><input class="input" type="radio"
name="pageMoveDeleteOldContainer" value="1"
<%if(pageBean.deleteOldContainer()){%>checked<%}%>><jahia:engineResourceBundle
resourceName="org.jahia.engines.no.label"/><input class="input" type="radio"
name="pageMoveDeleteOldContainer" value="0"
<%if(!pageBean.deleteOldContainer()){%>checked<%}%>></td>
- </tr>
- </table>
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="text" align="left" valign="top"
width="10"> </td>
+ <td class="text" align="left" valign="top"
nowrap><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label"/> : <jahia:engineResourceBundle
resourceName="org.jahia.engines.yes.label"/><input class="input" type="radio"
name="pageMoveDeleteOldContainer" value="1"
<%if(pageBean.deleteOldContainer()){%>checked<%}%>><jahia:engineResourceBundle
resourceName="org.jahia.engines.no.label"/><input class="input" type="radio"
name="pageMoveDeleteOldContainer" value="0"
<%if(!pageBean.deleteOldContainer()){%>checked<%}%>></td>
+ </tr>
+ </table>
<%
} else {
%><span class="text2"><br> <jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.noPageSelected.label"/>.
