shared page_field.jsp

Khue Nguyen Thu, 23 Sep 2004 10:52:37 -0700

knguyen     2004/09/23 18:34:02 CEST


  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java             JahiaEnginesResources.properties 
                         JahiaEnginesResources_en.properties 
                         JahiaEnginesResources_fr.properties 
    src/views/jsp/jahia/engines/shared page_field.jsp 
  Log:
  - refactoring page move : a move doesn't mean that the old container has to be 
deleted ( optional )
  - restore version refactored with page move issue.
  - still require option that allows deleting container after page will be moved after 
restore
  
  Revision  Changes    Path
  1.58.2.2  +2 -0      jahia/src/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources.properties.diff?r1=1.58.2.1&r2=1.58.2.2&f=h
  1.26.2.2  +2 -0      jahia/src/java/JahiaEnginesResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_en.properties.diff?r1=1.26.2.1&r2=1.26.2.2&f=h
  1.35.2.3  +2 -0      jahia/src/java/JahiaEnginesResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_fr.properties.diff?r1=1.35.2.2&r2=1.35.2.3&f=h
  1.37.4.2  +10 -1     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.1&r2=1.37.4.2&f=h
  
  
  
  Index: JahiaEnginesResources.properties
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources.properties,v
  retrieving revision 1.58.2.1
  retrieving revision 1.58.2.2
  diff -u -r1.58.2.1 -r1.58.2.2
  --- JahiaEnginesResources.properties  28 May 2004 15:33:04 -0000      1.58.2.1
  +++ JahiaEnginesResources.properties  23 Sep 2004 16:34:01 -0000      1.58.2.2
  @@ -815,6 +815,8 @@
   org.jahia.engines.shared.Page_Field.removeLink.label                                
                          = Remove link
   org.jahia.engines.shared.Page_Field.selectPageToLink.label                          
                          = Select page to link
   org.jahia.engines.shared.Page_Field.selectPageToMove.label                          
                          = Select page to move
  +org.jahia.engines.shared.Page_Field.pageMoveOptions.label                           
                          = Page move options
  +org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label                
                       = Delete the old container containing the page
   org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label              
                                                                   = Share this title 
with other languages
   org.jahia.engines.shared.Page_Field.differPageCreation.label                        
                          = <b>Don't create</b> Jahia page
   org.jahia.engines.shared.Page_Field.removePageLink.label                            
                          = <b>Reset</b> link
  
  
  
  Index: JahiaEnginesResources_en.properties
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_en.properties,v
  retrieving revision 1.26.2.1
  retrieving revision 1.26.2.2
  diff -u -r1.26.2.1 -r1.26.2.2
  --- JahiaEnginesResources_en.properties       28 May 2004 15:33:04 -0000      
1.26.2.1
  +++ JahiaEnginesResources_en.properties       23 Sep 2004 16:34:01 -0000      
1.26.2.2
  @@ -814,6 +814,8 @@
   org.jahia.engines.shared.Page_Field.removeLink.label                                
                          = Remove link
   org.jahia.engines.shared.Page_Field.selectPageToLink.label                          
                          = Select page to link
   org.jahia.engines.shared.Page_Field.selectPageToMove.label                          
                          = Select page to move
  +org.jahia.engines.shared.Page_Field.pageMoveOptions.label                           
                          = Page move options
  +org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label                
                       = Delete the old container containing the page
   org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label              
                                                                   = Share this title 
with other languages
   org.jahia.engines.shared.Page_Field.differPageCreation.label                        
                          = <b>Don't create</b> Jahia page
   org.jahia.engines.shared.Page_Field.removePageLink.label                            
                          = <b>Reset</b> link
  
  
  
  Index: JahiaEnginesResources_fr.properties
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_fr.properties,v
  retrieving revision 1.35.2.2
  retrieving revision 1.35.2.3
  diff -u -r1.35.2.2 -r1.35.2.3
  --- JahiaEnginesResources_fr.properties       9 Sep 2004 12:56:15 -0000       
1.35.2.2
  +++ JahiaEnginesResources_fr.properties       23 Sep 2004 16:34:01 -0000      
1.35.2.3
  @@ -478,6 +478,8 @@
   org.jahia.engines.shared.Page_Field.removeLink.label                                
                          = Supprimer le lien
   org.jahia.engines.shared.Page_Field.selectPageToLink.label                          
                          = S&eacute;lectionner une page, destination de ce lien
   org.jahia.engines.shared.Page_Field.selectPageToMove.label                          
                          = S&eacute;lectionner une page &agrave; d&eacute;placer
  +org.jahia.engines.shared.Page_Field.pageMoveOptions.label                           
                          = Choix lors du d&eacuteplacement de la page 
  +org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label                
                           = Supprimer l'ancien container contenant la page
   org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label              
                                                                   = Partager ce titre 
dans les autres langues
   org.jahia.engines.shared.Page_Field.differPageCreation.label                        
                          = <b>Ne pas cr&eacute;er</b> de page Jahia
   org.jahia.engines.shared.Page_Field.removePageLink.label                            
                          = <b>Remise &agrave; z&eacute;ro</b> du lien
  
  
  
  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.1
  retrieving revision 1.37.4.2
  diff -u -r1.37.4.1 -r1.37.4.2
  --- page_field.jsp    6 Aug 2004 18:01:13 -0000       1.37.4.1
  +++ page_field.jsp    23 Sep 2004 16:34:01 -0000      1.37.4.2
  @@ -223,8 +223,17 @@
                       while (pageTitlesEnum.hasMoreElements()) {
                           String pageTitle = (String)pageTitlesEnum.nextElement();
                           String languageCodeTitle = 
(String)languageCodeEnum.nextElement(); %>
  -                        <li 
style="padding-left:40px;"><i><jahia:displayLanguageCode 
code="<%=languageCodeTitle%>"/></i> : <%=JahiaTools.text2html(pageTitle)%><br><%
  +                        <li 
style="padding-left:40px;"><i><jahia:displayLanguageCode 
code="<%=languageCodeTitle%>"/></i> : <%=JahiaTools.text2html(pageTitle)%><br><br><%
                       }
  +                    %>
  +                    <span class="text2"><b><jahia:engineResourceBundle 
resourceName="org.jahia.engines.shared.Page_Field.pageMoveOptions.label"/></b></span>&nbsp;:<br>
  +                     <table border="0" cellpadding="0" cellspacing="0">
  +                             <tr>
  +                                     <td class="text" align="left" valign="top" 
width="10">&nbsp;</td>
  +                                     <td class="text" align="left" valign="top" 
nowrap><jahia:engineResourceBundle 
resourceName="org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label"/>&nbsp;:&nbsp;<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>&nbsp;<jahia:engineResourceBundle 
resourceName="org.jahia.engines.shared.Page_Field.noPageSelected.label"/>.
                       </span><%

cvs commit: jahia/src/java JahiaEnginesResources.properties JahiaEnginesResources_en.properties JahiaEnginesResources_fr.properties jahia/src/views/jsp/jahia/engines/shared page_field.jsp

Reply via email to