From cc14e27cd6e5c53d0eb37e7bc9ca5cb30287f2e6 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Wed, 10 Jan 2007 11:25:32 +0000
Subject: [PATCH] . Output path pattern help added to Create Website wizard
 (Configure Form Templates and Web Form Details pages)  - help cursor mouse
 over added to help icon  - incorrect alt text removed  - renamed output path
 pattern help jsp page to standard naming convention . Found that all
 "Required Field" images in our JSPs with ALT text were not I18N -
 find-and-replaced all occurances with an I18Ned message . Some more WCM UI
 improvements/fixes . Fix up of 3rd Party Eclipse project after xalan library
 changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties |  1 +
 .../alfresco/web/bean/wcm/AVMBrowseBean.java  | 31 +++++++++--
 source/web/jsp/content/add-content-dialog.jsp |  2 +-
 .../content/create-content-wizard/details.jsp |  2 +-
 source/web/jsp/forums/create-dialog.jsp       |  2 +-
 source/web/jsp/forums/create-post-dialog.jsp  |  2 +-
 source/web/jsp/forums/create-reply-dialog.jsp |  2 +-
 source/web/jsp/forums/create-topic-dialog.jsp |  4 +-
 source/web/jsp/spaces/create-space-dialog.jsp |  2 +-
 .../spaces/create-space-wizard/details.jsp    |  2 +-
 source/web/jsp/wcm/add-content-dialog.jsp     |  2 +-
 source/web/jsp/wcm/browse-website.jsp         | 15 ++---
 source/web/jsp/wcm/create-folder-dialog.jsp   |  2 +-
 .../configure-rendering-engines.jsp           | 19 +++----
 .../jsp/wcm/create-form-wizard/details.jsp    | 51 +++++++++--------
 .../wcm/create-web-content-wizard/details.jsp |  2 +-
 source/web/jsp/wcm/create-webapp.jsp          |  2 +-
 .../jsp/wcm/create-website-wizard/details.jsp |  6 +-
 .../create-website-wizard/form-details.jsp    | 25 +++++++--
 .../create-website-wizard/form-templates.jsp  | 55 +++++++++++--------
 .../web/jsp/wcm/output-path-pattern-help.jsp  | 40 ++++++++++++++
 .../web/jsp/wcm/output_path_pattern_help.jsp  | 39 -------------
 source/web/jsp/wcm/snapshot-sandbox.jsp       |  2 +-
 23 files changed, 176 insertions(+), 134 deletions(-)
 create mode 100644 source/web/jsp/wcm/output-path-pattern-help.jsp
 delete mode 100644 source/web/jsp/wcm/output_path_pattern_help.jsp

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index a2844a842e..c132394beb 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -41,6 +41,7 @@ categories_description=This view allows you to browse and modify the categories
 new_category_description=Enter information about the new Category then click Create Category.
 status_message_default=No messages.
 no_icons_found=No icons found
+required_field=Required Field
 
 # UI Component messages
 yes=Yes
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index 16801ab242..b500ef7aa5 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -108,6 +108,9 @@ public class AVMBrowseBean implements IContextListener
    /** Current webapp context for actions and sandbox view */
    private String webapp;
    
+   /** List of top-level webapp directories for the current web project */
+   private List<SelectItem> webapps;
+   
    /** Sandbox title message */
    private String sandboxTitle = null;
    
