portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r393249 - in /portals/jetspeed-2/trunk: components/portal/src/java/org/apache/jetspeed/container/state/impl/ components/portal/src/java/org/apache/jetspeed/decoration/ components/portal/src/java/org/apache/jetspeed/decoration/resources/ jet...
Date Tue, 11 Apr 2006 15:47:40 GMT
Author: ate
Date: Tue Apr 11 08:47:36 2006
New Revision: 393249

URL: http://svn.apache.org/viewcvs?rev=393249&view=rev
Log:
JS2-524: Providing a "print" custom PortletMode and a "solo" custom WindowState
See: http://issues.apache.org/jira/browse/JS2-524

Added:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.properties
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm
Modified:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions.properties
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_nl.properties
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java
    portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blue-gradient/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blueocean/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/decorator.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient-noborder/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/jetspeed/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/pretty-single-portlet/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/css/styles.css
    portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/decorator.properties

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
Tue Apr 11 08:47:36 2006
@@ -423,7 +423,7 @@
                     if ( windowState != null )
                     {
                         currentState.setWindowState(windowState);
-                        if (windowState.equals(WindowState.MAXIMIZED))
+                        if (windowState.equals(WindowState.MAXIMIZED) || windowState.equals(JetspeedActions.SOLO_STATE))
                         {
                             PortletWindow window = accessor.getPortletWindow(currentState.getWindowId());
                             if ( window == null )

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
Tue Apr 11 08:47:36 2006
@@ -15,8 +15,10 @@
  */
 package org.apache.jetspeed.container.state.impl;
 
+import javax.portlet.WindowState;
 import javax.servlet.http.HttpSession;
 
+import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.container.state.NavigationalState;
 import org.apache.jetspeed.request.RequestContext;
 
@@ -35,6 +37,24 @@
 
     public synchronized void sync(RequestContext context)
     {
+        PortletWindowRequestNavigationalStates requestStates = getPortletWindowRequestNavigationalStates();
+        
+        // First check if a maximized window is set in the request.
+        // This can mean a window with state MAXIMIZED *or* SOLO.
+        // With a SOLO, skip all synchroniziations!!!
+        String requestMaximizedWindowId = null;
+        
+        if ( requestStates.getMaximizedWindow() != null )
+        {
+            requestMaximizedWindowId = requestStates.getMaximizedWindow().getId().toString();
+            WindowState state = requestStates.getPortletWindowNavigationalState(requestMaximizedWindowId).getWindowState();
+            if (JetspeedActions.SOLO_STATE.equals(state))
+            {
+                // skip *any* synchronizations when in SOLO state
+                return;
+            }
+        }
+        
         HttpSession session = context.getRequest().getSession();
         if ( session != null )
         {
@@ -44,7 +64,7 @@
                 sessionStates = new PortletWindowSessionNavigationalStates(isRenderParameterStateFull());
                 session.setAttribute(NavigationalState.NAVSTATE_SESSION_KEY, sessionStates);
             }
-            sessionStates.sync(context.getPage(),getPortletWindowRequestNavigationalStates());
+            sessionStates.sync(context.getPage(), requestStates);
         }
     }
     

Added: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java?rev=393249&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
(added)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
Tue Apr 11 08:47:36 2006
@@ -0,0 +1,78 @@
+package org.apache.jetspeed.decoration;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+
+import org.apache.jetspeed.JetspeedActions;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.request.RequestContext;
+import org.apache.pluto.om.window.PortletWindow;
+
+public class PrintSoloDecoratorActionsFactory extends AbstractDecoratorActionsFactory
+{
+    private static final DecoratorActionTemplate PRINT_MODE_TEMPLATE = new DecoratorActionTemplate(JetspeedActions.PRINT_MODE);
+    private static final DecoratorActionTemplate SOLO_ACTION_TEMPLATE = new DecoratorActionTemplate(JetspeedActions.SOLO_STATE);
+    
+    private final List supportedActions;
+    private final List supportedSoloActions;
+    
+    public PrintSoloDecoratorActionsFactory()
+    {
+        ArrayList list = new ArrayList(JetspeedActions.getStandardPortletModes());
+        list.add(JetspeedActions.PRINT_MODE);
+        list.addAll(JetspeedActions.getStandardWindowStates());
+        list.add(JetspeedActions.SOLO_STATE);
+        supportedActions = Collections.unmodifiableList(list);
+        list = new ArrayList(JetspeedActions.getStandardPortletModes());
+        list.add(JetspeedActions.PRINT_MODE);
+        supportedSoloActions = Collections.unmodifiableList(list);
+    }
+
+    public List getSupportedActions(RequestContext rc, PortletApplication pa, PortletWindow
pw, PortletMode cm,
+                    WindowState ws, Decoration decoration)
+    {
+        // don't support any window state actions when in "solo" state
+        return JetspeedActions.SOLO_STATE.equals(ws) ? supportedSoloActions : supportedActions;
+    }
+    
+    public List getDecoratorActions(RequestContext rc, PortletApplication pa, PortletWindow
pw, PortletMode pm,
+                    WindowState ws, Decoration decoration, List actionTemplates)
+    {
+        int printModeIndex = actionTemplates.indexOf(PRINT_MODE_TEMPLATE);
+        int soloStateIndex = actionTemplates.indexOf(SOLO_ACTION_TEMPLATE);
+        
+        if ( printModeIndex != -1 && soloStateIndex != -1 )
+        {
+            // merge "solo" state with "print" mode
+            DecoratorActionTemplate soloStateTemplate = (DecoratorActionTemplate)actionTemplates.remove(soloStateIndex);
+            DecoratorActionTemplate printActionTemplate = (DecoratorActionTemplate)actionTemplates.get(printModeIndex);
+            printActionTemplate.setState(soloStateTemplate.getState());
+            printActionTemplate.setCustomState((soloStateTemplate.getCustomState()));
+        }
+        else if ( soloStateIndex != -1 )
+        {
+            // don't provide "solo" action separately without "print" mode
+            actionTemplates.remove(soloStateIndex);
+        }
+        // else if (printModeIndex != -1)
+        //   support switching to different modes once in "solo" state, even back to "print"
+        
+        return super.getDecoratorActions(rc,pa,pw,pm,ws,decoration,actionTemplates);
+    }
+    
+    protected DecoratorAction createAction(RequestContext rc, PortletWindow pw, Decoration
decoration,
+                    DecoratorActionTemplate template)
+    {
+        DecoratorAction action = super.createAction(rc,pw,decoration,template);
+        if ( template.getState() != null && JetspeedActions.SOLO_STATE.equals(template.getState()))
+        {
+            // "solo" opens in a new popup winodw
+            action.setTarget("_blank");
+        }
+        return action;
+    }
+}

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions.properties?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions.properties
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions.properties
Tue Apr 11 08:47:36 2006
@@ -19,3 +19,7 @@
 normal=Restore
 minimized=Minimize
 maximized=Maximize
+
+## extended actions
+print=Print
+solo=Solo

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_nl.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_nl.properties?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_nl.properties
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/resources/DecoratorActions_nl.properties
Tue Apr 11 08:47:36 2006
@@ -19,3 +19,7 @@
 normal=Herstellen
 minimized=Minimaliseren
 maximized=Maximaliseren
+
+## extended actions
+print=Printen
+solo=Popup

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java
Tue Apr 11 08:47:36 2006
@@ -35,6 +35,9 @@
  */
 public class JetspeedActions
 {
+  public static final PortletMode PRINT_MODE = new PortletMode("print");
+  public static final WindowState SOLO_STATE = new WindowState("solo");
+  
     public static final int MASK_MINIMIZE = 0x01;    
     public static final int MASK_MAXIMIZE = 0x02;
     public static final int MASK_NORMAL = 0x04;
@@ -45,9 +48,11 @@
     static public final String VIEW = PortletMode.VIEW.toString();
     static public final String EDIT = PortletMode.EDIT.toString();
     static public final String HELP = PortletMode.HELP.toString();
+    static public final String PRINT = PRINT_MODE.toString();
     static public final String NORMAL = WindowState.NORMAL.toString();
     static public final String MINIMIZE = WindowState.MINIMIZED.toString();
     static public final String MAXIMIZE = WindowState.MAXIMIZED.toString();
+    static public final String SOLO = SOLO_STATE.toString();
     
     private static final List standardPortletModes;
     private static final List standardWindowStates;

Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
(original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
Tue Apr 11 08:47:36 2006
@@ -33,6 +33,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.capabilities.CapabilityMap;
 import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
@@ -68,6 +69,8 @@
 
     public static final String DECORATOR_TYPE = "decorator";
     
+    public static final String PARAM_SOLO_PAGE = "SoloPage";
+    
     
     /** Commons logging */
     protected final static Log log = LogFactory.getLog(LayoutPortlet.class);
@@ -167,10 +170,16 @@
         RequestContext context = getRequestContext(request);
         PortletWindow window = context.getPortalURL().getNavigationalState().getMaximizedWindow();
         boolean maximized = (window != null);
+        boolean solo = false;
 
         if (maximized)
         {
             request.setAttribute("layout", getMaximizedLayout(request));
+            solo = JetspeedActions.SOLO_STATE.equals(context.getPortalURL().getNavigationalState().getMappedState(window));
+            if ( solo )
+            {
+                maximized = false;
+            }
         }
         else
         {
@@ -193,6 +202,18 @@
                         viewPage = this.getInitParameter(PARAM_MAX_PAGE);
                         if (viewPage == null)
                             viewPage = "maximized";
+                    }
+                }
+                else if (solo)
+                {
+                    viewPage = prefs.getValue(PARAM_SOLO_PAGE, null);
+                    if (viewPage == null)
+                    {
+                        viewPage = this.getInitParameter(PARAM_SOLO_PAGE);
+                        if (viewPage == null)
+                        {
+                            viewPage = "solo";
+                        }
                     }
                 }
                 else

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties Tue Apr 11 08:47:36
2006
@@ -47,7 +47,8 @@
 supported.portletmode = edit
 supported.portletmode = help
 # extended
-supported.portletmode = secure
+supported.portletmode = print
+supported.portletmode = secure  # currently only used for testing purposes
 
 # -------------------------------------------------------------------
 #  Window State Support
@@ -56,6 +57,7 @@
 supported.windowstate = normal
 supported.windowstate = maximized
 supported.windowstate = minimized
+supported.windowstate = solo
     
 # -------------------------------------------------------------------
 #  Security Information

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm Tue Apr 11 08:47:36 2006
@@ -112,7 +112,7 @@
   
  <div class="PActionBar">
     #foreach ($_action in $_actions)
-     <a href="${_action.Action}" title="${_action.Name}" class="action portlet-action"
><img src="${_action.link}" alt="${_action.Alt}" border="0" /></a>
+     <a href="${_action.Action}" title="${_action.Name}" class="action portlet-action"
#if($_action.target)target="$_action.target"#end><img src="${_action.link}" alt="${_action.Alt}"
border="0" /></a>
     #end    
  </div>
 #end

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.properties?rev=393249&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.properties
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.properties
Tue Apr 11 08:47:36 2006
@@ -0,0 +1,18 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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=solo
+template.type=velocity
+template.extension=.vm
+

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm?rev=393249&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/solo/layout.vm Tue Apr
11 08:47:36 2006
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*#
+#set($theme = $request.getAttribute("org.apache.jetspeed.theme"))
+#set($preferedLocale = $JS2RequestContext.locale)
+#set($myPage = $jetspeed.page)
+#set($rootFragment = $myPage.rootFragment)
+#set($rootDecorator = $rootFragment.decoration)
+#set($layoutDecoration = $theme.getDecoration($rootFragment))
+#set($f = $request.getAttribute("org.apache.jetspeed.maximized.Fragment"))
+#set($decorator = $myPage.getDefaultDecorator($f.getType()))
+
+<html>
+  <head>
+	<base href="#BaseHref()">
+    <meta http-equiv="Content-type" content="#ContentType()" />
+    <meta http-equiv="Content-style-type" content="text/css" />   
+    #includeJavaScriptForHead()
+
+    #IncludeStylesheets()
+	
+    #includeHeaderResource()
+
+    <title>$!jetspeed.getTitle($jetspeed.getCurrentPortletEntity(), $f)</title>
+
+    <meta name="version" content="#SiteVersionTag()">
+    <meta name="keywords" content="" />
+    <meta name="description" content="#PageDescription()" />
+  </head>
+  <body class="#PageBaseCSSClass()">
+
+    ## get the decorated Portlet content
+    <div id="$renderResponse.namespace" class="portal-layout-solo">
+      $jetspeed.setCurrentFragment($f)    
+		  #if($f.type == "portlet")
+			    #parse($f.decoration.template)
+		  #else		
+			    $f.renderedContent			
+		  #end
+    </div>
+
+  </body>
+</html>

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blue-gradient/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blue-gradient/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blue-gradient/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blue-gradient/css/styles.css Tue
Apr 11 08:47:36 2006
@@ -51,13 +51,17 @@
 
 }
  
-.blue-gradient .PContent
+.blue-gradient .PContentBorder
 {   
-    padding-left:2px;
-    padding-right:2px;
     border-left: 1px solid #517B94;
     border-right: 1px solid #517B94;
     border-bottom: 1px solid #517B94;
+}
+
+.blue-gradient .PContent
+{   
+    padding-left:2px;
+    padding-right:2px;
 }
 
 /* Custom stuff for UGS added by EDB */

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blueocean/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blueocean/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blueocean/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/blueocean/css/styles.css Tue Apr
11 08:47:36 2006
@@ -40,6 +40,11 @@
    display: inline;
 }
  
