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

. WCM UI enhancements

Browse Source 
- sizing and rendering of select list components
 - Modifier column added to sandbox browse, description column removed
 - Label changes
 - Other minor changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-01-10 18:23:20 +00:00
parent 8336c9dab1
commit 1119293674
10 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,6 +210,7 @@ title=Title
author=Author author=Author
date=Date date=Date
mimetype=Format mimetype=Format
modifier=Modifier
# Repo permission display labels # Repo permission display labels
# Note - these come from the server, the english translation is generally the same # Note - these come from the server, the english translation is generally the same
@@ -909,7 +910,7 @@ website_info=Use this view to browse the staging area and user sandboxes for a w
staging_sandbox=Staging Sandbox staging_sandbox=Staging Sandbox
user_sandboxes=User Sandboxes user_sandboxes=User Sandboxes
sandbox_preview=Preview Website sandbox_preview=Preview Website
sandbox_create=Create New Content sandbox_create=Create Web Content
sandbox_browse=Browse Website sandbox_browse=Browse Website
sandbox_revert=Undo sandbox_revert=Undo
sandbox_revertall=Undo All sandbox_revertall=Undo All

1
source/java/org/alfresco/web/bean/wcm/AVMNode.java
View File

@@ -199,6 +199,7 @@ public class AVMNode extends Node implements Map<String, Object>
this.properties.put("created", this.avmRef.getCreateDate()); this.properties.put("created", this.avmRef.getCreateDate());
this.properties.put("modified", this.avmRef.getModDate()); this.properties.put("modified", this.avmRef.getModDate());
this.properties.put("creator", this.avmRef.getCreator()); this.properties.put("creator", this.avmRef.getCreator());
this.properties.put("modifier", this.avmRef.getLastModifier());
this.propsRetrieved = true; this.propsRetrieved = true;
} }

2
source/java/org/alfresco/web/ui/common/component/UISelectList.java
View File

@@ -387,7 +387,7 @@ public class UISelectList extends UIInput implements NamingContainer
// label and description text // label and description text
String description = item.getDescription(); String description = item.getDescription();
out.write("<td"); out.write("<td width=100%");
Utils.outputAttribute(out, getAttributes().get("itemStyle"), "style"); Utils.outputAttribute(out, getAttributes().get("itemStyle"), "style");
Utils.outputAttribute(out, getAttributes().get("itemStyleClass"), "class"); Utils.outputAttribute(out, getAttributes().get("itemStyleClass"), "class");
out.write("><div style='padding:2px'>"); out.write("><div style='padding:2px'>");

4
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -743,7 +743,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
out.write("</td><td>"); out.write("</td><td>");
String desc = (String)f.getDescription(); String desc = (String)f.getDescription();
out.write(desc != null ? desc : ""); out.write(desc != null ? desc : "");
out.write("</td><td>"); out.write("</td><td><nobr>");
// actions // actions
UIActionLink action = findAction(ACT_CREATE_FORM_CONTENT, userStorePrefix); UIActionLink action = findAction(ACT_CREATE_FORM_CONTENT, userStorePrefix);
if (action == null) if (action == null)
@@ -768,7 +768,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
requestMap.put(REQUEST_FORM_REF, f); requestMap.put(REQUEST_FORM_REF, f);
Utils.encodeRecursive(fc, action); Utils.encodeRecursive(fc, action);
requestMap.remove(REQUEST_FORM_REF); requestMap.remove(REQUEST_FORM_REF);
out.write("</td></tr>"); out.write("</nobr></td></tr>");
} }
out.write("</table>"); out.write("</table>");

32
source/web/jsp/wcm/browse-sandbox.jsp
View File

