Merged V3.1 to HEAD

13173: Merged V2.1-A to V3.1
      10964: Fix for ADB-81: String 'Template' in Japanese is not good format
      10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
      10972: Fix for ADB-95: All templates should be parameterized using a  such that they pickup the server name and port number of the current installation
      10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
   13174: Merged V2.1-A to V3.1
      10975: Fix for ADB-118: Content attributes not localized [client templates]
   13182: Merged V2.1-A to V3.1
      11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
      11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
   13190: Merged V2.1-A to V3.1
      11070: Fix for ADB-120 ACT 4773
   13192: Merged V2.1-A to V3.1
      11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
   13193: Merged V2.1-A to V3.1
      8395: Remove user and group admin actions from Admin console [added config switch - off by default]
      8584: Removed option for user to change password [added config switch - off by default]
      10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
      10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
   13194: Merged V2.1-A to V3.1
      12095: Fix for ADB-131
   13195: Merged V2.1-A to V3.1
      12097: Fix for ADB-133, ADB-134
      12102: Fix for ADB-139
   13196: Merged V2.1-A to V3.1
      12350: Fix for ADB-142
   13197: Merged V2.1-A to V3.1
      12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
      12878: Merged record-only for V2.1-A to HEAD 
         12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
   13198: Merged V2.1-A to V3.1
      12977: Fix for ADB-158: Intermittent error while accessing the login page
      13142: Another fix for ADB-158: Intermittent error while accessing the login page
   13199: Merged V2.1-A to V3.1
      11589: Fix for ADB-95: All templates should be parameterized

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

source/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java

@@ -46,6 +46,7 @@ import org.alfresco.web.ui.common.Utils;
 public class ErrorsRenderer extends BaseRenderer
 {
    private static final String DEFAULT_MESSAGE = "wizard_errors";
+   private static final String ERROR_HINT = "error";
    
    /**
     * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
@@ -66,6 +67,7 @@ public class ErrorsRenderer extends BaseRenderer
          String errorClass = (String)component.getAttributes().get("errorClass");
          String infoClass = (String)component.getAttributes().get("infoClass");
          String message = (String)component.getAttributes().get("message");
+         String errorHint = Application.getMessage(context, ERROR_HINT);
          
          if (message == null)
          {
@@ -97,7 +99,9 @@ public class ErrorsRenderer extends BaseRenderer
          {
             out.write("<img src='");
             out.write(contextPath);
-            out.write("/images/icons/info_icon.gif' alt='Error' align='absmiddle'/>&nbsp;&nbsp;");
+            out.write("/images/icons/info_icon.gif' alt='");
+            out.write(Utils.encode(errorHint));
+            out.write("' align='absmiddle'/>&nbsp;&nbsp;");
             out.write(Utils.encode(message));
             out.write("\n<ul style='margin:2px;'>");
             
@@ -119,7 +123,9 @@ public class ErrorsRenderer extends BaseRenderer
             // the info icon on the left and the list of messages on the right
             out.write("<table border='0' cellpadding='3' cellspacing='0'><tr><td valign='top'><img src='");
             out.write(contextPath);
-            out.write("/images/icons/info_icon.gif' alt='Error' />");
+            out.write("/images/icons/info_icon.gif' alt='");
+            out.write(Utils.encode(errorHint));
+            out.write("'/>");
             out.write("</td><td>");
             
             while (messages.hasNext())

source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java

@@ -152,7 +152,7 @@ public class ModeListRenderer extends BaseRenderer
          }
          
          String menuId = UIMenu.getNextMenuId(list, context);
-         out.write("<td><a href='#' onclick=\"javascript:_toggleMenu(event, '");
+         out.write("<td style='white-space: nowrap;'><a href='#' onclick=\"javascript:_toggleMenu(event, '");
          out.write(menuId);
          out.write("');return false;\">");
          
@@ -375,7 +375,7 @@ public class ModeListRenderer extends BaseRenderer
       }
       
       // output item link
-      out.write("<td>");
+      out.write("<td style='white-space: nowrap;'>");
       if (!list.isDisabled() && !item.isDisabled())
       {
          out.write("<a href='#' onclick=\"");

source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java

@@ -591,7 +591,16 @@ public class RichListRenderer extends BaseRenderer
             
             if (column.isRendered() == true)
             {
-               out.write("<tr><td rowspan=10");
+               int rowspan = 0;
+               for (UIColumn col : columns)
+               {
+                  if (col.isRendered())
+                  {
+                     rowspan++;
+                  }
+               }
+               
+               out.write("<tr><td rowspan=" + rowspan);
                outputAttribute(out, column.getAttributes().get("style"), "style");
                outputAttribute(out, column.getAttributes().get("styleClass"), "class");
                out.write('>');