+.blueocean .PContentBorder
+{    
+    border: 1px solid #90d0ff;
+ }
+
 .blueocean .PContent
 {    
     clear:both;
@@ -47,7 +52,6 @@
     padding-left: 1em;
     white-space: normal;
     background-color: #ffffff;
-    border: 1px solid #90d0ff;
     font-size: 10pt;
 }
 

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/decorator.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/decorator.vm?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/decorator.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/decorator.vm Tue Apr 11 08:47:36
2006
@@ -27,18 +27,29 @@
 <!-- Begin: Fragment: ${f.id} Decoration: ${decoratorId} -->
 
 <div id="${f.id}" class="portlet ${decoration.baseCSSClass}">
-  <div class="PTitle" >
-    <div class="PTitleContent">	
-      $!jetspeed.getTitle($jetspeed.getCurrentPortletEntity(), $f)
-    </div>
+  #set($solo = $jetspeed.MappedWindowState.toString()=="solo")
+  #if (!$solo)
+    <div class="PTitle" >
+      <div class="PTitleContent">	
+        #set ($ws=$jetspeed.MappedWindowState)
+        
+        $!jetspeed.getTitle($jetspeed.getCurrentPortletEntity(), $f)
+      </div>
     
-    #PortletActionBar($decoration)
+      #PortletActionBar($decoration)
 	
