Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4295 .
   Icon changes were identical
   Manually carried changes for
      HEAD/root/projects/web-client/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
      HEAD/root/projects/web-client/source/web/WEB-INF/faces-config-navigation.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -522,6 +522,9 @@ download_complete=When the download is complete, click OK.
 undo_checkout_for=Undo Check Out for
 undo_checkout=Undo Check Out
 undo_checkout_info=If you undo the check out of a document, the associated working copy will be deleted and all changes to it since the Check Out will be lost.
+complete=complete
+working_copy_for=Working copy for
+working_copy_missing_info=The working copy is no longer available. This could be due to an active rule(s) applied to the space you checked-out to.
 
 # Document and Space details messages
 details_of=Details of
@@ -1272,6 +1275,7 @@ title_advanced_search=Advanced Search
 title_checkin_file=Check In File
 title_checkout_file=Check Out File
 title_checkout_file_link=Check Out File Download
+title_missing_working_copy=Working Copy No Longer Available
 title_delete_file=Delete File
 title_delete_rule=Delete Rule
 title_delete_user=Delete User

source/java/org/alfresco/web/bean/CheckinCheckoutBean.java

@@ -445,6 +445,7 @@ public class CheckinCheckoutBean
    public String checkoutFile()
    {
       String outcome = null;
+      boolean checkoutSuccessful = false;
       
       UserTransaction tx = null;
       
@@ -518,8 +519,8 @@ public class CheckinCheckoutBean
             // commit the transaction
             tx.commit();
             
-            // show the page that display the checkout link
+            // mark as successful
-            outcome = "checkoutFileLink";
+            checkoutSuccessful = true;
          }
          catch (Throwable err)
          {
@@ -534,6 +535,23 @@ public class CheckinCheckoutBean
          logger.warn("WARNING: checkoutFile called without a current Document!");
       }
       
+      // determine which page to show next if the checkout was successful.
+      if (checkoutSuccessful)
+      {
+         // If a check-in rule is present in the space
+         // the document was checked out to the working copy would have already disappeared!
+         if (this.nodeService.exists(this.workingDocument.getNodeRef()))
+         {
+            // go to the page that allows the user to download the content for editing
+            outcome = "checkoutFileLink";
+         }
+         else
+         {
+            // show a page telling the user that the content has already been checked in
+            outcome = "workingCopyMissing";
+         }
+      }
+
       return outcome;
    }
    

source/web/WEB-INF/faces-config-navigation.xml

@@ -269,6 +269,10 @@
          <from-outcome>checkoutFileLink</from-outcome>
          <to-view-id>/jsp/dialog/checkout-file-link.jsp</to-view-id>
       </navigation-case>
+      <navigation-case>
+         <from-outcome>workingCopyMissing</from-outcome>
+         <to-view-id>/jsp/dialog/working-copy-missing.jsp</to-view-id>
+      </navigation-case>
    </navigation-rule>
    
    <navigation-rule>

source/web/jsp/dialog/checkout-file-link.jsp

@@ -70,7 +70,7 @@
                               <h:graphicImage id="wizard-logo" url="/images/icons/check_out_large.gif" />
                            </td>
                            <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.check_out_of}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />' Complete</div>
+                              <div class="mainTitle"><h:outputText value="#{msg.check_out_of}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />' <h:outputText value="#{msg.complete}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.checkoutfilelink_description}" /></div>
                            </td>
                         </tr>

source/web/jsp/dialog/working-copy-missing.jsp

@@ -0,0 +1,153 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_missing_working_copy">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="missing-working-copy">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr>
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/check_out_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainTitle"><h:outputText value="#{msg.working_copy_for}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                              <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                 <tr>
+                                    <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/warning.gif" width="16" height="16"/></td>
+                                    <td class="mainSubText">
+                                       <h:outputFormat value="#{msg.working_copy_missing_info}">
+                                          <f:param value="#{CheckinCheckoutBean.document.name}" />
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                           </td>
+                           
+                           <td valign="top" rowspan=2>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="dialog:close" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>