LPS-2932

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@30606 05bdf26c-840f-0410-9ced-eb539d925f36
GergoMathe · Apr 29, 2009 · 1f7675d · 1f7675d
1 parent 2027bce
commit 1f7675d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 1 deletion.
diff --git a/definitions/liferay-hook_5_1_0.dtd b/definitions/liferay-hook_5_1_0.dtd
@@ -45,6 +45,7 @@ my.places.show.organization.private.sites.with.no.layouts
 my.places.show.organization.public.sites.with.no.layouts
 my.places.show.user.private.sites.with.no.layouts
 my.places.show.user.public.sites.with.no.layouts
+search.container.summary.maximized.only
 terms.of.use.required
 theme.css.fast.load
 theme.images.fast.load

diff --git a/definitions/liferay-hook_5_2_0.dtd b/definitions/liferay-hook_5_2_0.dtd
@@ -33,6 +33,7 @@ my.places.show.organization.private.sites.with.no.layouts
 my.places.show.organization.public.sites.with.no.layouts
 my.places.show.user.private.sites.with.no.layouts
 my.places.show.user.public.sites.with.no.layouts
+search.container.summary.maximized.only
 terms.of.use.required
 theme.css.fast.load
 theme.images.fast.load

diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java
@@ -886,6 +886,7 @@ protected void resetPortalProperties(Properties portalProperties)
 		"my.places.show.organization.public.sites.with.no.layouts",
 		"my.places.show.user.private.sites.with.no.layouts",
 		"my.places.show.user.public.sites.with.no.layouts",
+		"search.container.summary.maximized.only",
 		"terms.of.use.required",
 		"theme.css.fast.load",
 		"theme.images.fast.load"

diff --git a/portal-impl/src/com/liferay/portal/util/PropsKeys.java b/portal-impl/src/com/liferay/portal/util/PropsKeys.java
@@ -1056,6 +1056,8 @@ public interface PropsKeys {
 
 	public static final String SEARCH_CONTAINER_PAGE_DELTA_VALUES = "search.container.page.delta.values";
 
+	public static final String SEARCH_CONTAINER_SUMMARY_MAXIMIZED_ONLY = "search.container.summary.maximized.only";
+
 	public static final String SERVICE_BUILDER_SERVICE_READ_ONLY_PREFIXES = "service.builder.service.read.only.prefixes";
 
 	public static final String SERVLET_SERVICE_EVENTS_POST = "servlet.service.events.post";

diff --git a/portal-impl/src/com/liferay/portal/util/PropsValues.java b/portal-impl/src/com/liferay/portal/util/PropsValues.java
@@ -1145,6 +1145,10 @@ public class PropsValues {
 		GetterUtil.getIntegerValues(
 			PropsUtil.getArray(PropsKeys.SEARCH_CONTAINER_PAGE_DELTA_VALUES));
 
+	public static boolean SEARCH_CONTAINER_SUMMARY_MAXIMIZED_ONLY =
+		GetterUtil.getBoolean(
+			PropsUtil.get(PropsKeys.SEARCH_CONTAINER_SUMMARY_MAXIMIZED_ONLY));
+
 	public static final String[] SERVICE_BUILDER_SERVICE_READ_ONLY_PREFIXES =
 		PropsUtil.getArray(
 			PropsKeys.SERVICE_BUILDER_SERVICE_READ_ONLY_PREFIXES);

diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
@@ -4000,6 +4000,14 @@
     #
     search.container.page.delta.values=5,10,20,30,50,75
 
+    #
+    # Set this to false to show the "Showing X Results" message in all window
+    # states. If set to true, the message will only be shown when in a maximized
+    # window state.
+    #
+
+    search.container.summary.maximized.only=false
+
 ##
 ## Sharepoint
 ##

diff --git a/portal-web/docroot/html/taglib/ui/page_iterator/start.jsp b/portal-web/docroot/html/taglib/ui/page_iterator/start.jsp
@@ -24,6 +24,8 @@
 
 <%@ include file="/html/taglib/init.jsp" %>
 
+<portlet:defineObjects />
+
 <%
 String formName = namespace + request.getAttribute("liferay-ui:page-iterator:formName");
 int cur = GetterUtil.getInteger((String)request.getAttribute("liferay-ui:page-iterator:cur"));
@@ -61,6 +63,13 @@ else {
 
 String deltaURL = HttpUtil.removeParameter(url, namespace + deltaParam);
 
+boolean showResultsSummary = true;
+
+if (PropsValues.SEARCH_CONTAINER_SUMMARY_MAXIMIZED_ONLY &&
+		(renderRequest.getWindowState() != WindowState.MAXIMIZED)) {
+	showResultsSummary = false;
+}
+
 NumberFormat numberFormat = NumberFormat.getNumberInstance(locale);
 %>
 
@@ -102,7 +111,7 @@ NumberFormat numberFormat = NumberFormat.getNumberInstance(locale);
 	<div class="taglib-page-iterator">
 </c:if>
 
-<c:if test='<%= type.equals("regular") %>'>
+<c:if test='<%= showResultsSummary && type.equals("regular") %>'>
 	<div class="search-results">
 		<c:choose>
 			<c:when test="<%= total > resultRowsSize %>">