shuber      2004/10/14 17:31:49 CEST

  Modified files:
    core/src/java/org/jahia/engines/shared Page_Field.java 
    core/src/webapp/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
  1.7       +2 -1      jahia/core/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.6&r2=1.7&f=h
  1.4       +9 -0      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.3&r2=1.4&f=h
  
  
  
  Index: Page_Field.java
  ===================================================================
  RCS file: /cvs/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Page_Field.java   23 Sep 2004 16:04:23 -0000      1.6
  +++ Page_Field.java   14 Oct 2004 15:31:48 -0000      1.7
  @@ -750,7 +750,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: /cvs/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- page_field.jsp    6 Aug 2004 19:39:41 -0000       1.3
  +++ page_field.jsp    14 Oct 2004 15:31:48 -0000      1.4
  @@ -95,6 +95,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" +
  @@ -158,6 +166,7 @@
   <% } %>
               <jahia:engineResourceBundle 
resourceName="org.jahia.engines.shared.Page_Field.jahiaPageTitle.label"/>&nbsp;:<br><br>
               &nbsp;&nbsp;<input class="input" type="text" size="65" name="page_title"
  +                               onkeypress="javascript:titleKeyPress()"
                                  value="<%=JahiaTools.text2html(title)%>" 
maxlength="250"><br>
               &nbsp;&nbsp;<input class="input" type="checkbox" name="shared_title"
                   <% if (pageBean.isSharedTitle()) { %>checked<% } 
%>><jahia:engineResourceBundle 
resourceName="org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label"/>.<br>
  

Reply via email to