@@ -141,13 +141,13 @@
</a:actionLink> </a:actionLink>
</a:column> </a:column>
<%-- Description column --%> <%-- Description column
<a:column id="col4" style="text-align:left"> <a:column id="col4" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink id="col4-sort" label="#{msg.description}" value="description" styleClass="header"/> <a:sortLink id="col4-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText id="col4-txt" value="#{r.description}" /> <h:outputText id="col4-txt" value="#{r.description}" />
</a:column> </a:column>--%>
<%-- Creator column --%> <%-- Creator column --%>
<a:column id="col5" style="text-align:left"> <a:column id="col5" style="text-align:left">
@@ -160,17 +160,25 @@
<%-- Created Date column --%> <%-- Created Date column --%>
<a:column id="col6" style="text-align:left"> <a:column id="col6" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink id="col6-sort" label="#{msg.created}" value="created" styleClass="header"/> <a:sortLink id="col6-sort" label="#{msg.created_date}" value="created" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText id="col6-txt" value="#{r.created}"> <h:outputText id="col6-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Modifier column --%>
<a:column id="col6_1" style="text-align:left">
<f:facet name="header">
<a:sortLink id="col6_1-sort" label="#{msg.modifier}" value="modifier" styleClass="header"/>
</f:facet>
<h:outputText id="col6_1-txt" value="#{r.modifier}" />
</a:column>
<%-- Modified Date column --%> <%-- Modified Date column --%>
<a:column id="col7" style="text-align:left"> <a:column id="col7" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink id="col7-sort" label="#{msg.modified}" value="modified" styleClass="header"/> <a:sortLink id="col7-sort" label="#{msg.modified_date}" value="modified" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText id="col7-txt" value="#{r.modified}"> <h:outputText id="col7-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
@@ -219,13 +227,13 @@
<a:actionLink id="col10-act2" value="#{r.name}" href="#{r.url}" target="new" /> <a:actionLink id="col10-act2" value="#{r.name}" href="#{r.url}" target="new" />
</a:column> </a:column>
<%-- Description column --%> <%-- Description column
<a:column id="col13" style="text-align:left"> <a:column id="col13" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink id="col13-sort" label="#{msg.description}" value="description" styleClass="header"/> <a:sortLink id="col13-sort" label="#{msg.description}" value="description" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText id="col13-txt" value="#{r.description}" /> <h:outputText id="col13-txt" value="#{r.description}" />
</a:column> </a:column> --%>
<%-- Size column --%> <%-- Size column --%>
<a:column id="col15" style="text-align:left"> <a:column id="col15" style="text-align:left">
@@ -248,17 +256,25 @@
<%-- Created Date column --%> <%-- Created Date column --%>
<a:column id="col16" style="text-align:left"> <a:column id="col16" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink id="col16-sort" label="#{msg.created}" value="created" styleClass="header"/> <a:sortLink id="col16-sort" label="#{msg.created_date}" value="created" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText id="col16-txt" value="#{r.created}"> <h:outputText id="col16-txt" value="#{r.created}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
</h:outputText> </h:outputText>
</a:column> </a:column>
<%-- Modifier column --%>
<a:column id="col13" style="text-align:left">
<f:facet name="header">
<a:sortLink id="col13-sort" label="#{msg.modifier}" value="modifier" styleClass="header"/>
</f:facet>
<h:outputText id="col13-txt" value="#{r.modifier}" />
</a:column>
<%-- Modified Date column --%> <%-- Modified Date column --%>
<a:column id="col17" style="text-align:left"> <a:column id="col17" style="text-align:left">
<f:facet name="header"> <f:facet name="header">
<a:sortLink id="col17-sort" label="#{msg.modified}" value="modified" styleClass="header"/> <a:sortLink id="col17-sort" label="#{msg.modified_date}" value="modified" styleClass="header"/>
</f:facet> </f:facet>
<h:outputText id="col17-txt" value="#{r.modified}"> <h:outputText id="col17-txt" value="#{r.modified}">
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" /> <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />

2
source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
View File