-  </div>
-  #if (!$jetspeed.isHidden($f) || $jetspeed.WindowState != "minimized")
-  <div class="PContent"><span style="line-height:0.005px;">&nbsp;</span>
-    $f.renderedContent
-  </div>   
+    </div>
+  #end    
+  #if (!$jetspeed.isHidden($f) && $jetspeed.WindowState.toString() != "minimized")
+    #if (!$solo)
+      <div class="PContentBorder">
+    #end
+    <div class="PContent"><span style="line-height:0.005px;">&nbsp;</span>
+      $f.renderedContent
+    </div>
+    #if (!$solo)
+      </div>
+    #end
   #end
 </div>
 

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient-noborder/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient-noborder/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient-noborder/css/styles.css
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient-noborder/css/styles.css
Tue Apr 11 08:47:36 2006
@@ -55,6 +55,10 @@
 {
 }
 
+.gray-gradient-noborder .PContentBorder
+{
+}
+
 .gray-gradient-noborder .PContent
 {
     white-space: normal;

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/gray-gradient/css/styles.css Tue
Apr 11 08:47:36 2006
@@ -63,15 +63,18 @@
 {
 }
 
+.gray-gradient .PContentBorder
+{
+    border-left: 1px solid #999999;
+    border-right: 1px solid #999999;
+    border-bottom: 1px solid #999999;
+}
+
 .gray-gradient .PContent
 {
     padding-left:2px;
     padding-right:2px;
     white-space: normal;
-    border-left: 1px solid #999999;
-    border-right: 1px solid #999999;
-    border-bottom: 1px solid #999999;
-    
 }
 
 .gray-gradient .PContentRight

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/jetspeed/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/jetspeed/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/jetspeed/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/jetspeed/css/styles.css Tue Apr
11 08:47:36 2006
@@ -63,6 +63,10 @@
 
 }
 
