cmailleux    2005/12/13 13:29:45 CET

  Modified files:
    core/src/webapp/jsp/jahia/engines/lock lock.jsp 
  Log:
  correctly use handleActionChange
  
  Revision  Changes    Path
  1.7       +3 -13     jahia/core/src/webapp/jsp/jahia/engines/lock/lock.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/lock/lock.jsp.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: lock.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/lock/lock.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- lock.jsp  12 Dec 2005 17:51:52 -0000      1.6
  +++ lock.jsp  13 Dec 2005 12:29:45 -0000      1.7
  @@ -27,17 +27,6 @@
               (LockPrerequisitesResult) 
engineMap.get("lockPrerequisitesResult");
       final LockKey lockKey = (LockKey) engineMap.get("lockKey");
   %>
  -
  -<script type="text/javascript">
  -
  -    function handleActionChange(what) {
  -        saveContent();
  -        document.mainForm.action = "<%=engineUrl%><%=URLSep%>" + what;
  -        teleportCaptainFlam(document.mainForm);
  -    }
  -
  -</script>
  -
   <h3 class="lock">
       <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.jahiaLocks.label"/>
       <span>[LockKey: <%=lockKey%>]</span>
  @@ -66,6 +55,7 @@
   
   <input type="hidden" name="redirectedToLockEngine" value="yes"/>
   <input type="hidden" name="lockKey" value="<%=lockKey%>"/>
  +<input type="hidden" name="showDetails" 
value="<%=lockPrerequisitesResult.shouldShowDetails()%>"/>
   
   <p>
       <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.cannotGetLock.label"/> [<%=lockKey%>].
  @@ -175,13 +165,13 @@
   <div class="fill">
       <div class="toright">
           <div class="button">
  -            <a href="javascript:handleActionChange('screen=display')">
  +            <a href="javascript:handleActionChange('display')">
                   <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.refresh.label"/>
               </a>
           </div>
   
           <div class="button">
  -            <a 
href="javascript:handleActionChange('screen=display&showDetails=<%=!lockPrerequisitesResult.shouldShowDetails()%>')">
  +            <a 
href="javascript:document.mainForm.showDetails.value=<%=!lockPrerequisitesResult.shouldShowDetails()%>;handleActionChange('display')">
                   <jahia:engineResourceBundle 
resourceName="org.jahia.engines.lock.showHideDetails.label"/>
               </a>
           </div>
  

Reply via email to