inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

. Output path pattern help added to Create Website wizard (Configure Form Templates and Web Form Details pages)

Browse Source 
- 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
This commit is contained in:
Kevin Roast
2007-01-10 11:25:32 +00:00
parent f5e16dfcd0
commit cc14e27cd6
23 changed files with 176 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/webclient.properties
View File

@@ -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. new_category_description=Enter information about the new Category then click Create Category.
status_message_default=No messages. status_message_default=No messages.
no_icons_found=No icons found no_icons_found=No icons found
required_field=Required Field
# UI Component messages # UI Component messages
yes=Yes yes=Yes

31
source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
View File

@@ -108,6 +108,9 @@ public class AVMBrowseBean implements IContextListener
/** Current webapp context for actions and sandbox view */ /** Current webapp context for actions and sandbox view */
private String webapp; private String webapp;
/** List of top-level webapp directories for the current web project */
private List<SelectItem> webapps;
/** Sandbox title message */ /** Sandbox title message */
private String sandboxTitle = null; private String sandboxTitle = null;
@@ -405,14 +408,26 @@ public class AVMBrowseBean implements IContextListener
*/ */
public List<SelectItem> getWebapps() public List<SelectItem> getWebapps()
{ {
String path = AVMConstants.buildSandboxRootPath(getStagingStore()); if (this.webapps == null)
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())); 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 // clear context when we are browsing a new website
this.lastWebsiteId = this.navigator.getCurrentNodeId(); this.lastWebsiteId = this.navigator.getCurrentNodeId();
this.webapp = null; this.webapp = null;
this.webapps = null;
this.webProject = null; this.webProject = null;
} }
return this.navigator.getCurrentNode(); return this.navigator.getCurrentNode();
@@ -987,6 +1003,9 @@ public class AVMBrowseBean implements IContextListener
this.files = null; this.files = null;
this.folders = null; this.folders = null;
// clear webapp listing as we may have returned from the Create Webapp dialog
this.webapps = null;
} }
/** /**

2
source/web/jsp/content/add-content-dialog.jsp
View File

@@ -193,7 +193,7 @@ if (dialog != null && dialog.getFileName() != null)
<tr><td class="paddingRow"></td></tr> <tr><td class="paddingRow"></td></tr>
<tr> <tr>
<td align="middle"> <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>
<td> <td>
<h:outputText id="text5" value="#{msg.name}:" /> <h:outputText id="text5" value="#{msg.name}:" />

2
source/web/jsp/content/create-content-wizard/details.jsp
View File

@@ -72,7 +72,7 @@
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0"> <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:outputText value="#{msg.name}:"/>
<h:inputText id="file-name" value="#{WizardManager.bean.fileName}" <h:inputText id="file-name" value="#{WizardManager.bean.fileName}"
maxlength="1024" size="35" maxlength="1024" size="35"

2
source/web/jsp/forums/create-dialog.jsp
View File

@@ -75,7 +75,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>

2
source/web/jsp/forums/create-post-dialog.jsp
View File

@@ -24,7 +24,7 @@
<h:outputText value="#{msg.message}" /> <h:outputText value="#{msg.message}" />
<h:panelGrid cellpadding="2" cellspacing="6" border="0" columns="3" <h:panelGrid cellpadding="2" cellspacing="6" border="0" columns="3"
columnClasses="alignTop, alignTop, alignTop"> 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:outputText value="#{msg.message}:" />
<h:inputTextarea id="message" value="#{DialogManager.bean.content}" rows="6" cols="70" <h:inputTextarea id="message" value="#{DialogManager.bean.content}" rows="6" cols="70"
onkeyup="checkButtonState();" onchange="checkButtonState();" /> onkeyup="checkButtonState();" onchange="checkButtonState();" />

2
source/web/jsp/forums/create-reply-dialog.jsp
View File

@@ -24,7 +24,7 @@
<h:outputText value="#{msg.message}" /> <h:outputText value="#{msg.message}" />
<h:panelGrid cellpadding="2" cellspacing="2" border="0" columns="3" <h:panelGrid cellpadding="2" cellspacing="2" border="0" columns="3"
columnClasses="alignTop, alignTop, alignTop"> 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:outputText value="#{msg.message}:" />
<h:inputTextarea id="message" value="#{DialogManager.bean.content}" rows="6" cols="70" <h:inputTextarea id="message" value="#{DialogManager.bean.content}" rows="6" cols="70"
onkeyup="checkButtonState();" onchange="checkButtonState();" /> onkeyup="checkButtonState();" onchange="checkButtonState();" />

4
source/web/jsp/forums/create-topic-dialog.jsp
View File

@@ -76,7 +76,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>
@@ -121,7 +121,7 @@
<tr> <tr>
<td valign="top"> <td valign="top">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td valign="top"> <td valign="top">

2
source/web/jsp/spaces/create-space-dialog.jsp
View File

@@ -75,7 +75,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>

2
source/web/jsp/spaces/create-space-wizard/details.jsp
View File

@@ -97,7 +97,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>

2
source/web/jsp/wcm/add-content-dialog.jsp
View File

@@ -193,7 +193,7 @@ if (dialog != null && dialog.getFileName() != null)
<tr><td class="paddingRow"></td></tr> <tr><td class="paddingRow"></td></tr>
<tr> <tr>
<td align="middle"> <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>
<td> <td>
<h:outputText id="text5" value="#{msg.name}:" /> <h:outputText id="text5" value="#{msg.name}:" />

15
source/web/jsp/wcm/browse-website.jsp
View File

@@ -100,13 +100,14 @@
<tr valign=top> <tr valign=top>
<td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td> <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
<td style="padding:4px"> <td style="padding:4px">
<%-- Current Webapp selection --%> <%-- Current Webapp selection - only displayed if >1 webapps are present --%>
<h:outputText value="#{msg.webapp_current}" styleClass="mainSubTitle" />:&nbsp; <h:panelGroup rendered="#{AVMBrowseBean.webappsSize > 1}">
<h:selectOneMenu value="#{AVMBrowseBean.webapp}" onchange="document.forms['website'].submit(); return true;"> <h:outputText value="#{msg.webapp_current}:&nbsp;" styleClass="mainSubTitle" escape="false" />
<f:selectItems value="#{AVMBrowseBean.webapps}" /> <h:selectOneMenu value="#{AVMBrowseBean.webapp}" onchange="document.forms['website'].submit(); return true;">
</h:selectOneMenu> <f:selectItems value="#{AVMBrowseBean.webapps}" />
</h:selectOneMenu>
<div style="padding:4px"></div> <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}"> <a:panel id="staging-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.staging_sandbox}">

2
source/web/jsp/wcm/create-folder-dialog.jsp
View File

@@ -74,7 +74,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>

19
source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
View File

@@ -51,7 +51,7 @@
columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn"> columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn">
width="100%"> width="100%">
<h:graphicImage id="required_image_rendering_engine_template_file" <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" <h:outputText id="output_text_rendering_engine_template_file"
value="#{msg.rendering_engine_template_file}:"/> value="#{msg.rendering_engine_template_file}:"/>
<h:column id="column_pt"> <h:column id="column_pt">
@@ -98,7 +98,7 @@
width="100%"> width="100%">
<h:graphicImage id="required-image-rendering-engine" <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" <h:outputText id="rendering-engine-output-text"
value="#{msg.rendering_engine}:"/> value="#{msg.rendering_engine}:"/>
<h:selectOneRadio id="rendering-engine" <h:selectOneRadio id="rendering-engine"
@@ -109,7 +109,7 @@
<h:column id="rendering-engine-help"/> <h:column id="rendering-engine-help"/>
<h:graphicImage id="required-image-name" <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" <h:outputText id="name-output-text"
value="#{msg.name}:"/> value="#{msg.name}:"/>
<h:inputText id="name" <h:inputText id="name"
@@ -137,7 +137,7 @@
<h:column id="description-help"/> <h:column id="description-help"/>
<h:graphicImage id="required-image-mimetype" <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" <h:outputText id="mimetype-output-text"
value="#{msg.mimetype_for_renditions}:"/> value="#{msg.mimetype_for_renditions}:"/>
<h:selectOneMenu id="mimetype" <h:selectOneMenu id="mimetype"
@@ -149,21 +149,20 @@
<h:column id="mimetype-help"/> <h:column id="mimetype-help"/>
<h:graphicImage id="required-image-output-path-pattern" <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" <h:outputText id="output-path-pattern-output-text"
value="#{msg.output_path_pattern}:"/> value="#{msg.output_path_pattern}:"/>
<h:inputText id="output-path-pattern" <h:inputText id="output-path-pattern"
value="#{WizardManager.bean.outputPathPatternForRendition}" value="#{WizardManager.bean.outputPathPatternForRendition}"
style="width:100%;"/> style="width:100%;"/>
<h:graphicImage id="graphic_image__output_path_pattern_help" <h:graphicImage id="graphic_image_output_path_pattern_help"
value="/images/icons/Help_icon.gif" value="/images/icons/Help_icon.gif" style="cursor:help"
onclick="javascript:toggleOutputPathPatternHelpVisible()" onclick="javascript:toggleOutputPathPatternHelp()" />
alt="Required Field" />
<h:column id="output_path_pattern_help_empty_col_1"/> <h:column id="output_path_pattern_help_empty_col_1"/>
<h:column id="output_path_pattern_help_empty_col_2"/> <h:column id="output_path_pattern_help_empty_col_2"/>
<f:verbatim> <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> </f:verbatim>
<h:column id="output_path_pattern_help_empty_col_3"/> <h:column id="output_path_pattern_help_empty_col_3"/>
</h:panelGrid> </h:panelGrid>

51
source/web/jsp/wcm/create-form-wizard/details.jsp
View File

@@ -83,7 +83,7 @@
columns="1" cellpadding="2" columns="1" cellpadding="2"
style="padding-top: 4px; padding-bottom: 4px;" style="padding-top: 4px; padding-bottom: 4px;"
width="100%" rowClasses="wizardSectionHeading"> 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" /> value="&nbsp;#{msg.general_properties}" escape="false" />
</h:panelGrid> </h:panelGrid>
@@ -100,9 +100,9 @@
border="0" border="0"
width="100%" width="100%"
columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn"> columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn">
<h:graphicImage id="graphic_image_schema" <h:graphicImage id="img_schema"
value="/images/icons/required_field.gif" alt="Required Field" /> value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText id="output_text_schema" <h:outputText id="out_schema"
value="#{msg.schema}:"/> value="#{msg.schema}:"/>
<h:column id="column_schema_empty" <h:column id="column_schema_empty"
rendered="#{empty WizardManager.bean.schemaFileName}"> rendered="#{empty WizardManager.bean.schemaFileName}">
@@ -116,9 +116,9 @@
</h:column> </h:column>
<h:column id="column_schema_not_empty" <h:column id="column_schema_not_empty"
rendered="#{!empty WizardManager.bean.schemaFileName}"> rendered="#{!empty WizardManager.bean.schemaFileName}">
<h:outputText id="output_text_schema_name" <h:outputText id="out_schema_name"
value="#{WizardManager.bean.schemaFileName}"/> value="#{WizardManager.bean.schemaFileName}"/>
<h:outputText id="output_text_schema_space" <h:outputText id="out_schema_space"
value="&nbsp;" value="&nbsp;"
escape="false"/> escape="false"/>
<a:actionLink id="action_link_remove_schema" <a:actionLink id="action_link_remove_schema"
@@ -129,8 +129,8 @@
target="top"/> target="top"/>
</h:column> </h:column>
<h:column id="no_graphic_image_root_element_name"/> <h:column id="no_img_root_element_name"/>
<h:outputText id="output_text_root_element_name" value="#{msg.schema_root_element_name}:"/> <h:outputText id="out_root_element_name" value="#{msg.schema_root_element_name}:"/>
<h:selectOneMenu id="schema-root-element-name" <h:selectOneMenu id="schema-root-element-name"
style="width:100%;" style="width:100%;"
value="#{WizardManager.bean.schemaRootElementName}" value="#{WizardManager.bean.schemaRootElementName}"
@@ -154,49 +154,48 @@
columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn,panelGridRequiredImageColumn"> columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn,panelGridRequiredImageColumn">
width="100%"> width="100%">
<h:graphicImage id="graphic_image_name" <h:graphicImage id="img_name"
value="/images/icons/required_field.gif" value="/images/icons/required_field.gif"
alt="Required Field" /> alt="#{msg.required_field}" />
<h:outputText id="output_text_name" value="#{msg.name}:"/> <h:outputText id="out_name" value="#{msg.name}:"/>
<h:inputText id="form-name" <h:inputText id="form-name"
value="#{WizardManager.bean.formName}" value="#{WizardManager.bean.formName}"
maxlength="1024" maxlength="1024"
size="35"/> 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:column id="no_img_title"/>
<h:outputText id="output_text_title" value="#{msg.title}:"/> <h:outputText id="out_title" value="#{msg.title}:"/>
<h:inputText id="form-title" <h:inputText id="form-title"
value="#{WizardManager.bean.formTitle}" value="#{WizardManager.bean.formTitle}"
maxlength="1024" maxlength="1024"
size="35"/> 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:column id="no_img_description"/>
<h:outputText id="output_text_description" value="#{msg.description}:"/> <h:outputText id="out_description" value="#{msg.description}:"/>
<h:inputText id="form-description" <h:inputText id="form-description"
value="#{WizardManager.bean.formDescription}" value="#{WizardManager.bean.formDescription}"
maxlength="1024" maxlength="1024"
style="width:100%"/> 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" value="/images/icons/required_field.gif"
alt="Required Field" /> alt="#{msg.required_field}" />
<h:outputText id="output_text_form_instance_data_output_path_pattern" <h:outputText id="out_form_instance_data_output_path_pattern"
value="#{msg.output_path_pattern}:"/> value="#{msg.output_path_pattern}:"/>
<h:inputText id="form_instance_data_output_path_pattern" <h:inputText id="form_instance_data_output_path_pattern"
value="#{WizardManager.bean.outputPathPatternForFormInstanceData}" value="#{WizardManager.bean.outputPathPatternForFormInstanceData}"
style="width:100%"/> style="width:100%"/>
<h:graphicImage id="graphic_image_form_instance_data_output_path_pattern_help" <h:graphicImage id="img_form_instance_data_output_path_pattern_help"
value="/images/icons/Help_icon.gif" value="/images/icons/Help_icon.gif" style="cursor:help"
onclick="javascript:toggleOutputPathPatternHelpVisible()" onclick="javascript:toggleOutputPathPatternHelp()" />
alt="Required Field" />
<h:column id="output_path_pattern_help_empty_col_1"/> <h:column id="output_path_pattern_help_empty_col_1"/>
<h:column id="output_path_pattern_help_empty_col_2"/> <h:column id="output_path_pattern_help_empty_col_2"/>
<f:verbatim> <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> </f:verbatim>
<h:column id="output_path_pattern_help_empty_col_3"/> <h:column id="output_path_pattern_help_empty_col_3"/>

2
source/web/jsp/wcm/create-web-content-wizard/details.jsp
View File

@@ -72,7 +72,7 @@
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0"> <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:outputText value="#{msg.name}:"/>
<h:inputText id="file-name" value="#{WizardManager.bean.fileName}" <h:inputText id="file-name" value="#{WizardManager.bean.fileName}"
maxlength="1024" size="35" maxlength="1024" size="35"

2
source/web/jsp/wcm/create-webapp.jsp
View File

@@ -74,7 +74,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>

6
source/web/jsp/wcm/create-website-wizard/details.jsp
View File

@@ -84,7 +84,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>
@@ -102,7 +102,7 @@
<tr> <tr>
<td align="middle"> <td align="middle">
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>
@@ -126,7 +126,7 @@
</td> </td>
<td width="85%"> <td width="85%">
</f:verbatim> </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> <f:verbatim>
</td> </td>
</tr> </tr>

25
source/web/jsp/wcm/create-website-wizard/form-details.jsp
View File

@@ -53,16 +53,18 @@
<f:verbatim> <f:verbatim>
<table cellpadding="3" cellspacing="2" border="0" width="100%"> <table cellpadding="3" cellspacing="2" border="0" width="100%">
<tr> <tr>
<td colspan="3" class="wizardSectionHeading"> <td class="wizardSectionHeading">
</f:verbatim> </f:verbatim>
<h:outputText value="#{msg.properties}"/> <h:outputText value="#{msg.properties}"/>
<f:verbatim> <f:verbatim>
</td> </td>
</tr> </tr>
</table>
<table cellpadding="3" cellspacing="2" border="0">
<tr> <tr>
<td align="middle"> <td align="left" width=16>
</f:verbatim> </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> <f:verbatim>
</td> </td>
<td> <td>
@@ -98,31 +100,42 @@
<f:verbatim> <f:verbatim>
<table cellpadding="3" cellspacing="2" border="0" width="100%"> <table cellpadding="3" cellspacing="2" border="0" width="100%">
<tr> <tr>
<td colspan="2" class="wizardSectionHeading"> <td class="wizardSectionHeading">
</f:verbatim> </f:verbatim>
<h:outputText value="#{msg.website_save_location}"/> <h:outputText value="#{msg.website_save_location}"/>
<f:verbatim> <f:verbatim>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td>
</f:verbatim> </f:verbatim>
<h:outputText value="#{msg.website_save_location_info}:" /> <h:outputText value="#{msg.website_save_location_info}:" />
<f:verbatim> <f:verbatim>
</td> </td>
</tr> </tr>
</table>
<table cellpadding="3" cellspacing="2" border="0">
<tr> <tr>
<td> <td>
<nobr>
</f:verbatim> </f:verbatim>
<h:outputText value="#{msg.output_path_pattern}:"/> <h:outputText value="#{msg.output_path_pattern}:"/>
<f:verbatim> <f:verbatim>
</nobr>
</td> </td>
<td> <td>
</f:verbatim> </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> <f:verbatim>
</td> </td>
</tr> </tr>
<tr>
<td></td>
<td>
<jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
</td>
</tr>
</table> </table>
</f:verbatim> </f:verbatim>
</h:panelGroup> </h:panelGroup>

55
source/web/jsp/wcm/create-website-wizard/form-templates.jsp
View File

@@ -34,29 +34,37 @@
<f:verbatim><div style='padding:4px'></div></f:verbatim> <f:verbatim><div style='padding:4px'></div></f:verbatim>
<h:outputText styleClass="mainSubText" value="#{msg.website_selected_templates}:" /> <h:outputText styleClass="mainSubText" value="#{msg.website_selected_templates}:" />
<h:dataTable value="#{DialogManager.bean.templatesDataModel}" var="row"
rowClasses="selectedItemsRow,selectedItemsRowAlt" <h:panelGroup rendered="#{DialogManager.bean.templatesDataModel.rowCount != 0}">
styleClass="selectedItems" headerClass="selectedItemsHeader" <h:panelGrid columns="2" cellspacing="2">
cellspacing="0" cellpadding="4" <h:dataTable value="#{DialogManager.bean.templatesDataModel}" var="row"
rendered="#{DialogManager.bean.templatesDataModel.rowCount != 0}"> rowClasses="selectedItemsRow,selectedItemsRowAlt"
<h:column> styleClass="selectedItems" headerClass="selectedItemsHeader"
<f:facet name="header"> cellspacing="0" cellpadding="4">
<h:outputText value="#{msg.name}" /> <h:column>
</f:facet> <f:facet name="header">
<h:outputText value="#{row.title}" /> <h:outputText value="#{msg.name}" />
</h:column> </f:facet>
<h:column> <h:outputText value="#{row.title}" />
<f:facet name="header"> </h:column>
<h:outputText value="#{msg.configure}" /> <h:column>
</f:facet> <f:facet name="header">
<h:outputText value="#{msg.output_path_pattern}:" style="padding-right:4px" /> <h:outputText value="#{msg.configure}" />
<h:inputText value="#{row.outputPathPattern}" size="65" maxlength="1024" /> </f:facet>
</h:column> <h:outputText value="#{msg.output_path_pattern}:" style="padding-right:4px" />
<h:column> <h:inputText value="#{row.outputPathPattern}" size="65" maxlength="1024" />
<a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif" </h:column>
value="#{msg.remove}" showLink="false" style="padding-left:6px" /> <h:column>
</h:column> <a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
</h:dataTable> 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}"> <a:panel id="no-items" rendered="#{DialogManager.bean.templatesDataModel.rowCount == 0}">
<h:panelGrid columns="1" cellpadding="2" styleClass="selectedItems" rowClasses="selectedItemsHeader,selectedItemsRow"> <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:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
</h:panelGrid> </h:panelGrid>
</a:panel> </a:panel>
</h:panelGrid> </h:panelGrid>

40
source/web/jsp/wcm/output-path-pattern-help.jsp Normal file
View File

@@ -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>

39
source/web/jsp/wcm/output_path_pattern_help.jsp
View File

@@ -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>

2
source/web/jsp/wcm/snapshot-sandbox.jsp
View File

@@ -50,7 +50,7 @@
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0"> <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:outputText value="#{msg.snapshot_label}:"/>
<h:inputText id="label" value="#{DialogManager.bean.label}" <h:inputText id="label" value="#{DialogManager.bean.label}"
maxlength="256" size="35" maxlength="256" size="35"