portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r917646 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/ applications/jetspeed/src/main/webapp/WEB-INF/pages/system/ applications/jetspeed/src/main/webapp/decorations/layout/inherit/ applicatio...
Date Mon, 01 Mar 2010 18:51:13 GMT
Author: woonsan
Date: Mon Mar  1 18:51:12 2010
New Revision: 917646

URL: http://svn.apache.org/viewvc?rev=917646&view=rev
Log:
JS2-1113: Adding "inherit" decorator, which uses the stylesheets of the decorator which is decided based on request parameter, "_inheritdeco".

Added:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties   (with props)
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/folder.metadata
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=917646&r1=917645&r2=917646&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp Mon Mar  1 18:51:12 2010
@@ -19,6 +19,7 @@
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+<%@ page import="java.util.Set" %>
 <%@ page import="org.apache.jetspeed.JetspeedActions" %>
 <%@ page import="org.apache.jetspeed.ui.Jetui" %>
 <%@ page import="org.apache.jetspeed.ui.Toolbar" %>
@@ -55,6 +56,7 @@
   }
   String baseUrl = jetui.getBaseURL(rc);
   String pageDec = jetui.getTheme(rc).getPageLayoutDecoration().getName();
+  boolean inheritDec = "inherit".equals(pageDec);
   
   String portalContextPath = request.getContextPath();
   String portalServletPath = request.getServletPath();
@@ -84,7 +86,16 @@
       rightDisplayState = "display: none";
       rightToggleClass = "jstbToggle1";
   	}
-  }  
+  }
+  
+  String inheritDecorationName = null;
+  if (inheritDec) {
+    inheritDecorationName = request.getParameter("_inheritdeco");
+    if (inheritDecorationName != null) {
+      pageDec = inheritDecorationName;
+    }
+  }
+  Set<String> styleSheets = jetui.getStyleSheets(rc, inheritDecorationName);
 %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
@@ -119,14 +130,13 @@
 </script>
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/jetui/css/portal.css"/>
 <%=jetui.includeHeaderResources(rc)%>
-<%
-for (String style : jetui.getStyleSheets(rc))
-{%>
+<% for (String style : styleSheets) { %>
 <link rel="stylesheet" type="text/css" media="screen, projection" href="<%=request.getContextPath()%>/<%=style%>"/>
-<%}%>
+<% } %>
 <body class="yui-skin-sam">
 <div id='jetspeedZone'>
 <div id="layout-<%=pageDec%>" class="layout-<%=pageDec%>" >
+<% if (!inheritDec) { %>
 <div class="header">
 <h1 class="logo">Jetspeed 2</h1>
 <div class="menu">
@@ -137,7 +147,7 @@
 <% } %>
 <!-- <span class="layout-search"><input type='text' size='14'/></span><span class="layout-search2"><img height='18' src="<%=request.getContextPath()%>/images/search.png"/></span>  -->
 </div> <!-- end header -->
-
+<% } %>
 <!-- main area -->
 <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
 <tr>         
@@ -181,7 +191,9 @@
 %>
 </td>
 <td id='jsMainarea' class='jsMainarea'>
+<% if (!inheritDec) { %>
 <div class="PContent"><span style="line-height:0.005px;">&nbsp;</span><%=breadcrumbs%></div>
+<% } %>
 <div id="jsFragments" class="portal-nested-layout portal-nested-layout-TwoColumns">
 <%
     if (maximized != null)
@@ -229,9 +241,10 @@
                    String content = jetui.getRenderedContent((ContentFragment)fragment, rc);
                    request.setAttribute("content", content);                    
                    String decorator = fragment.getDecorator(); 
