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

UI enhancements suggestions from Linton after previous checkin

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-06-14 11:12:11 +00:00
parent ef275a586a
commit c0795d2a1c
2 changed files with 115 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
source/java/org/alfresco/web/bean/BrowseBean.java
View File

@@ -187,38 +187,47 @@ public class BrowseBean implements IContextListener
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dashboard"); fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dashboard");
} }
} }
/** public int getPageSizeContent()
* @return Returns the browsePageSize.
*/
public int getBrowsePageSize()
{ {
return this.browsePageSize; return this.pageSizeContent;
}
/**
* @param browsePageSize The browsePageSize to set.
*/
public void setBrowsePageSize(int browsePageSize)
{
this.browsePageSize = browsePageSize;
this.browsePageSizeString = Integer.toString(browsePageSize);
}
/**
* @return browsePageSizeString
*/
public String getBrowsePageSizeString()
{
return this.browsePageSizeString;
} }
/** public void setPageSizeContent(int pageSizeContent)
* @param browsePageSizeString to set
*/
public void setBrowsePageSizeString(String browsePageSizeString)
{ {
this.browsePageSizeString = browsePageSizeString; this.pageSizeContent = pageSizeContent;
this.pageSizeContentStr = Integer.toString(pageSizeContent);
}
public int getPageSizeSpaces()
{
return this.pageSizeSpaces;
}
public void setPageSizeSpaces(int pageSizeSpaces)
{
this.pageSizeSpaces = pageSizeSpaces;
this.pageSizeSpacesStr = Integer.toString(pageSizeSpaces);
}
public String getPageSizeContentStr()
{
return this.pageSizeContentStr;
}
public void setPageSizeContentStr(String pageSizeContentStr)
{
this.pageSizeContentStr = pageSizeContentStr;
}
public String getPageSizeSpacesStr()
{
return this.pageSizeSpacesStr;
}
public void setPageSizeSpacesStr(String pageSizeSpacesStr)
{
this.pageSizeSpacesStr = pageSizeSpacesStr;
} }
/** /**
@@ -496,11 +505,12 @@ public class BrowseBean implements IContextListener
if (VIEWMODE_DASHBOARD.equals(viewMode) == false) if (VIEWMODE_DASHBOARD.equals(viewMode) == false)
{ {
// set the page size based on the style of display // set the page size based on the style of display
setBrowsePageSize(this.viewsConfig.getDefaultPageSize(PAGE_NAME_BROWSE, int pageSize = this.viewsConfig.getDefaultPageSize(PAGE_NAME_BROWSE, viewMode);
viewMode)); setPageSizeContent(pageSize);
setPageSizeSpaces(pageSize);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Browse view page size set to: " + getBrowsePageSize()); logger.debug("Browse view page size set to: " + pageSize);
setDashboardView(false); setDashboardView(false);
@@ -1015,25 +1025,50 @@ public class BrowseBean implements IContextListener
/** /**
* Update page size based on user selection * Update page size based on user selection
*/ */
public void updatePageSize(ActionEvent event) public void updateSpacesPageSize(ActionEvent event)
{ {
try try
{ {
int size = Integer.parseInt(this.browsePageSizeString); int size = Integer.parseInt(this.pageSizeSpacesStr);
if (size >= 0) if (size >= 0)
{ {
this.browsePageSize = size; this.pageSizeSpaces = size;
} }
else else
{ {
// reset to known value if this occurs // reset to known value if this occurs
this.browsePageSizeString = Integer.toString(this.browsePageSize); this.pageSizeSpacesStr = Integer.toString(this.pageSizeSpaces);
} }
} }
catch (NumberFormatException err) catch (NumberFormatException err)
{ {
// reset to known value if this occurs // reset to known value if this occurs
this.browsePageSizeString = Integer.toString(this.browsePageSize); this.pageSizeSpacesStr = Integer.toString(this.pageSizeSpaces);
}
}
/**
* Update page size based on user selection
*/
public void updateContentPageSize(ActionEvent event)
{
try
{
int size = Integer.parseInt(this.pageSizeContentStr);
if (size >= 0)
{
this.pageSizeContent = size;
}
else
{
// reset to known value if this occurs
this.pageSizeContentStr = Integer.toString(this.pageSizeContent);
}
}
catch (NumberFormatException err)
{
// reset to known value if this occurs
this.pageSizeContentStr = Integer.toString(this.pageSizeContent);
} }
} }
@@ -1453,7 +1488,9 @@ public class BrowseBean implements IContextListener
getConfigElement(ViewsConfigElement.CONFIG_ELEMENT_ID); getConfigElement(ViewsConfigElement.CONFIG_ELEMENT_ID);
this.browseViewMode = this.viewsConfig.getDefaultView(PAGE_NAME_BROWSE); this.browseViewMode = this.viewsConfig.getDefaultView(PAGE_NAME_BROWSE);
setBrowsePageSize(this.viewsConfig.getDefaultPageSize(PAGE_NAME_BROWSE, this.browseViewMode)); int pageSize = this.viewsConfig.getDefaultPageSize(PAGE_NAME_BROWSE, this.browseViewMode);
setPageSizeContent(pageSize);
setPageSizeSpaces(pageSize);
} }
/** /**
@@ -1739,9 +1776,11 @@ public class BrowseBean implements IContextListener
/** The current browse view mode - set to a well known IRichListRenderer identifier */ /** The current browse view mode - set to a well known IRichListRenderer identifier */
private String browseViewMode; private String browseViewMode;
/** The current browse view page size */ /** The current browse view page sizes */
private int browsePageSize; private int pageSizeSpaces;
private String browsePageSizeString; private int pageSizeContent;
private String pageSizeSpacesStr;
private String pageSizeContentStr;
/** True if current space has a dashboard (template) view available */ /** True if current space has a dashboard (template) view available */
private boolean dashboardView; private boolean dashboardView;

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

