Author: taylor
Date: Tue Oct 20 05:48:34 2015
New Revision: 1709512
URL: http://svn.apache.org/viewvc?rev=1709512&view=rev
Log:
JS2-1340: Improve Standard Portlet Decorator Styles. Add PClear portlet
decorator keeping content within constraints of layout grid
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/portal.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decoratordesktop.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/menu.gif
(with props)
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/removeportlet.gif
(with props)
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/jetspeed/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/greenearth/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/purpleplanet/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/turbo/css/styles.css
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=1709512&r1=1709511&r2=1709512&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
Tue Oct 20 05:48:34 2015
@@ -104,6 +104,11 @@ else if (window.attachEvent) // Microsof
#if (!$jetspeed.isAjaxCustomizationEnabled())
#PageActionBar()
#end
+#foreach($dt in ${columnLayout.getDetachedPortlets()})
+<div id='$dt.id' name='$dt.name' style='position: absolute; top:
${dt.getProperty("x")}px; right: ${dt.getProperty("y")}px;'>
+ $dt.renderedContent
+</div>
+#end
<!-- end of header -->
<div id="layout-${rootFragment.id}" class="layout-main #PageBaseCSSClass()" >
<div class="header">
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=1709512&r1=1709511&r2=1709512&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
Tue Oct 20 05:48:34 2015
@@ -102,6 +102,11 @@ else if (window.attachEvent) // Microsof
#if (!$jetspeed.isAjaxCustomizationEnabled())
#PageActionBar()
#end
+#foreach($dt in ${columnLayout.getDetachedPortlets()})
+<div id='$dt.id' name='$dt.name' style='position: absolute; top:
${dt.getProperty("x")}px; right: ${dt.getProperty("y")}px;'>
+ $dt.renderedContent
+</div>
+#end
<!-- end of header -->
<div id="layout-${rootFragment.id}" class="#PageBaseCSSClass()" >
<div class="header">
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/greenearth/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/greenearth/css/styles.css?rev=1709512&r1=1709511&r2=1709512&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/greenearth/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/greenearth/css/styles.css
Tue Oct 20 05:48:34 2015
@@ -44,7 +44,7 @@ limitations under the License.
.greenearth .PTitle
{
padding-bottom: 16px;
- color: #363738;
+ color: #79B400;
background:#f2f2f2;
border-right:1px solid #b4b4b4;
border-left:1px solid #b4b4b4;
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/portal.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/portal.css?rev=1709512&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/portal.css
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/portal.css
Tue Oct 20 05:48:34 2015
@@ -0,0 +1,17 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/styles.css?rev=1709512&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/styles.css
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/css/styles.css
Tue Oct 20 05:48:34 2015
@@ -0,0 +1,22 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+.clear .PActionBar
+{
+ float: right;
+ display: inline;
+ padding:4px;
+}
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.properties?rev=1709512&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.properties
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.properties
Tue Oct 20 05:48:34 2015
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+id=clear
+template.type=velocity
+template.extension=.vm
+decorates=any
+actions.factory=org.apache.jetspeed.decoration.ClearDecoratorActionsFactory
+# option.actions valid values are: show | hide | dropdown | hover
(default=show)
+option.actions=hide
+# option.title valid values are: show | hide (default=show)
+option.title=hide
+# option.draghandle valid values are: a CSS selector | none (default:
".PTitle" selector)
+
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.vm?rev=1709512&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.vm
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decorator.vm
Tue Oct 20 05:48:34 2015
@@ -0,0 +1,25 @@
+#*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+<div id="${f.id}" class="portlet ${decoration.baseCSSClass}">
+#if (!$jetspeed.isHidden($f) && !$hidePortlet &&
$jetspeed.WindowState.toString() != "minimized")
+ <div class="PContent"><span style="line-height:0.005px;"> </span>
+ $f.renderedContent
+ </div>
+#end
+</div>
+
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decoratordesktop.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decoratordesktop.properties?rev=1709512&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decoratordesktop.properties
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/decoratordesktop.properties
Tue Oct 20 05:48:34 2015
@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+#
+# override desktop portlet decorator properties:
+#
+# window.action.button.order
+# window.action.noimage
+# window.action.menu.order
+# window.action.button.maximum
+# window.action.button.tooltip
+# window.icon.enabled
+# window.icon.path
+# window.titlebar.enabled
+# window.resizebar.enabled
+#
+# these properties allow for overriding the defaults set in headtag.xml and
core.src.js
+#
+# the values for these properties are used "as is" in JSON statements
+# e.g. strings must be quoted, arrays must be enclosed by brackets, etc.
+#
+#
+window.action.noimage=["tile","untile","heightexpand","heightnormal","edit","view","print","help","minimized","normal","maximized","edit_defaults","config","about"]
+window.titlebar.enabled=false
+window.resizebar.enabled=false
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/menu.gif
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/menu.gif?rev=1709512&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/menu.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/removeportlet.gif
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/removeportlet.gif?rev=1709512&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/pclear/images/desktop/removeportlet.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/purpleplanet/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/purpleplanet/css/styles.css?rev=1709512&r1=1709511&r2=1709512&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/purpleplanet/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/purpleplanet/css/styles.css
Tue Oct 20 05:48:34 2015
@@ -44,7 +44,7 @@ limitations under the License.
.purpleplanet .PTitle
{
padding-bottom: 16px;
- color: #363738;
+ color: #32004b;
background:#f2f2f2;
border-right:1px solid #b4b4b4;
border-left:1px solid #b4b4b4;
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/turbo/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/turbo/css/styles.css?rev=1709512&r1=1709511&r2=1709512&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/turbo/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/turbo/css/styles.css
Tue Oct 20 05:48:34 2015
@@ -44,7 +44,7 @@ limitations under the License.
.turbo .PTitle
{
padding-bottom: 16px;
- color: #363738;
+ color: #193B53;
background:#f2f2f2;
border-right:1px solid #b4b4b4;
border-left:1px solid #b4b4b4;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
