From 18a3f1a132110ba313944f19ec9d42c747532427 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 1 Mar 2007 18:48:02 +0000 Subject: [PATCH] . Popup info panel now on by default - Config element 'ajax-enabled' changed to 'node-summary-enabled' for now - with default of 'true' . New popup info panel icon (from Linton) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/config/ClientConfigElement.java | 16 ++++++++-------- .../web/config/ClientElementReader.java | 6 +++--- .../web/ui/repo/component/UINodeInfo.java | 8 ++++---- source/web/images/icons/popup.gif | Bin 999 -> 978 bytes source/web/jsp/browse/browse.jsp | 12 ++++++------ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java index 28c1fa1038..85ebd592a3 100644 --- a/source/java/org/alfresco/web/config/ClientConfigElement.java +++ b/source/java/org/alfresco/web/config/ClientConfigElement.java @@ -62,7 +62,7 @@ public class ClientConfigElement extends ConfigElementAdapter private String helpUrl = null; private String editLinkType = "http"; private String homeSpacePermission = null; - private boolean ajaxEnabled = false; + private boolean nodeSummaryEnabled = true; private String initialLocation = "myalfresco"; private ExpiringValueCache wcmDomain = new ExpiringValueCache(1000*10L); private ExpiringValueCache wcmPort = new ExpiringValueCache(1000*10L); @@ -190,9 +190,9 @@ public class ClientConfigElement extends ConfigElementAdapter combinedElement.setFromEmailAddress(newElement.getFromEmailAddress()); } - if (newElement.isAjaxEnabled() != combinedElement.isAjaxEnabled()) + if (newElement.isNodeSummaryEnabled() != combinedElement.isNodeSummaryEnabled()) { - combinedElement.setAjaxEnabled(newElement.isAjaxEnabled()); + combinedElement.setNodeSummaryEnabled(newElement.isNodeSummaryEnabled()); } if (newElement.getInitialLocation() != null && @@ -466,19 +466,19 @@ public class ClientConfigElement extends ConfigElementAdapter /** * @return Returns whether AJAX support is enabled in the client */ - public boolean isAjaxEnabled() + public boolean isNodeSummaryEnabled() { - return this.ajaxEnabled; + return this.nodeSummaryEnabled; } /** * Sets whether AJAX support is enabled in the client * - * @param ajaxEnabled + * @param nodeSummaryEnabled */ - /*package*/ void setAjaxEnabled(boolean ajaxEnabled) + /*package*/ void setNodeSummaryEnabled(boolean ajaxEnabled) { - this.ajaxEnabled = ajaxEnabled; + this.nodeSummaryEnabled = ajaxEnabled; } /** diff --git a/source/java/org/alfresco/web/config/ClientElementReader.java b/source/java/org/alfresco/web/config/ClientElementReader.java index 1e51be00af..7ec50ed51d 100644 --- a/source/java/org/alfresco/web/config/ClientElementReader.java +++ b/source/java/org/alfresco/web/config/ClientElementReader.java @@ -48,7 +48,7 @@ public class ClientElementReader implements ConfigElementReader public static final String ELEMENT_HOMESPACEPERMISSION = "home-space-permission"; public static final String ELEMENT_FROMEMAILADDRESS = "from-email-address"; public static final String ELEMENT_SHELFVISIBLE = "shelf-visible"; - public static final String ELEMENT_AJAX_ENABLED = "ajax-enabled"; + public static final String ELEMENT_NODESUMMARY_ENABLED = "node-summary-enabled"; public static final String ELEMENT_INITIALLOCATION = "initial-location"; public static final String ELEMENT_DEFAULTHOMESPACEPATH = "default-home-space-path"; public static final String ELEMENT_CLIPBOARDSTATUS = "clipboard-status-visible"; @@ -161,10 +161,10 @@ public class ClientElementReader implements ConfigElementReader } // get the ajax enabled flag - Element ajaxEnabled = element.element(ELEMENT_AJAX_ENABLED); + Element ajaxEnabled = element.element(ELEMENT_NODESUMMARY_ENABLED); if (ajaxEnabled != null) { - configElement.setAjaxEnabled(Boolean.parseBoolean(ajaxEnabled.getTextTrim())); + configElement.setNodeSummaryEnabled(Boolean.parseBoolean(ajaxEnabled.getTextTrim())); } // get the initial location diff --git a/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java b/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java index 1c494fee16..ae68eee4ef 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java +++ b/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java @@ -37,8 +37,6 @@ import org.alfresco.web.ui.common.component.SelfRenderingComponent; /** * JSF component that displays information about a node. - *

- * The node to show information on * * @author gavinc */ @@ -48,6 +46,7 @@ public class UINodeInfo extends SelfRenderingComponent protected Object value = null; + // ------------------------------------------------------------------------------ // Component Impl @@ -82,7 +81,7 @@ public class UINodeInfo extends SelfRenderingComponent if (!isRendered()) return; // if AJAX is disabled don't render anything - if (Application.getClientConfig(context).isAjaxEnabled()) + if (Application.getClientConfig(context).isNodeSummaryEnabled()) { ResponseWriter out = context.getResponseWriter(); @@ -116,12 +115,13 @@ public class UINodeInfo extends SelfRenderingComponent if (!isRendered()) return; // if AJAX is disabled don't render anything - if (Application.getClientConfig(context).isAjaxEnabled()) + if (Application.getClientConfig(context).isNodeSummaryEnabled()) { context.getResponseWriter().write(""); } } + // ------------------------------------------------------------------------------ // Strongly typed component property accessors diff --git a/source/web/images/icons/popup.gif b/source/web/images/icons/popup.gif index 80918ad2870de1cf272196e1bf10ad9973aadbaf..2c880ae59083cb8de99334f67fb8aef3b8c3aa98 100644 GIT binary patch literal 978 zcmZ?wbhEHb6krfwXlGz>%wHAXwxekN`Rb*Y{xdLiEIZx1@=W`hYhCNF_inr~Ve_rY z+itHo^l0^w$E%M%-gf5sj`Pp=UwM7->gz+--W@z=Yre?I^C`|anS@4tb@kAl$<7+fKs_>+a1fq{iV2jnbJ zo?zfu&%ntcjA+A8fVZfVp-&H(wgp jlM@S?9v&8zm~qGAfdezw1ZkNQ83GHP+W6SnSQxAU`b(4D literal 999 zcmZ?wbhEHb6ky{!~_1pJu+`fO~&i$MB@87@s;MTo|x9>l^bN|tuhmY?)d;&!G9|6(R z`;VVJd;&zzA3X)47muHT(39scpT2knM9*Hne*W^!i&r4@^7Y%7Z{EFn^X~QA_ix_4 zfAjvs+Yg`Ke*~h>A3lBl`1#AHFJC`@{r2VCx3AxSeE$JNKY#rE`Qz8`U%!9<{`2QI z!zdWOA)xq^g_(hYn?VQUMNpn#;5fn{&LQK$?9|0>!ltFt!Q?YtM@2|a#N+T0asB8G zA%cp5ioHTnJ2FltrE*Q-mleMtk@%ELjFn5srEt=bW)~@iMIH;AQjcjgRKl7t3J1qN#X*vlVa diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp index becac99063..06a24ae39d 100644 --- a/source/web/jsp/browse/browse.jsp +++ b/source/web/jsp/browse/browse.jsp @@ -281,7 +281,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -447,7 +447,7 @@ - +