@@ -43,7 +43,7 @@ function apply_default_workflow_changed(value)
value="#{msg.create_form_select_default_workflow_select_workflow}:" value="#{msg.create_form_select_default_workflow_select_workflow}:"
escape="false" /> escape="false" />
<f:verbatim><div id="workflow-list-div" <f:verbatim><div id="workflow-list-div"
style="margin:5px 0px;height:108px;*height:112px;width:100%;overflow:auto" class="selectListTable"></f:verbatim> style="margin:5px 0px;height:144px;*height:148px;width:100%;overflow:auto" class="selectListTable"></f:verbatim>
<a:selectList id="workflow-list" <a:selectList id="workflow-list"
multiSelect="false" multiSelect="false"
style="width:100%" style="width:100%"

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

@@ -125,7 +125,7 @@
</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="70" maxlength="1024" />
<h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" /> <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>
@@ -163,8 +163,8 @@
</f:verbatim> </f:verbatim>
<%-- Workflow selection list - scrollable DIV area --%> <%-- Workflow selection list - scrollable DIV area --%>
<h:panelGroup> <h:panelGroup>
<f:verbatim><div style="height:108px;*height:112px;width:300px;overflow:auto" class='selectListTable'></f:verbatim> <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
<a:selectList id="workflow-list" multiSelect="false" style="width:276px" itemStyleClass="selectListItem" <a:selectList id="workflow-list" multiSelect="false" style="width:100%" itemStyleClass="selectListItem"
value="#{DialogManager.bean.workflowSelectedValue}"> value="#{DialogManager.bean.workflowSelectedValue}">
<a:listItems value="#{DialogManager.bean.workflowList}" /> <a:listItems value="#{DialogManager.bean.workflowList}" />
</a:selectList> </a:selectList>

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

@@ -49,10 +49,9 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{msg.configure}" /> <h:outputText value="#{msg.output_path_pattern}" />
</f:facet> </f:facet>
<h:outputText value="#{msg.output_path_pattern}:" style="padding-right:4px" /> <h:inputText value="#{row.outputPathPattern}" size="70" maxlength="1024" />
<h:inputText value="#{row.outputPathPattern}" size="65" maxlength="1024" />
</h:column> </h:column>
<h:column> <h:column>
<a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif" <a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"

4
source/web/jsp/wcm/create-website-wizard/forms.jsp
View File

@@ -26,8 +26,8 @@
<%-- Form selection list - scrollable DIV area --%> <%-- Form selection list - scrollable DIV area --%>
<h:outputText styleClass="mainSubText" value="#{msg.website_select_form}:" /> <h:outputText styleClass="mainSubText" value="#{msg.website_select_form}:" />
<h:panelGroup> <h:panelGroup>
<f:verbatim><div style="height:108px;*height:112px;width:300px;overflow:auto" class='selectListTable'></f:verbatim> <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
<a:selectList id="form-list" activeSelect="true" style="width:276px" itemStyleClass="selectListItem"> <a:selectList id="form-list" activeSelect="true" style="width:100%" itemStyleClass="selectListItem">
<a:listItems value="#{WizardManager.bean.formsList}" /> <a:listItems value="#{WizardManager.bean.formsList}" />
<h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addForm}" /> <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addForm}" />
</a:selectList> </a:selectList>

4
source/web/jsp/wcm/create-website-wizard/settings.jsp
View File

@@ -26,8 +26,8 @@
<%-- Workflow selection list - scrollable DIV area --%> <%-- Workflow selection list - scrollable DIV area --%>
<h:outputText styleClass="mainSubText" value="#{msg.website_select_workflows}:" /> <h:outputText styleClass="mainSubText" value="#{msg.website_select_workflows}:" />
<h:panelGroup> <h:panelGroup>
<f:verbatim><div style="height:108px;*height:112px;width:300px;overflow:auto" class='selectListTable'></f:verbatim> <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
<a:selectList id="workflow-list" activeSelect="true" style="width:276px" itemStyleClass="selectListItem"> <a:selectList id="workflow-list" activeSelect="true" style="width:100%" itemStyleClass="selectListItem">
<a:listItems value="#{WizardManager.bean.workflowList}" /> <a:listItems value="#{WizardManager.bean.workflowList}" />
<h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addWorkflow}" /> <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addWorkflow}" />
</a:selectList> </a:selectList>