-                   if (decorator == null)
-    	       		    decorator = pageDec;
-                   request.setAttribute("decorator", decorator);                    
+                   if (decorator == null) {
+    	       		   decorator = pageDec;
+                   }
+                   request.setAttribute("decorator", inheritDecorationName == null ? decorator : inheritDecorationName);
                    request.setAttribute("fragment", fragment);      
                    request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
 %>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/folder.metadata?rev=917646&r1=917645&r2=917646&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/folder.metadata (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/system/folder.metadata Mon Mar  1 18:51:12 2010
@@ -19,6 +19,11 @@
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd">
     
   <title>System Folder</title>  
-  <metadata name='space-owner' xml:lang='en'>admin</metadata>  
+  <metadata name='space-owner' xml:lang='en'>admin</metadata>
+  
+  <defaults
+     layout-decorator="inherit"
+     portlet-decorator="inherit"
+  />
   
 </folder>

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm Mon Mar  1 18:51:12 2010
@@ -0,0 +1,297 @@
+#*
+  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.
+*#
+#*
+ * Use this macro at the top of all of your layout decorations so as 
+ * to inherit required context objects.
+*#
+#macro (inheritLayoutObjects)
+  #set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+  #set($decorationFactory = $jetspeed.getComponent("DecorationFactory"))
+  #set($inheritDecorationName = $rc.request.getParameter("_inheritdeco"))
+  #if (!$inheritDecorationName)
+    #set($inheritDecorationName = "jetspeed")
+  #end
+  #set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+  #set($layoutDecoration = $decorationFactory.getLayoutDecoration($inheritDecorationName, $rc))
+  #set($portletDecoration = $decorationFactory.getPortletDecoration($inheritDecorationName, $rc))
+#end
+
+#**
+* Includes all of the stylesheets for this Page's theme.
+*#
+#macro (includeInheritStylesheets)
+  <link rel="stylesheet" type="text/css" media="screen, projection" href="$request.contextPath/$layoutDecoration.styleSheet" />
+  <link rel="stylesheet" type="text/css" media="screen, projection" href="$request.contextPath/$layoutDecoration.styleSheetPortal" />
+  <link rel="stylesheet" type="text/css" media="screen, projection" href="$request.contextPath/$portletDecoration.styleSheet" />
+  <link rel="stylesheet" type="text/css" media="screen, projection" href="$request.contextPath/$portletDecoration.styleSheetPortal" />
+#end
+
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+  #set($LEFT_TO_RIGHT = "LeftToRight")
+  #set($RIGHT_TO_LEFT = "RightToLeft")
+  #set($TOP_TO_BOTTOM = "TopToBottom")
+  #set($BOTTOM_TO_TOP = "BottomToTop")
+  #set($TITLE_FIRST = "TitleFirst")
+  #set($TITLE_LAST = "TitleLast")
+  #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
+#end
+
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_menu $_orientation)
+        <ul class="tabs">
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option")
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+        #if($_orientation == $LEFT_TO_RIGHT)
+          #if($element.isSelected($site))
+            <li>${tabName}</li>
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <li><a href="$tabUrl">${tabName}</a></li>
+          #end
+        #end
+      #end
+    #end
+	</ul>
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+  #set($__delimiter = $_delimiter)
+  #if(!$_delimiter || $_delimiter == "")
+    #if($_style != $BREADCRUMBS_STYLE)
+      #set($__delimiter = "&nbsp;")
+    #else
+      #set($__delimiter = "&nbsp;&gt;&gt;&nbsp;")
+    #end
+  #end
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  
+      <div class="FolderList">
+  #if($_title == $TITLE_FIRST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+        
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+        
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+        #if($_orientation == $LEFT_TO_RIGHT)
+            
+        <span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+            
+        <div>
+        #end
+        #if($element.type == "page")
+            
+          <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "link")
+            
+          <a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
+        #elseif($element.type == "folder")
+            
+          <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
+        #else
+            
+          <a href="$linkUrl" title="$!linkTitle">${linkName}</a>
+        #end
+        #if($_orientation == $LEFT_TO_RIGHT)
+        ${__delimiter}</span>
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+            
+        </div>
+        #end
+      #else
+        #if($_orientation == $LEFT_TO_RIGHT)
+            
+        <span title="$!linkTitle">${linkName}&nbsp;</span>      
+        #elseif($_orientation == $TOP_TO_BOTTOM)
+            
+        <div title="$!linkTitle">${linkName}</div>
+        #end
+      #end
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+      #if($_orientation == $LEFT_TO_RIGHT)
+        
+        <span title="$!separatorTitle">${separatorText}${__delimiter}</span>              
+      #elseif($_orientation == $TOP_TO_BOTTOM)
+        
+        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+      #end
+    #end
+  #end
+  #if($_title == $TITLE_LAST)
+    #if($_orientation == $LEFT_TO_RIGHT)
+        
+        <span title="$!menuTitle">${menuName}&nbsp;</span>
+    #elseif($_orientation == $TOP_TO_BOTTOM)
+        
+        <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+    #end
+  #end
+  
+      </div>
+#end
+
+#* include nested menu links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
+  #set($menuTitle = $_menu.getTitle($preferedLocale))
+  #set($menuName = $_menu.getShortTitle($preferedLocale))
+  #if($menuName)
+              <div class="pagetitle" title="$!menuTitle">${menuName}</div>
+  #end
+              <div>
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div> 
+      #elseif($element.type == "folder")
+                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+    #elseif($element.elementType == "menu")
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+    #elseif($element.elementType == "separator")
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+    #end
+  #end
+              </div>
+#end
+
+#* include top level menu links navigation component *#
+#macro (includeLinksWithIconNavigation $_menu $_orientation)
+  #set($rowStarted = false)
+  #set($elementsStarted = false)
+  #foreach($element in $_menu.elements.iterator())
+    #if($element.elementType == "option")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+      #elseif(!$elementsStarted)
+              <div class="body">
+                <div class="FolderList">
+      #end
+      #set($linkTitle = $element.getTitle($preferedLocale))
+      #set($linkName = $element.getShortTitle($preferedLocale))
+      #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+      #if($element.type == "page")
+                  <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+      #elseif($element.type == "link")
+        #set($linkTarget = $element.target)
+                  <div><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>  
+      #elseif($element.type == "folder")
+                  <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+      #end
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "menu")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+              <div class="body">
+                <div class="FolderList">
+      #elseif(!$elementsStarted)
+              <div class="body">
+                <div class="FolderList">
+      #end
+      #includeNestedLinksWithIconNavigation($element $_orientation)
+      #set($rowStarted = true)
+      #set($elementsStarted = true)
+    #elseif($element.elementType == "separator")
+      #if(!$rowStarted)
+        <tr>
+          <td>
+            <div class="toolgroup">
+      #elseif($elementsStarted)
+                </div>
+              </div>
+      #end
+      #set($separatorTitle = $element.getTitle($preferedLocale))
+      #set($separatorText = $element.getText($preferedLocale))
+              <div class="label">
+                ${separatorText}
+              </div>
+      #set($rowStarted = true)
+      #set($elementsStarted = false)
+    #end
+  #end
+  #if($elementsStarted)
+                </div>
+              </div>
+  #end
+  #if($rowStarted)
+            </div>
+          </td>
+        </tr>
+  #end
+#end
+
+#macro (MULTIMENU $_menu)
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+#set ($found = "false")
+    #foreach($element in $_menu.elements.iterator())
+      #if($element.elementType == "option" || $element.elementType == "menu")  
+        #set($tabTitle = $element.getTitle($preferedLocale))
+        #set($tabName = $element.getShortTitle($preferedLocale))
+          #if($element.isSelected($site))
+            <td class="LTabLeft" nowrap="nowrap">&nbsp;</td>
+            <td class="LTab" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle">${tabName}</td>
+            <td class="LTabRight"  nowrap="nowrap">&nbsp;</td>
+            #set ($sitem = $element)
+            #set ($found = "true")
+          #else
+            #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+            <td class="LTabLeftLow"  nowrap="nowrap">&nbsp;</td>
+            <td class="LTabLow" align="center" valign="middle" nowrap="nowrap" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
+            <td class="LTabRightLow"  nowrap="nowrap">&nbsp;</td>
+          #end
+        #else
+        #end      
+    #end
+          </tr>
+        </table>
+        #if ($found == "true")
+        #if($sitem.elementType == "menu")
+          #MULTIMENU($sitem)
+        #end
+        #end
+#end

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator-macros.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,33 @@
+
+# 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=inherit
+template.macros=-macros
+decorates=layout
+base.css.class=layout-inherit
+compatibility=2.2.0
+
+template.type=velocity
+template.extension=.vm
+
+##following are defaults
+#allow.change.page.theme=true
+#allow.change.layout=true
+#max.layout.nesting=2
+#allow.add.page=true
+#allow.add.portlet=true
+#allow.change.portlet.decorator=true
+#allow.customize.all=false

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decorator.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,64 @@
+# 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.
+
+desktop.template.extension=.vm
+resource.file=Messages
+
+template.print.id=desktop_print
+
+#
+# desktop loading image properties:
+#
+#    desktop.loading.img.dir
+#    desktop.loading.img.animated
+#    desktop.loading.img.stepprefix
+#    desktop.loading.img.stepextension
+#    desktop.loading.img.steps
+#
+# 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.
+#
+# 
+
+desktop.loading.img.dir="/images/desktop/loading"
+desktop.loading.img.animated="loaddots.gif"
+desktop.loading.img.stepprefix="loaddots_"
+desktop.loading.img.stepextension=".gif"
+desktop.loading.img.steps=["E","L2","L4","L6","L8","R7","R5","R3","R1"]
+
+#
+# desktop page editor options
+#   many of these options have a directly equivalent property for portal customizer
+#
+desktop.pageeditor.movemode.isdefault=true
+
+desktop.pageeditor.page.layout.decorator.editable=true
+desktop.pageeditor.page.portlet.decorator.editable=true
+desktop.pageeditor.page.add.enabled=true
+desktop.pageeditor.page.layout.depth.max=3
+
+desktop.pageeditor.portlet.add.enabled=true
+desktop.pageeditor.portlet.decorator.editable=true
+
+desktop.pageeditor.layout.name.editable=true
+desktop.pageeditor.layout.columnsize.editable=true
+
+desktop.pageeditor.layout.noactions.editable=false
+#  if layout.noactions.editable=true, the below layout.noactions.* properties are ignored
+#     and also, in page editor noaction layouts are fully editable
+#     (i.e. the noaction editing restrictions are enforced only in regular page view, not in page editor)
+desktop.pageeditor.layout.noactions.toplevel.moveable=false
+desktop.pageeditor.layout.noactions.columnsize.editable=true
+desktop.pageeditor.layout.noactions.editor.role=admin

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm Mon Mar  1 18:51:12 2010
@@ -0,0 +1,42 @@
+#*
+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.
+*#
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($portalContextPath = $rc.request.getContextPath())
+
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+          </td>
+        </tr>
+      </table> 
+#end
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script src="#BaseHref()jetui/engine/portal.js"></script>
+<div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable yui-dd-drop" style="display: none">
+  <div class="portlet ${layoutDecoration.name}">
+    <div class="PTitle">
+      <div class="PTitleContent">Loading...</div>
+      <div class="PActionBar">
+        <span style='cursor: pointer; z-index: 1000;' id='jetspeed-close-XXX' title="close" class="portlet-action-close"><img src="$portalContextPath/decorations/portlet/jetspeed/images/close.gif" alt="Close" border="0" /></span>
+      </div>
+    </div>
+    <div class="PContentBorder">
+      <div class="PContent"></div>
+    </div>
+  </div>
+</div>
+#end  
+</body>
+</html>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/footer.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm Mon Mar  1 18:51:12 2010
@@ -0,0 +1,91 @@
+#*
+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.
+*#
+
+#* Add the current layouts configuration values to the context *#
+#defineLayoutObjects()
+#inheritLayoutObjects()
+
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+#set($pc = $jetspeed.getPortalConfiguration())
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($portalContextPath = $rc.request.getContextPath())
+#set($portalServletPath = $rc.request.getServletPath())
+#set($portalPagePath = $rc.getPortalURL().getPath())
+#if ("$!portalPagePath" == "")
+  #set($portalPagePath = "/")
+#end
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head> 
+#if ($jetspeed.isAjaxCustomizationEnabled())
+<script type="text/javascript" src="#BaseHref()javascript/yui/build/yui/yui-min.js"></script>
+<script language="javascript">
+var JetuiConfiguration = {
+    engine: '$pc.getString("jetui.render.engine")',
+    ajaxTransport: '$pc.getString("jetui.ajax.transport")',
+    dragMode: '$pc.getString("jetui.drag.mode")',
+    portletStyle: '$pc.getString("jetui.style.portlet")',
+    layoutStyle: '$pc.getString("jetui.style.layout")',
+    dragHandleStyle: '$pc.getString("jetui.style.drag.handle")',
+    portalContextPath: "${portalContextPath}",
+    portalServletPath: "${portalServletPath}",
+    portalPagePath: "${portalPagePath}"     
+};
+var JETUI_YUI = {
+  base: "#BaseHref()javascript/yui/build/",
+  timeout: 10000, 
+  debug: true, 
+  useBrowserConsole: true,
+  config: JetuiConfiguration,    
+  modules: {
+    'jetui-portal': { fullpath: "#BaseHref()javascript/jetspeed/jetui/jetui-portal.js" }
+  }
+}; // ({classNamePrefix: 'jet'})
+</script>
+<link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
+#end
+
+#includeHeaderResource()
+
+<meta http-equiv="Content-type" content="#ContentType()" />
+<title>#PageTitle()</title>
+<link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
+#includeJavaScriptForHead()
+#includeInheritStylesheets()
+#IncludeStylesheets()
+
+</head>
+<body class="#PageBaseCSSClass()">
+<!--  BEGIN: layout/html/jetspeed/decorator.vm -->
+<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
+#if (!$jetspeed.isAjaxCustomizationEnabled())
+    <!-- Content Table -->
+    <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
+        <tr>            
+            <!-- Content Table Data -->
+            <td nowrap="nowrap" valign="top">
+#end          
+                
+                ## $jetspeed.include($jetspeed.currentFragment)
+                
+                <!--  END: layout/html/tigris/decorator.vm -->
+                                
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/header.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,90 @@
+# 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.
+
+desktop.action.labels.menu=Window Menu
+desktop.action.labels.tile=Tile Window
+desktop.action.labels.untile=Untile Window
+desktop.action.labels.heightexpand=Height - Fit Content
+desktop.action.labels.heightnormal=Height - Variable
+desktop.action.labels.restore=Restore Window
+desktop.action.labels.removeportlet=Delete Portlet
+desktop.action.labels.minimized=Minimize Window
+desktop.action.labels.maximized=Maximize Window
+desktop.action.labels.normal=Restore Window
+desktop.action.labels.edit=Edit
+desktop.action.labels.print=Print
+desktop.action.labels.about=About
+desktop.action.labels.config=Configure
+desktop.action.labels.edit_defaults=Edit Defaults
+
+desktop.action.labels.movetiled=Drag to move window - Ctrl-Drag to untile and move window
+desktop.action.labels.moveuntiled=Drag to move window - Ctrl-Drag to tile and move window
+
+# if empty string, portlet title bar will not change during ajax calls for portlet render
+desktop.action.labels.loadportletrender=Loading&#133;
+
+# if empty string, portlet title bar will not change during ajax calls for portlet action submits
+desktop.action.labels.loadportletaction=Updating&#133;
+
+# if empty string, portlet title bar will not change during ajax calls for get-portlet-action, change-portlet-action, move-portlet
+desktop.action.labels.loadportletupdate=
+
+desktop.action.labels.addportlet=Add Portlet
+desktop.action.labels.editpage=Edit Page
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during ajax calls
+desktop.action.labels.loadpage=
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during loading of customizer
+desktop.action.labels.loadpageeditor=Loading Page Editor&#133;
+
+# Page Editor / Customizer
+desktop.pageeditor.labels.title=Jetspeed Page Editor
+desktop.pageeditor.labels.changepagelayouttheme=Change Layout Theme
+desktop.pageeditor.labels.changepageportlettheme=Change Portlet Theme
+desktop.pageeditor.labels.changeportlettheme=Change Portlet Theme
+desktop.pageeditor.labels.changelayout=Change Layout
+desktop.pageeditor.labels.newpage=Create New Page&#133;
+desktop.pageeditor.labels.deletepage=Delete Page&#133;
+desktop.pageeditor.labels.addlayout=Add Layout
+desktop.pageeditor.labels.addportlet=Add Portlet&#133;
+desktop.pageeditor.labels.columnsizes=Column Sizes&#133;
+desktop.pageeditor.labels.deletelayout=Delete Layout&#133;
+
+desktop.pageeditor.labels.movemode=Mode Mode
+desktop.pageeditor.labels.movemode_exit=Full Mode
+
+desktop.pageeditor.dialog.labels.columnsizes=Change Column Sizes
+desktop.pageeditor.dialog.labels.columnsizes_column1=Column 1
+desktop.pageeditor.dialog.labels.columnsizes_column2=Column 2
+desktop.pageeditor.dialog.labels.columnsizes_column3=Column 3
+desktop.pageeditor.dialog.labels.columnsizes_column4=Column 4
+desktop.pageeditor.dialog.labels.columnsizes_column5=Column 5
+
+desktop.pageeditor.dialog.labels.newpage=Create New Page
+desktop.pageeditor.dialog.labels.newpage_name=Name
+desktop.pageeditor.dialog.labels.newpage_title=Title
+desktop.pageeditor.dialog.labels.newpage_titleshort=Short Title
+
+desktop.pageeditor.dialog.labels.deletepage=Are you sure you want to delete this page?
+desktop.pageeditor.dialog.labels.deletelayout=Are you sure you want to delete this layout?
+desktop.pageeditor.dialog.labels.removeportlet=Are you sure you want to delete this portlet?
+
+desktop.pageeditor.dialog.labels.ok=OK
+desktop.pageeditor.dialog.labels.cancel=Cancel
+desktop.pageeditor.dialog.labels.yes=Yes
+desktop.pageeditor.dialog.labels.no=No
+
+title=Inherit

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties Mon Mar  1 18:51:12 2010
@@ -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.
+
+desktop.action.menu=Window Menu
+desktop.action.tile=Tile Window
+desktop.action.untile=Untile Window
+desktop.action.heightexpand=Height - Fit Content
+desktop.action.heightnormal=Height - Variable
+desktop.action.restore=Restore
+desktop.action.removeportlet=Delete Portlet
+desktop.action.addportlet=Add Portlet
+desktop.action.editpage=Edit Page
+title=Inherit
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,40 @@
+# 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.
+
+desktop.action.menu=\uc708\ub3c4\uc6b0 \uba54\ub274
+desktop.action.tile=\ud0c0\uc77c \ubd99\uc774\uae30
+desktop.action.untile=\ud0c0\uc77c \ub5bc\uae30
+desktop.action.heightexpand=\ub192\uc774 \ud655\ub300
+desktop.action.heightnormal=\ub192\uc774 \ubcf5\uc6d0
+desktop.action.restore=\ubcf5\uc6d0
+desktop.action.removeportlet=\ud3ec\ud2c0\ub9bf \uc0ad\uc81c
+
+# if empty string, portlet title bar will not change during ajax calls for portlet render
+desktop.action.loadportletrender=\uc5ec\ub294 \uc911 ...
+
+# if empty string, portlet title bar will not change during ajax calls for portlet action submits
+desktop.action.loadportletaction=\ubcc0\uacbd \uc911 ...
+
+# if empty string, portlet title bar will not change during ajax calls for get-portlet-action, change-portlet-action, move-portlet
+desktop.action.loadportletupdate=
+
+desktop.action.addportlet=\ud3ec\ud2c0\ub9bf \ucd94\uac00
+desktop.action.editpage=\ud398\uc774\uc9c0 \ud3b8\uc9d1
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during ajax calls
+desktop.action.loadpage=
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during loading of customizer
+desktop.action.loadpageeditor=\ud398\uc774\uc9c0 \ud3b8\uc9d1\uae30 \uc5ec\ub294 \uc911 ...

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ko.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,24 @@
+# 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.
+
+desktop.action.menu=\u041c\u0435\u043d\u044e \u0432\u0456\u043a\u043d\u0430
+desktop.action.tile=\u0420\u043e\u0437\u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u043e\u0437\u0430\u0457\u043a\u043e\u044e
+desktop.action.untile=\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0449\u0435\u043d\u043d\u044f \u043c\u043e\u0437\u0430\u0457\u043a\u043e\u044e
+desktop.action.heightexpand=\u0412\u0438\u0441\u043e\u0442\u0430 - \u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438
+desktop.action.heightnormal=\u0412\u0438\u0441\u043e\u0442\u0430 - \u041d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u0430
+desktop.action.restore=\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438
+desktop.action.removeportlet=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0440\u0442\u043b\u0435\u0442
+desktop.action.addportlet=\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u043e\u0440\u0442\u043b\u0435\u0442
+desktop.action.editpage=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0443

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/inherit/resources/Messages_ua.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,31 @@
+# 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=inherit
+name=inherit
+
+#: BEGIN comment for JSP
+template.type=velocity
+template.extension=.vm
+#: END comment for JSP
+
+#: BEGIN uncomment for JSP
+#template.type=JSP
+#template.extension=.jsp
+#: END uncomment for JSP
+
+decorates=portlet
+#actions.factory=org.apache.jetspeed.decoration.PrintSoloDecoratorActionsFactory
+actions.factory=org.apache.jetspeed.decoration.CustomDecoratorActionsFactory

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm Mon Mar  1 18:51:12 2010
@@ -0,0 +1,76 @@
+#*
+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.
+*#
+
+#* ************************* READ ME *************************************
+This is the default template to be used for rendering decorations.  If you 
+find you cannot accomplish your design requirements by defining a custom
+style sheet for your decoration, you can define your own decorator.vm in 
+the root of your decortaion.  This will be used instead of the default.
+************************************************************************ *#
+
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($inheritDecorationName = $rc.request.getParameter("_inheritdeco"))
+#if (!$inheritDecorationName)
+  #set($inheritDecorationName = "jetspeed")
+#end
+#set($decorationFactory = $jetspeed.getComponent("DecorationFactory"))
+#set($portletDecoration = $decorationFactory.getPortletDecoration($inheritDecorationName, $rc))
+
+#set($decoration = $portletDecoration)
+#set($actions = $decoration.actions)
+
+<!-- Begin: Fragment: ${f.id} Decoration: ${decoration.Name} -->
+
+<div id="${f.id}" class="portlet ${decoration.baseCSSClass}">
+  #set($solo = $jetspeed.MappedWindowState.toString()=="solo")
+   #set($hidePortlet = $renderRequest.getAttribute("js_${jetspeed.CurrentFragment.Id}_HideDecorator")) 
+ #if (!$solo && !$hidePortlet)
+    <div class="PTitle" >
+      <div class="PTitleContent">	
+        #set ($ws=$jetspeed.MappedWindowState)
+        
+        $!jetspeed.getTitle($f)
+      </div>
+#if (!$f.isLocked())      
+     #set($_actions = $decoration.actions)  
+	 <div class="PActionBar">
+	    #foreach ($_action in $_actions)
+	     <a href="${_action.Action}" title="${_action.Name}" class="action portlet-action" #if($_action.target)target="$_action.target"#end><img src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0" /></a>
+	    #end
+#if ($jetspeed.isAjaxCustomizationEnabled())	    
+	    <span style='cursor: pointer; z-index: 1000;' id='jetspeed-close-${f.id}' title="close" class="portlet-action-close"><img src="${request.contextPath}/decorations/portlet/jetspeed/images/close.gif" alt="Close" border="0" /></span>
+#end	        
+	 </div>
+#end	 
+    </div>
+ #end    
+ #if (!$jetspeed.isHidden($f) && !$hidePortlet && $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>
+
+<!-- END: Fragment: ${f.id} Decoration: ${decoration.Name} -->
+
+

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decorator.vm
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties?rev=917646&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties Mon Mar  1 18:51:12 2010
@@ -0,0 +1,37 @@
+# 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.
+#
+# 
+
+

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/inherit/decoratordesktop.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=917646&r1=917645&r2=917646&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java Mon Mar  1 18:51:12 2010
@@ -18,6 +18,7 @@
 package org.apache.jetspeed.ui;
 
 import java.security.Principal;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -27,6 +28,9 @@
 import org.apache.jetspeed.administration.PortalConfiguration;
 import org.apache.jetspeed.aggregator.PortletRenderer;
 import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.decoration.DecorationFactory;