+.portlet-Jetspeed .PContentBorder
+{
+}
+
 .portlet-Jetspeed .PContent
 {
 

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/pretty-single-portlet/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/pretty-single-portlet/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/pretty-single-portlet/css/styles.css
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/pretty-single-portlet/css/styles.css
Tue Apr 11 08:47:36 2006
@@ -28,6 +28,10 @@
 }
 
 
+.pretty-single-portlet .PContentBorder
+{
+}
+
 .pretty-single-portlet .PContent
 {
     font-size: small;

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/css/styles.css?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/css/styles.css Tue Apr
11 08:47:36 2006
@@ -60,13 +60,17 @@
 {
 }
 
+.tigris .PContentBorder
+{    
+    border-right: 1px solid #AAAAAA;
+    border-bottom: 1px solid #AAAAAA;
+}
+
 .tigris .PContent
 {    
     padding-left: 1em;
     white-space: normal;
     background-color: #EFEFEF;
-    border-right: 1px solid #AAAAAA;
-    border-bottom: 1px solid #AAAAAA;
     font-size: small;
 }
 

Modified: portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/decorator.properties?rev=393249&r1=393248&r2=393249&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/decorator.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/portlet/tigris/decorator.properties Tue
Apr 11 08:47:36 2006
@@ -17,3 +17,4 @@
 template.type=velocity
 template.extension=.vm
 decorates=portlet
+actions.factory=org.apache.jetspeed.decoration.PrintSoloDecoratorActionsFactory



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message