@@ -405,14 +408,26 @@ public class AVMBrowseBean implements IContextListener
     */
    public List<SelectItem> getWebapps()
    {
-      String path = AVMConstants.buildSandboxRootPath(getStagingStore());
-      Map<String, AVMNodeDescriptor> folders = this.avmService.getDirectoryListing(-1, path);
-      List<SelectItem> webapps = new ArrayList<SelectItem>(folders.size());
-      for (AVMNodeDescriptor node : folders.values())
+      if (this.webapps == null)
       {
-         webapps.add(new SelectItem(node.getName(), node.getName()));
+         String path = AVMConstants.buildSandboxRootPath(getStagingStore());
+         Map<String, AVMNodeDescriptor> folders = this.avmService.getDirectoryListing(-1, path);
+         List<SelectItem> webapps = new ArrayList<SelectItem>(folders.size());
+         for (AVMNodeDescriptor node : folders.values())
+         {
+            webapps.add(new SelectItem(node.getName(), node.getName()));
+         }
+         this.webapps = webapps;
       }
-      return webapps;
+      return this.webapps;
+   }
+   
+   /**
+    * @return count of the root webapps in the current web project
+    */
+   public int getWebappsSize()
+   {
+      return getWebapps().size();
    }
 
    /**
@@ -478,6 +493,7 @@ public class AVMBrowseBean implements IContextListener
          // clear context when we are browsing a new website
          this.lastWebsiteId = this.navigator.getCurrentNodeId();
          this.webapp = null;
+         this.webapps = null;
          this.webProject = null;
       }
       return this.navigator.getCurrentNode();
@@ -987,6 +1003,9 @@ public class AVMBrowseBean implements IContextListener
       
       this.files = null;
       this.folders = null;
+      
+      // clear webapp listing as we may have returned from the Create Webapp dialog
+      this.webapps = null;
    }
    
    /**
diff --git a/source/web/jsp/content/add-content-dialog.jsp b/source/web/jsp/content/add-content-dialog.jsp
index 70eaba69ce..8d4f43580c 100644
--- a/source/web/jsp/content/add-content-dialog.jsp
+++ b/source/web/jsp/content/add-content-dialog.jsp
@@ -193,7 +193,7 @@ if (dialog != null && dialog.getFileName() != null)
                                  <tr><td class="paddingRow"></td></tr>
                                  <tr>
                                     <td align="middle">
-                                       <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+                                       <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
                                     </td>
                                     <td>
                                        <h:outputText id="text5" value="#{msg.name}:" />
diff --git a/source/web/jsp/content/create-content-wizard/details.jsp b/source/web/jsp/content/create-content-wizard/details.jsp
index fdb516d9c1..6254c47438 100644
--- a/source/web/jsp/content/create-content-wizard/details.jsp
+++ b/source/web/jsp/content/create-content-wizard/details.jsp
@@ -72,7 +72,7 @@
 </h:panelGrid>
 
 <h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0">
-   <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.name}:"/>
    <h:inputText id="file-name" value="#{WizardManager.bean.fileName}" 
                 maxlength="1024" size="35" 
diff --git a/source/web/jsp/forums/create-dialog.jsp b/source/web/jsp/forums/create-dialog.jsp
index 019f4a9220..12c3904b42 100644
--- a/source/web/jsp/forums/create-dialog.jsp
+++ b/source/web/jsp/forums/create-dialog.jsp
@@ -75,7 +75,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
diff --git a/source/web/jsp/forums/create-post-dialog.jsp b/source/web/jsp/forums/create-post-dialog.jsp
index 2bac31c29a..4f1c16494a 100644
--- a/source/web/jsp/forums/create-post-dialog.jsp
+++ b/source/web/jsp/forums/create-post-dialog.jsp
@@ -24,7 +24,7 @@
    <h:outputText value="#{msg.message}" />
    <h:panelGrid cellpadding="2" cellspacing="6" border="0" columns="3" 
                 columnClasses="alignTop, alignTop, alignTop">
-      <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+      <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
       <h:outputText value="#{msg.message}:" />
       <h:inputTextarea id="message" value="#{DialogManager.bean.content}" rows="6" cols="70" 
                           onkeyup="checkButtonState();" onchange="checkButtonState();" />
diff --git a/source/web/jsp/forums/create-reply-dialog.jsp b/source/web/jsp/forums/create-reply-dialog.jsp
index df9af3573f..11f128cef4 100644
--- a/source/web/jsp/forums/create-reply-dialog.jsp
+++ b/source/web/jsp/forums/create-reply-dialog.jsp
@@ -24,7 +24,7 @@
    <h:outputText value="#{msg.message}" />
    <h:panelGrid cellpadding="2" cellspacing="2" border="0" columns="3" 
                 columnClasses="alignTop, alignTop, alignTop">
-      <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+      <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
       <h:outputText value="#{msg.message}:" />
       <h:inputTextarea id="message" value="#{DialogManager.bean.content}" rows="6" cols="70" 
                           onkeyup="checkButtonState();" onchange="checkButtonState();" />
diff --git a/source/web/jsp/forums/create-topic-dialog.jsp b/source/web/jsp/forums/create-topic-dialog.jsp
index 54ed057922..2de5e6a90d 100644
--- a/source/web/jsp/forums/create-topic-dialog.jsp
+++ b/source/web/jsp/forums/create-topic-dialog.jsp
@@ -76,7 +76,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
@@ -121,7 +121,7 @@
    <tr>
       <td valign="top">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td valign="top">
diff --git a/source/web/jsp/spaces/create-space-dialog.jsp b/source/web/jsp/spaces/create-space-dialog.jsp
index f43cc76e3e..56de5d60bd 100644
--- a/source/web/jsp/spaces/create-space-dialog.jsp
+++ b/source/web/jsp/spaces/create-space-dialog.jsp
@@ -75,7 +75,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
diff --git a/source/web/jsp/spaces/create-space-wizard/details.jsp b/source/web/jsp/spaces/create-space-wizard/details.jsp
index ff77fabf70..540e634a2c 100644
--- a/source/web/jsp/spaces/create-space-wizard/details.jsp
+++ b/source/web/jsp/spaces/create-space-wizard/details.jsp
@@ -97,7 +97,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
diff --git a/source/web/jsp/wcm/add-content-dialog.jsp b/source/web/jsp/wcm/add-content-dialog.jsp
index 7de39f4395..7e013a542c 100644
--- a/source/web/jsp/wcm/add-content-dialog.jsp
+++ b/source/web/jsp/wcm/add-content-dialog.jsp
@@ -193,7 +193,7 @@ if (dialog != null && dialog.getFileName() != null)
                                  <tr><td class="paddingRow"></td></tr>
                                  <tr>
                                     <td align="middle">
-                                       <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+                                       <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
                                     </td>
                                     <td>
                                        <h:outputText id="text5" value="#{msg.name}:" />
diff --git a/source/web/jsp/wcm/browse-website.jsp b/source/web/jsp/wcm/browse-website.jsp
index f0fc2cafb9..271e4ebe95 100644
--- a/source/web/jsp/wcm/browse-website.jsp
+++ b/source/web/jsp/wcm/browse-website.jsp
@@ -100,13 +100,14 @@
                <tr valign=top>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
                   <td style="padding:4px">
-                     <%-- Current Webapp selection --%>
-                     <h:outputText value="#{msg.webapp_current}" styleClass="mainSubTitle" />:&nbsp;
-                     <h:selectOneMenu value="#{AVMBrowseBean.webapp}" onchange="document.forms['website'].submit(); return true;">
-                        <f:selectItems value="#{AVMBrowseBean.webapps}" />
-                     </h:selectOneMenu>
-                     
-                     <div style="padding:4px"></div>
+                     <%-- Current Webapp selection - only displayed if >1 webapps are present --%>
+                     <h:panelGroup rendered="#{AVMBrowseBean.webappsSize > 1}">
+                        <h:outputText value="#{msg.webapp_current}:&nbsp;" styleClass="mainSubTitle" escape="false" />
+                        <h:selectOneMenu value="#{AVMBrowseBean.webapp}" onchange="document.forms['website'].submit(); return true;">
+                           <f:selectItems value="#{AVMBrowseBean.webapps}" />
+                        </h:selectOneMenu>
+                        <f:verbatim><div style="padding:4px"></div></f:verbatim>
+                     </h:panelGroup>
                      
                      <a:panel id="staging-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.staging_sandbox}">
                         
diff --git a/source/web/jsp/wcm/create-folder-dialog.jsp b/source/web/jsp/wcm/create-folder-dialog.jsp
index c4d736aee4..204c056943 100644
--- a/source/web/jsp/wcm/create-folder-dialog.jsp
+++ b/source/web/jsp/wcm/create-folder-dialog.jsp
@@ -74,7 +74,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
diff --git a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
index 894f50689e..e6f0cc45cd 100644
--- a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
@@ -51,7 +51,7 @@
 	       columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn">
                width="100%">
     <h:graphicImage id="required_image_rendering_engine_template_file"
-                    value="/images/icons/required_field.gif" alt="Required Field" />
+                    value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
     <h:outputText id="output_text_rendering_engine_template_file"
                   value="#{msg.rendering_engine_template_file}:"/>
     <h:column id="column_pt">
@@ -98,7 +98,7 @@
                width="100%">
 
     <h:graphicImage id="required-image-rendering-engine"
-                    value="/images/icons/required_field.gif" alt="Required Field" />
+                    value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
     <h:outputText id="rendering-engine-output-text"
                   value="#{msg.rendering_engine}:"/>
     <h:selectOneRadio id="rendering-engine" 
@@ -109,7 +109,7 @@
     <h:column id="rendering-engine-help"/>
 
     <h:graphicImage id="required-image-name"
-                    value="/images/icons/required_field.gif" alt="Required Field" />
+                    value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
     <h:outputText id="name-output-text"
                   value="#{msg.name}:"/>
     <h:inputText id="name" 
@@ -137,7 +137,7 @@
     <h:column id="description-help"/>
 
     <h:graphicImage id="required-image-mimetype"
-                    value="/images/icons/required_field.gif" alt="Required Field" />
+                    value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
     <h:outputText id="mimetype-output-text"
 		  value="#{msg.mimetype_for_renditions}:"/>
     <h:selectOneMenu id="mimetype"
@@ -149,21 +149,20 @@
     <h:column id="mimetype-help"/>
 
     <h:graphicImage id="required-image-output-path-pattern"
-                    value="/images/icons/required_field.gif" alt="Required Field" />
+                    value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
     <h:outputText id="output-path-pattern-output-text"
                   value="#{msg.output_path_pattern}:"/>
     <h:inputText id="output-path-pattern" 
 		 value="#{WizardManager.bean.outputPathPatternForRendition}"
 		 style="width:100%;"/>
-    <h:graphicImage id="graphic_image__output_path_pattern_help"
-		    value="/images/icons/Help_icon.gif" 
-		    onclick="javascript:toggleOutputPathPatternHelpVisible()"
-		    alt="Required Field" />
+    <h:graphicImage id="graphic_image_output_path_pattern_help"
+		    value="/images/icons/Help_icon.gif" style="cursor:help"
+		    onclick="javascript:toggleOutputPathPatternHelp()" />
 
     <h:column id="output_path_pattern_help_empty_col_1"/>
     <h:column id="output_path_pattern_help_empty_col_2"/>
     <f:verbatim>
-      <jsp:directive.include file="/jsp/wcm/output_path_pattern_help.jsp"/>
+      <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
     </f:verbatim>
     <h:column id="output_path_pattern_help_empty_col_3"/>
   </h:panelGrid>
diff --git a/source/web/jsp/wcm/create-form-wizard/details.jsp b/source/web/jsp/wcm/create-form-wizard/details.jsp
index 771b13e43f..07d91c4ae8 100644
--- a/source/web/jsp/wcm/create-form-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/details.jsp
@@ -83,7 +83,7 @@
              columns="1" cellpadding="2" 
 	     style="padding-top: 4px; padding-bottom: 4px;"
              width="100%" rowClasses="wizardSectionHeading">
-   <h:outputText id="panel_grid_1_output_text_1"
+   <h:outputText id="panel_grid_1_out_1"
                  value="&nbsp;#{msg.general_properties}" escape="false" />
 </h:panelGrid>
 
@@ -100,9 +100,9 @@
 	       border="0" 
 	       width="100%"
 	       columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn">
-    <h:graphicImage id="graphic_image_schema"
-                    value="/images/icons/required_field.gif" alt="Required Field" />
-    <h:outputText id="output_text_schema"
+    <h:graphicImage id="img_schema"
+                    value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+    <h:outputText id="out_schema"
                   value="#{msg.schema}:"/>
     <h:column id="column_schema_empty"
 	      rendered="#{empty WizardManager.bean.schemaFileName}">
@@ -116,9 +116,9 @@
     </h:column>
     <h:column id="column_schema_not_empty"
 	      rendered="#{!empty WizardManager.bean.schemaFileName}">
-      <h:outputText id="output_text_schema_name"
+      <h:outputText id="out_schema_name"
                     value="#{WizardManager.bean.schemaFileName}"/>
-      <h:outputText id="output_text_schema_space"
+      <h:outputText id="out_schema_space"
                     value="&nbsp;"
 		    escape="false"/>
       <a:actionLink id="action_link_remove_schema"
@@ -129,8 +129,8 @@
 		    target="top"/>
     </h:column>
     
-    <h:column id="no_graphic_image_root_element_name"/>
-    <h:outputText id="output_text_root_element_name" value="#{msg.schema_root_element_name}:"/>
+    <h:column id="no_img_root_element_name"/>
+    <h:outputText id="out_root_element_name" value="#{msg.schema_root_element_name}:"/>
     <h:selectOneMenu id="schema-root-element-name" 
 		     style="width:100%;"
                      value="#{WizardManager.bean.schemaRootElementName}"
@@ -154,49 +154,48 @@
 	       columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn,panelGridRequiredImageColumn">
 	       width="100%">
   
-    <h:graphicImage id="graphic_image_name" 
+    <h:graphicImage id="img_name" 
 		    value="/images/icons/required_field.gif" 
-		    alt="Required Field" />
-    <h:outputText id="output_text_name" value="#{msg.name}:"/>
+		    alt="#{msg.required_field}" />
+    <h:outputText id="out_name" value="#{msg.name}:"/>
     <h:inputText id="form-name" 
 		 value="#{WizardManager.bean.formName}"
                  maxlength="1024" 
 		 size="35"/>
-    <h:column id="no_graphic_image_name_help"/>
+    <h:column id="no_img_name_help"/>
     
-    <h:column id="no_graphic_image_title"/>
-    <h:outputText id="output_text_title" value="#{msg.title}:"/>
+    <h:column id="no_img_title"/>
+    <h:outputText id="out_title" value="#{msg.title}:"/>
     <h:inputText id="form-title" 
 		 value="#{WizardManager.bean.formTitle}" 
                  maxlength="1024" 
 		 size="35"/>
-    <h:column id="no_graphic_image_title_help"/>
+    <h:column id="no_img_title_help"/>
     
-    <h:column id="no_graphic_image_description"/>
-    <h:outputText id="output_text_description" value="#{msg.description}:"/>
+    <h:column id="no_img_description"/>
+    <h:outputText id="out_description" value="#{msg.description}:"/>
     <h:inputText id="form-description" 
 		 value="#{WizardManager.bean.formDescription}" 
                  maxlength="1024" 
 		 style="width:100%"/>
-    <h:outputText id="no_graphic_image_description_help" value=""/>
+    <h:outputText id="no_img_description_help" value=""/>
     
-    <h:graphicImage id="graphic_image_form_instance_data_output_path_pattern" 
+    <h:graphicImage id="img_form_instance_data_output_path_pattern" 
 		    value="/images/icons/required_field.gif" 
-		    alt="Required Field" />
-    <h:outputText id="output_text_form_instance_data_output_path_pattern" 
+		    alt="#{msg.required_field}" />
+    <h:outputText id="out_form_instance_data_output_path_pattern" 
 		  value="#{msg.output_path_pattern}:"/>
     <h:inputText id="form_instance_data_output_path_pattern" 
 		 value="#{WizardManager.bean.outputPathPatternForFormInstanceData}" 
 		 style="width:100%"/>
-    <h:graphicImage id="graphic_image_form_instance_data_output_path_pattern_help"
-		    value="/images/icons/Help_icon.gif" 
-		    onclick="javascript:toggleOutputPathPatternHelpVisible()"
-		    alt="Required Field" />
+    <h:graphicImage id="img_form_instance_data_output_path_pattern_help"
+		    value="/images/icons/Help_icon.gif" style="cursor:help"
+		    onclick="javascript:toggleOutputPathPatternHelp()" />
 
     <h:column id="output_path_pattern_help_empty_col_1"/>
     <h:column id="output_path_pattern_help_empty_col_2"/>
     <f:verbatim>
-      <jsp:directive.include file="/jsp/wcm/output_path_pattern_help.jsp"/>
+      <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
     </f:verbatim>
     <h:column id="output_path_pattern_help_empty_col_3"/>
 
diff --git a/source/web/jsp/wcm/create-web-content-wizard/details.jsp b/source/web/jsp/wcm/create-web-content-wizard/details.jsp
index 1fc517dd1a..2af8307fa3 100644
--- a/source/web/jsp/wcm/create-web-content-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-web-content-wizard/details.jsp
@@ -72,7 +72,7 @@
 </h:panelGrid>
 
 <h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0">
-   <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.name}:"/>
    <h:inputText id="file-name" value="#{WizardManager.bean.fileName}" 
                 maxlength="1024" size="35" 
diff --git a/source/web/jsp/wcm/create-webapp.jsp b/source/web/jsp/wcm/create-webapp.jsp
index c4d736aee4..204c056943 100644
--- a/source/web/jsp/wcm/create-webapp.jsp
+++ b/source/web/jsp/wcm/create-webapp.jsp
@@ -74,7 +74,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp
index 8a7ed4b36f..cddcc8501f 100644
--- a/source/web/jsp/wcm/create-website-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/details.jsp
@@ -84,7 +84,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
@@ -102,7 +102,7 @@
    <tr>
       <td align="middle">
          </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
          <f:verbatim>
       </td>
       <td>
@@ -126,7 +126,7 @@
       </td>
       <td width="85%">
          </f:verbatim>
-         <h:inputText id="webapp" value="#{WizardManager.bean.webapp}" size="35" maxlength="256" />
+         <h:inputText id="webapp" value="#{WizardManager.bean.webapp}" size="35" maxlength="256" disabled="true" />
          <f:verbatim>
       </td>
    </tr>
diff --git a/source/web/jsp/wcm/create-website-wizard/form-details.jsp b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
index 37d6a585f2..34a81514e8 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
@@ -53,16 +53,18 @@
       <f:verbatim>
       <table cellpadding="3" cellspacing="2" border="0" width="100%">
          <tr>
-            <td colspan="3" class="wizardSectionHeading">
+            <td class="wizardSectionHeading">
                </f:verbatim>
                <h:outputText value="#{msg.properties}"/>
                <f:verbatim>
             </td>
          </tr>
+      </table>
+      <table cellpadding="3" cellspacing="2" border="0">
          <tr>
-            <td align="middle">
+            <td align="left" width=16>
                </f:verbatim>
-               <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+               <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
                <f:verbatim>
             </td>
             <td>
@@ -98,31 +100,42 @@
       <f:verbatim>
       <table cellpadding="3" cellspacing="2" border="0" width="100%">
          <tr>
-            <td colspan="2" class="wizardSectionHeading">
+            <td class="wizardSectionHeading">
                </f:verbatim>
                <h:outputText value="#{msg.website_save_location}"/>
                <f:verbatim>
             </td>
          </tr>
          <tr>
-            <td colspan="2">
+            <td>
                </f:verbatim>
                <h:outputText value="#{msg.website_save_location_info}:" />
                <f:verbatim>
             </td>
          </tr>
+      </table>
+      <table cellpadding="3" cellspacing="2" border="0">
          <tr>
             <td>
+               <nobr>
                </f:verbatim>
                <h:outputText value="#{msg.output_path_pattern}:"/>
                <f:verbatim>
+               </nobr>
             </td>
             <td>
                </f:verbatim>
-                <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="65" maxlength="1024" />
+               <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="65" maxlength="1024" />
+               <h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
                <f:verbatim>
             </td>
          </tr>
+         <tr>
+            <td></td>
+            <td>
+               <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
+            </td>
+         </tr>
       </table>
       </f:verbatim>
    </h:panelGroup>
diff --git a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
index 497d6a5535..cc559c2e47 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
@@ -34,29 +34,37 @@
    
    <f:verbatim><div style='padding:4px'></div></f:verbatim>
    <h:outputText styleClass="mainSubText" value="#{msg.website_selected_templates}:" />
-   <h:dataTable value="#{DialogManager.bean.templatesDataModel}" var="row" 
-                rowClasses="selectedItemsRow,selectedItemsRowAlt"
-                styleClass="selectedItems" headerClass="selectedItemsHeader"
-                cellspacing="0" cellpadding="4" 
-                rendered="#{DialogManager.bean.templatesDataModel.rowCount != 0}">
-      <h:column>
-         <f:facet name="header">
-            <h:outputText value="#{msg.name}" />
-         </f:facet>
-         <h:outputText value="#{row.title}" />
-      </h:column>
-      <h:column>
-         <f:facet name="header">
-            <h:outputText value="#{msg.configure}" />
-         </f:facet>
-         <h:outputText value="#{msg.output_path_pattern}:" style="padding-right:4px" />
-         <h:inputText value="#{row.outputPathPattern}" size="65" maxlength="1024" />
-      </h:column>
-      <h:column>
-         <a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
-                       value="#{msg.remove}" showLink="false" style="padding-left:6px" />
-      </h:column>
-   </h:dataTable>
+   
+   <h:panelGroup rendered="#{DialogManager.bean.templatesDataModel.rowCount != 0}">
+      <h:panelGrid columns="2" cellspacing="2">
+         <h:dataTable value="#{DialogManager.bean.templatesDataModel}" var="row" 
+                      rowClasses="selectedItemsRow,selectedItemsRowAlt"
+                      styleClass="selectedItems" headerClass="selectedItemsHeader"
+                      cellspacing="0" cellpadding="4">
+            <h:column>
+               <f:facet name="header">
+                  <h:outputText value="#{msg.name}" />
+               </f:facet>
+               <h:outputText value="#{row.title}" />
+            </h:column>
+            <h:column>
+               <f:facet name="header">
+                  <h:outputText value="#{msg.configure}" />
+               </f:facet>
+               <h:outputText value="#{msg.output_path_pattern}:" style="padding-right:4px" />
+               <h:inputText value="#{row.outputPathPattern}" size="65" maxlength="1024" />
+            </h:column>
+            <h:column>
+               <a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
+                             value="#{msg.remove}" showLink="false" style="padding-left:6px" />
+            </h:column>
+         </h:dataTable>
+         <h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
+      </h:panelGrid>
+      <f:verbatim>
+         <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
+      </f:verbatim>
+   </h:panelGroup>
    
    <a:panel id="no-items" rendered="#{DialogManager.bean.templatesDataModel.rowCount == 0}">
       <h:panelGrid columns="1" cellpadding="2" styleClass="selectedItems" rowClasses="selectedItemsHeader,selectedItemsRow">
@@ -64,4 +72,5 @@
          <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
       </h:panelGrid>
    </a:panel>
+   
 </h:panelGrid>
diff --git a/source/web/jsp/wcm/output-path-pattern-help.jsp b/source/web/jsp/wcm/output-path-pattern-help.jsp
new file mode 100644
index 0000000000..07de5758c2
--- /dev/null
+++ b/source/web/jsp/wcm/output-path-pattern-help.jsp
@@ -0,0 +1,40 @@
+<script type="text/javascript">
+   function toggleOutputPathPatternHelp()
+   {
+      var d = document.getElementById('output_path_pattern_help');
+      d.style.display = d.style.display == 'block' ? 'none' : 'block';
+   }
+</script>
+
+<div id="output_path_pattern_help" class="summary infoText statusInfoText" style="display:none; padding: 5px;">
+<div>An output path pattern is a <a style="color:blue;" href="http://freemarker.sourceforge.net">FreeMarker</a> expression which is used to specify the path to use when saving a generated asset using variable substitution when creating web content.</div>
+<br/>
+<div style="font-weight: bold">Guidelines</div>
+<div>Output path patterns beginning with a leading slash (such as <tt>/&#36;{webapp}/content/&#36;{name}.xml</tt>) will produce paths rooted at the sandbox.  Those not begining with a leading slash will produce paths relative to the current working directory when the create web content wizard is invoked.</div>
+<br/>
+<div style="font-weight: bold">Variables</div>
+<table border="0" cellspacing="1" cellpadding="1">
+   <colgroup><col width="15%"/><col width="85%"/></colgroup>
+   <tbody>
+      <tr><td><tt style="font-weight:bold;">name</td></tt><td>The name of the form instance data as entered by the user in the create web content wizard.</td></tr>
+      <tr><td><tt style="font-weight:bold;">webapp</td></tt><td>The name of the webapp in which the form instance data is being created.  Typically, if specifying an absolute output path pattern, the path will begin with the webapp folder (i.e. <tt>/&#36;{webapp}/...</tt>)</td></tr>
+      <tr><td><tt style="font-weight:bold;">extension</td></tt><td>The default extension associated with the mime-type configured for the rendering engine template.  This variable is only available for rendition ouput path patterns.</td></tr>
+      <tr><td><tt style="font-weight:bold;">xml</td></tt><td>The xml instance data collected by the form.</td></tr>
+      <tr><td><tt style="font-weight:bold;">node</td></tt><td>The form instance data node.</td></tr>
+      <tr><td><tt style="font-weight:bold;">date</td></tt><td>The current date at which the form instance data is being saved.  Refer to the <a style="color:blue;" href="http://freemarker.sourceforge.net/docs/ref_builtins_date.htm">FreeMarker date reference</a> for more information.</td></tr>
+   </tbody>
+</table>
+<br/>
+<div style="font-weight: bold">For example</div>
+<table border="0" cellspacing="1" cellpadding="1">
+   <colgroup><col width="25%"/><col width="75%"/></colgroup>
+   <tbody>
+      <tr><td><tt style="font-weight:bold;">&#36;{name}.xml</td></tt><td>form_name.xml</td></tr>
+      <tr><td><tt style="font-weight:bold;">&#36;{name}.&#36;{extension}</td></tt><td>form_name.html</td></tr>
+      <tr><td><tt style="font-weight:bold;">/&#36;{webapp}/content/&#36;{name}.xml</td></tt><td>/ROOT/content/form_name.xml</td></tr>
+      <tr><td><tt style="font-weight:bold;">&#36;{date?string("yyyy-MM-dd")}.xml</td></tt><td>2007-01-09.xml</td></tr>
+   </tbody>
+</table>
+<br/>
+<div>For a more complete reference, please refer to the <a style="color: blue" href="http://wiki.alfresco.com">wiki.</a></div>
+</div>
diff --git a/source/web/jsp/wcm/output_path_pattern_help.jsp b/source/web/jsp/wcm/output_path_pattern_help.jsp
deleted file mode 100644
index bdaa8dcab5..0000000000
--- a/source/web/jsp/wcm/output_path_pattern_help.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<script type="text/javascript">
-function toggleOutputPathPatternHelpVisible()
-{
- var d = document.getElementById('output_path_pattern_help');
- d.style.display = d.style.display == 'block' ? 'none' : 'block';
-}
-</script>
-<div id="output_path_pattern_help" class="summary infoText statusInfoText" style="display:none; padding: 5px;">
-<div>An output path pattern is a <a style="color:blue;" href="http://freemarker.sourceforge.net">FreeMarker</a> expression which is used to specify the path to use when saving a generated asset using variable substitution when creating web content.</div>
-<br/>
-<div style="font-weight: bold">Guidelines</div>
-<div>Output path patterns beginning with a leading slash (such as <tt>/&#36;{webapp}/content/&#36;{name}.xml</tt>) will produce paths rooted at the sandbox.  Those not begining with a leading slash will produce paths relative to the current working directory when the create web content wizard is invoked.</div>
-<br/>
-<div style="font-weight: bold">Variables</div>
-<table border="0" cellspacing="1" cellpadding="1">
-<colgroup><col width="15%"/><col width="85%"/></colgroup>
-<tbody>
-<tr><td><tt style="font-weight:bold;">name</td></tt><td>The name of the form instance data as entered by the user in the create web content wizard.</td></tr>
-<tr><td><tt style="font-weight:bold;">webapp</td></tt><td>The name of the webapp in which the form instance data is being created.  Typically, if specifying an absolute output path pattern, the path will begin with the webapp folder (i.e. <tt>/&#36;{webapp}/...</tt>)</td></tr>
-<tr><td><tt style="font-weight:bold;">extension</td></tt><td>The default extension associated with the mime-type configured for the rendering engine template.  This variable is only available for rendition ouput path patterns.</td></tr>
-<tr><td><tt style="font-weight:bold;">xml</td></tt><td>The xml instance data collected by the form.</td></tr>
-<tr><td><tt style="font-weight:bold;">node</td></tt><td>The form instance data node.</td></tr>
-<tr><td><tt style="font-weight:bold;">date</td></tt><td>The current date at which the form instance data is being saved.  Refer to the <a style="color:blue;" href="http://freemarker.sourceforge.net/docs/ref_builtins_date.htm">FreeMarker date reference</a> for more information.</td></tr>
-</tbody>
-</table>
-<br/>
-<div style="font-weight: bold">For example</div>
-<table border="0" cellspacing="1" cellpadding="1">
-<colgroup><col width="25%"/><col width="75%"/></colgroup>
-<tbody>
-<tr><td><tt style="font-weight:bold;">&#36;{name}.xml</td></tt><td>form_name.xml</td></tr>
-<tr><td><tt style="font-weight:bold;">&#36;{name}.&#36;{extension}</td></tt><td>form_name.html</td></tr>
-<tr><td><tt style="font-weight:bold;">/&#36;{webapp}/content/&#36;{name}.xml</td></tt><td>/ROOT/content/form_name.xml</td></tr>
-<tr><td><tt style="font-weight:bold;">&#36;{date?string("yyyy-MM-dd")}.xml</td></tt><td>2007-01-09.xml</td></tr>
-</tbody>
-</table>
-<br/>
-<div>For a more complete reference, please refer to the <a style="color: blue" href="http://wiki.alfresco.com">wiki.</a></div>
-</div>
diff --git a/source/web/jsp/wcm/snapshot-sandbox.jsp b/source/web/jsp/wcm/snapshot-sandbox.jsp
index 22b2183635..21afadde20 100644
--- a/source/web/jsp/wcm/snapshot-sandbox.jsp
+++ b/source/web/jsp/wcm/snapshot-sandbox.jsp
@@ -50,7 +50,7 @@
 </h:panelGrid>
 
 <h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0">
-   <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.snapshot_label}:"/>
    <h:inputText id="label" value="#{DialogManager.bean.label}" 
                 maxlength="256" size="35"