@@ -29,6 +29,32 @@
<r:page titleId="title_browse"> <r:page titleId="title_browse">
<script language="JavaScript1.2">
function applySizeSpaces(e)
{
return applySize(e, 'spaces-apply');
}
function applySizeContent(e)
{
return applySize(e, 'content-apply');
}
function applySize(e, field)
{
var keycode;
if (window.event) keycode = window.event.keyCode;
else if (e) keycode = e.which;
if (keycode == 13)
{
document.forms['browse']['browse:act'].value='browse:' + field;
document.forms['browse'].submit();
return false;
}
return true;
}
</script>
<f:view> <f:view>
<% <%
FacesContext fc = FacesContext.getCurrentInstance(); FacesContext fc = FacesContext.getCurrentInstance();
@@ -187,8 +213,8 @@
<f:facet name="title"> <f:facet name="title">
<a:panel id="page-controls1" style="font-size:9px"> <a:panel id="page-controls1" style="font-size:9px">
<h:outputText value="#{msg.items_per_page}" id="items-txt1"/> <h:outputText value="#{msg.items_per_page}" id="items-txt1"/>
<h:inputText id="spaces-pages" value="#{BrowseBean.browsePageSizeString}" style="width:24px;margin-left:4px;margin-right:4px" maxlength="3" /> <h:inputText id="spaces-pages" value="#{BrowseBean.pageSizeSpacesStr}" style="width:24px;margin-left:4px" maxlength="3" onkeyup="return applySizeSpaces(event);" />
<h:commandButton id="items-btn1" value="#{msg.ok}" actionListener="#{BrowseBean.updatePageSize}" /> <div style="display:none"><a:actionLink id="spaces-apply" value="" actionListener="#{BrowseBean.updateSpacesPageSize}" /></div>
</a:panel> </a:panel>
</f:facet> </f:facet>
</h:panelGroup> </h:panelGroup>
@@ -196,7 +222,7 @@
label="#{msg.browse_spaces}" progressive="true" facetsId="spaces-panel-facets"> label="#{msg.browse_spaces}" progressive="true" facetsId="spaces-panel-facets">
<%-- Spaces List --%> <%-- Spaces List --%>
<a:richList id="spacesList" binding="#{BrowseBean.spacesRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.browsePageSize}" <a:richList id="spacesList" binding="#{BrowseBean.spacesRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeSpaces}"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
value="#{BrowseBean.nodes}" var="r"> value="#{BrowseBean.nodes}" var="r">
@@ -317,18 +343,20 @@
<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">
<%--<h:panelGroup id="content-panel-facets"> <h:panelGroup id="content-panel-facets">
<f:facet name="title"> <f:facet name="title">
<a:panel id="page-controls2" style="font-size:9px"> <a:panel id="page-controls2" style="font-size:9px">
<h:outputText value="#{msg.items_per_page}" id="items-txt2"/>:&nbsp;<h:inputText id="content-pages" value="#{BrowseBean.browsePageSize}" style="width:24px" /> <h:outputText value="#{msg.items_per_page}" id="items-txt2"/>
<h:inputText id="content-pages" value="#{BrowseBean.pageSizeContentStr}" style="width:24px;margin-left:4px" maxlength="3" onkeyup="return applySizeContent(event);" />
<div style="display:none"><a:actionLink id="content-apply" value="" actionListener="#{BrowseBean.updateContentPageSize}" /></div>
</a:panel> </a:panel>
</f:facet> </f:facet>
</h:panelGroup>--%> </h:panelGroup>
<a:panel id="content-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" <a:panel id="content-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle"
label="#{msg.browse_content}" progressive="true"><%--facetsId="content-panel-facets"--%> label="#{msg.browse_content}" progressive="true" facetsId="content-panel-facets">
<%-- Content list --%> <%-- Content list --%>
<a:richList id="contentRichList" binding="#{BrowseBean.contentRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.browsePageSize}" <a:richList id="contentRichList" binding="#{BrowseBean.contentRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeContent}"
styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
value="#{BrowseBean.content}" var="r"> value="#{BrowseBean.content}" var="r">