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 
- Progress bar indicator on ZIP website import screen
  - Clickable links for sandbox icons (same as clicking browse action icon)
  - Size field added to file list for website browsing

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-09-18 15:25:34 +00:00
parent 61175d2192
commit baa90889af
7 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,6 +800,7 @@ user_sandboxes=User Sandboxes
sandbox_preview=Preview Website sandbox_preview=Preview Website
sandbox_create=Create New Content sandbox_create=Create New Content
sandbox_browse=Browse Website sandbox_browse=Browse Website
sandbox_icon=Browse Website
import_website_content=Import Website Content import_website_content=Import Website Content
title_browse_sandbox=Browse Sandbox title_browse_sandbox=Browse Sandbox
sandbox_info=Use this view to browse the files and folders within the sandbox for a website. sandbox_info=Use this view to browse the files and folders within the sandbox for a website.

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

@@ -320,8 +320,6 @@ public class AVMBrowseBean implements IContextListener
// build the client representation of the AVM node // build the client representation of the AVM node
AVMNode node = new AVMNode(avmRef); AVMNode node = new AVMNode(avmRef);
// add any common properties
// properties specific to folders or files // properties specific to folders or files
if (avmRef.isDirectory()) if (avmRef.isDirectory())
{ {

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

@@ -75,6 +75,7 @@ public class AVMNode implements Map<String, Object>
this.properties.put("id", this.path); this.properties.put("id", this.path);
this.properties.put("path", this.path); this.properties.put("path", this.path);
this.properties.put("size", this.avmRef.getLength());
this.properties.put("name", this.avmRef.getName()); this.properties.put("name", this.avmRef.getName());
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());

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

@@ -193,7 +193,11 @@ public class UIUserSandboxes extends SelfRenderingComponent
// components for the current username, preview, browse and modified items inner list // components for the current username, preview, browse and modified items inner list
out.write("<table cellspacing=2 cellpadding=2 border=0 width=100%><tr><td>"); out.write("<table cellspacing=2 cellpadding=2 border=0 width=100%><tr><td>");
out.write(Utils.buildImageTag(context, WebResources.IMAGE_USERSANDBOX_32, 32, 32, "")); // show the icon for the sandbox as a clickable browse link image
Utils.encodeRecursive(context, aquireAction(
context, mainStore, username, "sandbox_icon", WebResources.IMAGE_USERSANDBOX_32,
"#{AVMBrowseBean.setupSandboxAction}", "browseSandbox"));
//out.write(Utils.buildImageTag(context, WebResources.IMAGE_USERSANDBOX_32, 32, 32, ""));
out.write("</td><td width=100%>"); out.write("</td><td width=100%>");
out.write("<b>"); out.write("<b>");
out.write(bundle.getString(MSG_USERNAME)); out.write(bundle.getString(MSG_USERNAME));

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

@@ -106,8 +106,8 @@
label="#{msg.website_browse_folders}"> label="#{msg.website_browse_folders}">
<a:richList id="folder-list" binding="#{AVMBrowseBean.foldersRichList}" viewMode="details" pageSize="10" <a:richList id="folder-list" binding="#{AVMBrowseBean.foldersRichList}" viewMode="details" pageSize="10"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
value="#{AVMBrowseBean.folders}" var="r"> value="#{AVMBrowseBean.folders}" var="r">
<%-- Primary column with folder name --%> <%-- Primary column with folder name --%>
<a:column primary="true" width="200" style="padding:2px;text-align:left"> <a:column primary="true" width="200" style="padding:2px;text-align:left">
@@ -180,8 +180,8 @@
label="#{msg.website_browse_files}"> label="#{msg.website_browse_files}">
<a:richList id="files-list" binding="#{AVMBrowseBean.filesRichList}" viewMode="details" pageSize="10" <a:richList id="files-list" binding="#{AVMBrowseBean.filesRichList}" viewMode="details" pageSize="10"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
value="#{AVMBrowseBean.files}" var="r"> value="#{AVMBrowseBean.files}" var="r">
<%-- Primary column for details view mode --%> <%-- Primary column for details view mode --%>
<a:column id="col10" primary="true" width="200" style="padding:2px;text-align:left"> <a:column id="col10" primary="true" width="200" style="padding:2px;text-align:left">

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

@@ -102,7 +102,7 @@
<% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %> <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
<table cellspacing=2 cellpadding=2 border=0 width=100%> <table cellspacing=2 cellpadding=2 border=0 width=100%>
<tr> <tr>
<td align=left width=32><h:graphicImage url="/images/icons/sandbox_large.gif" width="32" height="32" /></td> <td align=left width=32><a:actionLink image="/images/icons/sandbox_large.gif" showLink="false" value="#{msg.staging_sandbox}" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="browseSandbox" /></td>
<td align=left><h:outputText value="#{msg.staging_sandbox}" styleClass="mainSubTitle" /></td> <td align=left><h:outputText value="#{msg.staging_sandbox}" styleClass="mainSubTitle" /></td>
<td align=right> <td align=right>
(P)&nbsp;(E)&nbsp;(T)&nbsp;(D)&nbsp; (P)&nbsp;(E)&nbsp;(T)&nbsp;(D)&nbsp;

10
source/web/jsp/wcm/import-content-dialog.jsp
View File

@@ -144,7 +144,7 @@
<h:form acceptCharset="UTF-8" id="add-content-upload-end"> <h:form acceptCharset="UTF-8" id="add-content-upload-end">
<% if (foundFile) { %> <% if (foundFile) { %>
<tr> <tr>
<td colspan="3"> <td>
<table border="0" cellspacing="2" cellpadding="2" class="selectedItems"> <table border="0" cellspacing="2" cellpadding="2" class="selectedItems">
<tr> <tr>
<td colspan="2" class="selectedItemsHeader"> <td colspan="2" class="selectedItemsHeader">
@@ -163,6 +163,11 @@
</tr> </tr>
</table> </table>
</td> </td>
<td width="100%" valign="middle" align="center">
<div id="progress" style="display:none">
<img src="<%=request.getContextPath()%>/images/icons/process_animation.gif" width=174 height=14>
</div>
</td>
</tr> </tr>
<% } %> <% } %>
@@ -177,7 +182,8 @@
<td align="center"> <td align="center">
<h:commandButton id="finish-button" styleClass="wizardButton" <h:commandButton id="finish-button" styleClass="wizardButton"
value="#{msg.ok}" value="#{msg.ok}"
action="#{ImportWebsiteDialog.finish}" action="#{ImportWebsiteDialog.finish}"
onclick="javascript:document.getElementById('progress').style.display='inline';"
disabled="#{ImportWebsiteDialog.finishButtonDisabled}" /> disabled="#{ImportWebsiteDialog.finishButtonDisabled}" />
</td> </td>
</tr> </tr>