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

. Popup info panel now on by default

Browse Source 
- 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
This commit is contained in:
Kevin Roast
2007-03-01 18:48:02 +00:00
parent a4aa830af2
commit 18a3f1a132
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/web/config/ClientConfigElement.java
View File

@@ -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<String> wcmDomain = new ExpiringValueCache<String>(1000*10L);
private ExpiringValueCache<String> wcmPort = new ExpiringValueCache<String>(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;
}
/**

6
source/java/org/alfresco/web/config/ClientElementReader.java
View File

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

8
source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
View File

@@ -37,8 +37,6 @@ import org.alfresco.web.ui.common.component.SelfRenderingComponent;
/**
* JSF component that displays information about a node.
* <p>
* 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("</span>");
}
}
// ------------------------------------------------------------------------------
// Strongly typed component property accessors

BIN
source/web/images/icons/popup.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 999 B

After

Width:  |  Height:  |  Size: 978 B

12
source/web/jsp/browse/browse.jsp
View File

@@ -281,7 +281,7 @@
<f:param name="id" value="#{r.id}" />
</a:actionLink>
<r:nodeInfo id="col1-info" value="#{r.id}">
<h:graphicImage id="col1-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="15" />
<h:graphicImage id="col1-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="16" />
</r:nodeInfo>
</a:column>
@@ -296,7 +296,7 @@
<f:param name="id" value="#{r.id}" />
</a:actionLink>
<r:nodeInfo id="col2-info" value="#{r.id}">
<h:graphicImage id="col2-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="15" />
<h:graphicImage id="col2-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="16" />
</r:nodeInfo>
</a:column>
@@ -311,7 +311,7 @@
<f:param name="id" value="#{r.id}" />
</a:actionLink>
<r:nodeInfo id="col3-info" value="#{r.id}">
<h:graphicImage id="col3-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="15" />
<h:graphicImage id="col3-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="16" />
</r:nodeInfo>
</a:column>
@@ -423,7 +423,7 @@
<a:actionLink id="col10-act2" value="#{r.name}" href="#{r.url}" target="new" />
<r:lockIcon id="col10-lock" value="#{r.nodeRef}" align="absmiddle" />
<r:nodeInfo id="col10-info" value="#{r.id}">
<h:graphicImage id="col10-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="15" />
<h:graphicImage id="col10-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="16" />
</r:nodeInfo>
</a:column>
@@ -435,7 +435,7 @@
<a:actionLink id="col11-act2" value="#{r.name}" href="#{r.url}" target="new" styleClass="header" />
<r:lockIcon id="col11-lock" value="#{r.nodeRef}" align="absmiddle" />
<r:nodeInfo id="col11-info" value="#{r.id}">
<h:graphicImage id="col11-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="15" />
<h:graphicImage id="col11-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="16" />
</r:nodeInfo>
</a:column>
@@ -447,7 +447,7 @@
<a:actionLink id="col12-act2" value="#{r.name}" href="#{r.url}" target="new" styleClass="title" />
<r:lockIcon id="col12-lock" value="#{r.nodeRef}" align="absmiddle" />
<r:nodeInfo id="col12-info" value="#{r.id}">
<h:graphicImage id="col12-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="15" />
<h:graphicImage id="col12-img" url="/images/icons/popup.gif" style='cursor:pointer' width="16" height="16" />
</r:nodeInfo>
</a:column>