+import org.apache.jetspeed.decoration.LayoutDecoration;
+import org.apache.jetspeed.decoration.PortletDecoration;
 import org.apache.jetspeed.decoration.Theme;
 import org.apache.jetspeed.headerresource.HeaderResource;
 import org.apache.jetspeed.headerresource.HeaderResourceFactory;
@@ -54,15 +58,17 @@
     private HeaderResourceFactory headerFactory;
     private PageLayoutComponent pageLayoutComponent;
     private PortalConfiguration pc;
+    private DecorationFactory decorationFactory;
     private String layoutTemplate;
     
     public Jetui(PortletRenderer renderer, HeaderResourceFactory headerFactory, PageLayoutComponent pageLayoutComponent, 
-            PortalConfiguration pc, String layoutTemplate)
+            PortalConfiguration pc, DecorationFactory decorationFactory, String layoutTemplate)
     {
         this.renderer = renderer;
         this.headerFactory = headerFactory;
         this.pageLayoutComponent = pageLayoutComponent;
         this.pc = pc;
+        this.decorationFactory = decorationFactory;
         this.layoutTemplate = layoutTemplate;
     }
     
@@ -157,7 +163,37 @@
     
     public Set<String> getStyleSheets(RequestContext context)
     {
-        return getTheme(context).getStyleSheets();
+        return getStyleSheets(context, null);
+    }
+    
+    public Set<String> getStyleSheets(RequestContext context, String overrideDecoratorName)
+    {
+        if (overrideDecoratorName == null)
+        {
+            return getTheme(context).getStyleSheets();
+        }
+        else
+        {
+            Set<String> styleSheets = new HashSet<String>();
+            
+            LayoutDecoration layoutDecoration = decorationFactory.getLayoutDecoration(overrideDecoratorName, context);
+            
+            if (layoutDecoration != null)
+            {
+                styleSheets.add(layoutDecoration.getStyleSheet());
+                styleSheets.add(layoutDecoration.getStyleSheetPortal());
+            }
+            
+            PortletDecoration portletDecoration = decorationFactory.getPortletDecoration(overrideDecoratorName, context);
+            
+            if (portletDecoration != null)
+            {
+                styleSheets.add(portletDecoration.getStyleSheet());
+                styleSheets.add(portletDecoration.getStyleSheetPortal());
+            }
+            
+            return styleSheets;
+        }
     }
     
     public String includeHeaderResources(RequestContext context)
@@ -314,4 +350,6 @@
         return (portletIcon != null ? portletIcon : defaultPortletIcon);
     }
     
+    
+    
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=917646&r1=917645&r2=917646&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Mon Mar  1 18:51:12 2010
@@ -957,6 +957,7 @@
     <constructor-arg><ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory"/></constructor-arg>
     <constructor-arg><ref bean="org.apache.jetspeed.layout.PageLayoutComponent" /></constructor-arg>
     <constructor-arg><ref bean="PortalConfiguration" /></constructor-arg>
+    <constructor-arg><ref bean="DecorationFactory" /></constructor-arg>
     <constructor-arg><value>${jetui.render.template}</value></constructor-arg>        
   </bean>
   



---------------------------------------------------------------------
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