Author: taylor
Date: Wed Mar 16 21:38:05 2016
New Revision: 1735306
URL: http://svn.apache.org/viewvc?rev=1735306&view=rev
Log:
JS2-1348 - making search feature optional in site headers
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm
Wed Mar 16 21:38:05 2016
@@ -99,7 +99,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm
Wed Mar 16 21:38:05 2016
@@ -99,7 +99,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm
Wed Mar 16 21:38:05 2016
@@ -99,7 +99,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm
Wed Mar 16 21:38:05 2016
@@ -99,7 +99,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
Wed Mar 16 21:38:05 2016
@@ -97,7 +97,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
Wed Mar 16 21:38:05 2016
@@ -97,7 +97,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/header.vm
Wed Mar 16 21:38:05 2016
@@ -62,7 +62,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/oldstyle/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#PageActionBar()
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
Wed Mar 16 21:38:05 2016
@@ -97,7 +97,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm?rev=1735306&r1=1735305&r2=1735306&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Wed Mar 16 21:38:05 2016
@@ -97,7 +97,9 @@ else if (window.attachEvent) // Microsof
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
+#if ($pc.getString("search.box.enabled")=="true")
<span class="layout-searcharea">$jetspeed.renderPortletWindow("sp-definition",
"j2-admin::SearchPortlet")</span>
+#end
<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
