Index: java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java,v
retrieving revision 1.8
diff -u -r1.8 PageAggregatorImpl.java
--- java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java 20 Jul 2004 13:48:08 -0000 1.8
+++ java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java 20 Jul 2004 20:15:16 -0000
@@ -16,8 +16,10 @@
package org.apache.jetspeed.aggregator.impl;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.Stack;
import org.apache.commons.logging.Log;
@@ -124,6 +126,14 @@
{
contentPathes.set(0, currentFragment.getType() + "/html/" + layoutDecorator);
}
+
+
+ if(layoutDecorator != null)
+ {
+ addStyle(context, layoutDecorator, "layout");
+ addStyle(context, layoutDecorator, "portlet");
+ }
+
///////////////////////////////////////////////////////////////////////////////////////////////
if (checkAccess(context, (currentFragment.getAcl() != null) ? currentFragment.getAcl() : acl, "render"))
@@ -189,6 +199,17 @@
ContentDispatcher dispatcher = renderer.getDispatcher(context, false);
dispatcher.sync(currentFragment);
}
+
+ if(currentFragment.getDecorator() != null)
+ {
+ log.debug("decorator=" + currentFragment.getDecorator());
+ addStyle(context, currentFragment.getDecorator(), "portlet");
+ }
+ else
+ {
+ log.debug("no decorator for portlet:" + currentFragment.getId());
+ }
+
}
catch (Exception e)
{
@@ -233,5 +254,19 @@
// This methid needs to be moved a secuity module.
// Does nothing right now
return true;
+ }
+
+
+ private void addStyle(RequestContext context, String decoratorName, String decoratorType)
+ {
+ Set cssUrls = (Set) context.getSessionAttribute("cssUrls");
+
+ if (cssUrls == null)
+ {
+ cssUrls = new HashSet();
+ context.setSessionAttribute("cssUrls", cssUrls);
+ }
+
+ cssUrls.add("/WEB-INF/decorations/" + decoratorType + "/html/" + decoratorName + "/css/styles.css");
}
}
Index: java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java,v
retrieving revision 1.3
diff -u -r1.3 PortletAggregatorImpl.java
--- java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java 20 Jul 2004 13:48:08 -0000 1.3
+++ java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java 20 Jul 2004 20:15:16 -0000
@@ -15,6 +15,9 @@
*/
package org.apache.jetspeed.aggregator.impl;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
@@ -57,7 +60,33 @@
{
entity = (String)context.getAttribute(PortalReservedParameters.PORTLET_ENTITY);
}
- fragment.setId(entity);
+ fragment.setId(entity);
+
+
+ if(fragment.getDecorator() != null)
+ {
+ log.debug("decorator=" + fragment.getDecorator());
+ addStyle(context, fragment.getDecorator(), "portlet");
+ }
+ else
+ {
+ log.debug("no decorator for portlet:" + fragment.getId());
+ }
+
renderer.renderNow(fragment, context);
+ }
+
+ private void addStyle(RequestContext context, String decoratorName, String decoratorType)
+ {
+ log.debug("addStyle: decoratorName=" + decoratorName + ", decoratorType=" + decoratorType );
+ Set cssUrls = (Set) context.getSessionAttribute("cssUrls");
+
+ if (cssUrls == null)
+ {
+ cssUrls = new HashSet();
+ context.setSessionAttribute("cssUrls", cssUrls);
+ }
+
+ cssUrls.add("/WEB-INF/decorations/" + decoratorType + "/html/" + decoratorName + "/css/styles.css");
}
}
Index: webapp/WEB-INF/web.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.13
diff -u -r1.13 web.xml
--- webapp/WEB-INF/web.xml 20 Jul 2004 13:57:31 -0000 1.13
+++ webapp/WEB-INF/web.xml 20 Jul 2004 20:15:16 -0000
@@ -61,11 +61,6 @@
ContentServer
*.html
-
- ContentServer
- *.css
-
-
jetspeed
@@ -171,6 +166,10 @@
*.vm
+
+ velocity
+ *.css
+
JetspeedContainer
Index: webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm,v
retrieving revision 1.4
diff -u -r1.4 decorator-top.vm
--- webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm 18 Jun 2004 20:50:18 -0000 1.4
+++ webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm 20 Jul 2004 20:15:16 -0000
@@ -19,13 +19,22 @@
Welcome to Jetspeed 2
-
+
+
-
-
-
-
+#*
+
+#foreach($cssUrl in $cssUrls)
+ - $cssUrl
+#end
+
+*#
@@ -36,4 +45,10 @@
## $jetspeed.include($jetspeed.currentFragment)
-
\ No newline at end of file
+
+
+
+
+
+
+
Index: webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css,v
retrieving revision 1.8
diff -u -r1.8 styles.css
--- webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css 20 Jul 2004 15:58:22 -0000 1.8
+++ webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css 20 Jul 2004 20:15:16 -0000
@@ -15,714 +15,6 @@
*/
-.Jetspeed .PTitleLeft
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
-
- /** Always use relative path ! **/
- background: url(content/jetspeed/images/titleleft.gif);
-}
-
-.Jetspeed .PTitle
-{
- /**
- Specify the height of the image used
- else it will use the text height
- **/
- height:10px;
- color:#FFFFFF;
- font-weight:bold;
- background: url(content/jetspeed/images/title.gif);
-}
-
-.Jetspeed .PTitleRight
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
- background: url(content/jetspeed/images/titleright.gif);
-}
-
-.Jetspeed .PContentLeft
-{
- width:10px;
- background: url(content/jetspeed/images/contentleft.gif);
- height : 100%;
-
-}
-
-.Jetspeed .PContent
-{
- overflow : scroll;
-
-}
-
-.Jetspeed .PContentRight
-{
- width:10px;
- background: url(content/jetspeed/images/contentright.gif);
- height : 100%;
-
-}
-
-.Jetspeed .PBottomLeft
-{
- width:10px;
- background: url(content/jetspeed/images/bottomleft.gif);
-}
-
-.Jetspeed .PBottom
-{
- /**
- Specify the height of the image used
- else it won't appear
- **/
- height:13px;
- background: url(content/jetspeed/images/bottom.gif);
-}
-
-.Jetspeed .PBottomRight
-{
- width:10px;
- background: url(content/jetspeed/images/bottomright.gif);
-}
-
-
-/* --------------------------------- */
-
-
-/* --------------------------------- */
-/* PLT.C.1 Links (Anchor) */
-/* --------------------------------- */
-
-.Jetspeed A:link,
-.Jetspeed A:visited {
- text-decoration: none;
-}
-
-.Jetspeed A:hover,
-.Jetspeed A:active {
- text-decoration: underline;
-}
+BODY.layout-Jetspeed {
-
-
-/* --------------------------------- */
-/* PLT.C.2 Fonts */
-/* --------------------------------- */
-
-.Jetspeed .portlet-font {
- color: black;
-}
-.Jetspeed .portlet-font-dim {
- color: gray;
-}
-
-
-
-
-/* --------------------------------- */
-/* PLT.C.3 Messages */
-/* --------------------------------- */
-.Jetspeed .portlet-msg-status {
- font-style:italic;
- font-family: courier, serif;
-}
-.Jetspeed .portlet-msg-info {
-}
-.Jetspeed .portlet-msg-error {
- color:#FF0000;
-}
-.Jetspeed .portlet-msg-alert {
- color:#CCCC00;
- font-style:italic;
-}
-.Jetspeed .portlet-msg-success {
- color:#00CC33;
-}
-
-/* --------------------------------- */
-/* PLT.C.4 Sections */
-/* --------------------------------- */
-.Jetspeed .portlet-section-header {
- font-weight:bold;
- background-color:#C0C0C0;
-}
-.Jetspeed .portlet-section-body {
- background-color:#F0F8FF;
- text-align:left;
-}
-.Jetspeed .portlet-section-alternate {
- background-color: #33CCFF;
- text-align:left;
-}
-.Jetspeed .portlet-section-selected {
- background-color: #003366;
- color: #FFFFFF;
- font-weight:bold;
- text-align:left;
-}
-.Jetspeed .portlet-section-subheader {
- font-weight:bold;
- font-style:italic;
-}
-.Jetspeed .portlet-section-footer {
- background-color:#C0C0C0;
- font-family: courier, serif;
- text-align:center;
-}
-.Jetspeed .portlet-section-text {
- text-decoration:underline;
-}
-
-/* --------------------------------- */
-/* PLT.C.5 Forms */
-/* --------------------------------- */
-.Jetspeed .portlet-form-label {
- font-weight:bold;
-}
-.Jetspeed .portlet-form-input-field {
- font-family: arial, "lucida console", sans-serif;
- background-color:#F0F8FF;
-}
-.Jetspeed .portlet-form-button {
- font-family: arial, "lucida console", sans-serif;
-}
-.Jetspeed .portlet-icon-label {
- /* XXX */
-}
-.Jetspeed .portlet-dlg-icon-label {
- /* XXX */
}
-.Jetspeed .portlet-form-field-label {
- font-family: arial, "lucida console", sans-serif;
-}
-.Jetspeed .portlet-form-field {
- background-color:transparent;
-}
-
-
-/* --------------------------------- */
-/* PLT.C.6 Menus */
-/* --------------------------------- */
-.Jetspeed .portlet-menu {
- background-color:#FFFFFF;
-}
-.Jetspeed .portlet-menu-item {
- background-color:#FFFFFF;
-}
-.Jetspeed .portlet-menu-item-selected {
- background-color:#CCCC00;
-}
-
-.Jetspeed .portlet-menu-item-hover {
- background-color: #003366;
- color: #FFFFFF;
-}
-.Jetspeed .portlet-menu-item-hover-selected {
- background-color:#FFFF00;
-}
-.Jetspeed .portlet-menu-cascade-item {
- background-color: #33CCFF;
- color:black;
- text-decoration:none;
-}
-.Jetspeed .portlet-menu-cascade-item-selected {
- background-color:#CCCC00;
-}
-.Jetspeed .portlet-menu-description {
- background-color:#FFFFFF;
-}
-.Jetspeed .portlet-menu-caption {
- /* XXX */
-}
-
-/**
-
-The following css styles should be moved into their respective decorators.
-They are being included in this css for simplicity and proof of concept at this time.
-These should be removed when the PageAggregator modifications are completed.
-Also, in order to see these skins, the page decorator should always be set to "Jetspeed".
-
-**/
-
-/**
- Metal Skin that uses the cascading capability of CSS
-**/
-
-.Metal .PTitleLeft
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
-
- /** Always use relative path ! **/
- background: url(content/metal/images/titleleft.gif);
-
-}
-
-.Metal .PTitle
-{
- /**Specify the height of the image usedelse it will use the text height**/
- height:16px;
- color:#FFFFFF;
- background: url(content/metal/images/title.gif);
- font-family : monospace;
- font-weight:bold;
- font-size:12pt;
-}
-
-.Metal .PTitleRight
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
- background: url(content/metal/images/titleright.gif);
-}
-
-.Metal .PContentLeft
-{
- width:10px;
- background: url(content/metal/images/contentleft.gif);
- height : 100%;
-
-}
-
-.Metal .PContent
-{
- padding-left:5px;
- background-color:#717171;
-}
-
-.Metal .PContentRight
-{
- width:10px;
- background: url(content/metal/images/contentright.gif);
-}
-
-.Metal .PBottomLeft
-{
- width:10px;
- background: url(content/metal/images/bottomleft.gif);
-}
-
-.Metal .PBottom
-{
- /**
- Specify the height of the image used
- else it won't appear
- **/
- height:13px;
- background: url(content/metal/images/bottom.gif);
-}
-
-.Metal .PBottomRight
-{
- width:10px;
- background: url(content/metal/images/bottomright.gif);
-}
-
-
-/* --------------------------------- */
-
-
-/* --------------------------------- */
-/* PLT.C.1 Links (Anchor) */
-/* --------------------------------- */
-
-.Metal A:link,
-.Metal A:visited {
- color:#0000FF;
- text-decoration: none;
-}
-
-.Metal A:hover,
-.Metal A:active {
- color:#CC0033;
-}
-
-
-
-/* --------------------------------- */
-/* PLT.C.2 Fonts */
-/* --------------------------------- */
-
-.Metal .portlet-font {
- color: black;
-}
-.Metal .portlet-font-dim {
- color:#F0F8FF;
-}
-
-
-
-
-/* --------------------------------- */
-/* PLT.C.3 Messages */
-/* --------------------------------- */
-.Metal .portlet-msg-status {
- font-style:italic;
- font-family: courier, serif;
-}
-.Metal .portlet-msg-info {
- font-weight:bold;
-}
-.Metal .portlet-msg-error {
- color:#CC0033;
- font-weight:bold;
-}
-.Metal .portlet-msg-alert {
- color:#CCCC00;
- font-weight:bold;
- font-style:italic;
-}
-.Metal .portlet-msg-success {
- color:#00CC33;
- font-weight:bold;
-}
-
-/* --------------------------------- */
-/* PLT.C.4 Sections */
-/* --------------------------------- */
-.Metal .portlet-section-header {
- background-color: #C0C0C0;
- font-weight:bold;
-}
-.Metal .portlet-section-body {
- background-color: white;
- text-align:left;
-}
-.Metal .portlet-section-alternate {
- color: black;
- background-color:#666633;
- text-align:left;
-}
-.Metal .portlet-section-selected {
- background-color: #000000;
- color: #FF0000;
- font-weight:bold;
- text-align:left;
-}
-.Metal .portlet-section-subheader {
- background-color: #C0C0C0;
- font-weight:bold;
- font-style:italic;
-}
-.Metal .portlet-section-footer {
- background-color: #C0C0C0;
- text-align:center;
-}
-.Metal .portlet-section-text {
- text-decoration:underline;
-}
-
-/* --------------------------------- */
-/* PLT.C.5 Forms */
-/* --------------------------------- */
-.Metal .portlet-form-label {
- font-weight:bold;
-}
-.Metal .portlet-form-input-field {
- font-family: arial, "lucida console", sans-serif;
-}
-.Metal .portlet-form-button {
- font-family: arial, "lucida console", sans-serif;
-}
-.Metal .portlet-icon-label {
- /* XXX */
-}
-.Metal .portlet-dlg-icon-label {
- /* XXX */
-}
-.Metal .portlet-form-field-label {
- font-family: arial, "lucida console", sans-serif;
-}
-.Metal .portlet-form-field {
- background-color:transparent;
-}
-
-
-/* --------------------------------- */
-/* PLT.C.6 Menus */
-/* --------------------------------- */
-.Metal .portlet-menu {
- background-color: #C0C0C0;
-}
-.Metal .portlet-menu-item {
- background-color: #C0C0C0;
-}
-.Metal .portlet-menu-item-selected {
- background-color:#CCCC00;
-}
-
-.Metal .portlet-menu-item-hover {
- background-color: #000000;
- color: #FF0000;
-}
-.Metal .portlet-menu-item-hover-selected {
- background-color:#000000;
- color:#0000FF;
-}
-.Metal .portlet-menu-cascade-item {
- background-color:#666633;
- color:black;
- text-decoration:none;
-}
-.Metal .portlet-menu-cascade-item-selected {
- background-color:#CCCC00;
-}
-.Metal .portlet-menu-description {
- background-color: #C0C0C0;
-}
-.Metal .portlet-menu-caption {
- /* XXX */
-}
-
-
-
-.MintyBlue .PTitleLeft
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
-
- /** Always use relative path ! **/
- background: url(content/minty-blue/images/titleleft.gif);
-
-}
-
-.MintyBlue .PTitle
-{
- /**Specify the height of the image usedelse it will use the text height**/
- height:16px;
- color:#FFFFFF;
- background: url(content/minty-blue/images/title.gif);
- font-family : monospace;
- font-weight:bold;
- font-size:12pt;
-}
-
-.MintyBlue .PTitleRight
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
- background: url(content/minty-blue/images/titleright.gif);
-}
-
-.MintyBlue .PContentLeft
-{
- width:10px;
- background: url(content/minty-blue/images/contentleft.gif);
- height : 100%;
-
-}
-
-.MintyBlue .PContent
-{
- padding-left:5px;
-}
-
-.MintyBlue .PContentRight
-{
- width:10px;
- background: url(content/minty-blue/images/contentright.gif);
-}
-
-.MintyBlue .PBottomLeft
-{
- width:10px;
- background: url(content/minty-blue/images/bottomleft.gif);
-}
-
-.MintyBlue .PBottom
-{
- /**
- Specify the height of the image used
- else it won't appear
- **/
- height:13px;
- background: url(content/minty-blue/images/bottom.gif);
-}
-
-.MintyBlue .PBottomRight
-{
- width:10px;
- background: url(content/minty-blue/images/bottomright.gif);
-}
-
-
-
-/* --------------------------------- */
-
-
-
-/* --------------------------------- */
-/* PLT.C.1 Links (Anchor) */
-/* --------------------------------- */
-
-.MintyBlue A:link,
-.MintyBlue A:visited {
- text-decoration: none;
-}
-
-.MintyBlue A:hover,
-.MintyBlue A:active {
- text-decoration: underline;
-}
-
-
-
-/* --------------------------------- */
-/* PLT.C.2 Fonts */
-/* --------------------------------- */
-
-.MintyBlue .portlet-font {
- color: black;
-}
-.MintyBlue .portlet-font-dim {
- color: gray;
-}
-
-
-
-
-/* --------------------------------- */
-/* PLT.C.3 Messages */
-/* --------------------------------- */
-.MintyBlue .portlet-msg-status {
- font-style:italic;
- font-family: courier, serif;
-}
-.MintyBlue .portlet-msg-info {
-}
-.MintyBlue .portlet-msg-error {
- color:#FF0000;
-}
-.MintyBlue .portlet-msg-alert {
- color:#CCCC00;
- font-style:italic;
-}
-.MintyBlue .portlet-msg-success {
- color:#00CC33;
-}
-
-/* --------------------------------- */
-/* PLT.C.4 Sections */
-/* --------------------------------- */
-.MintyBlue .portlet-section-header {
- font-weight:bold;
- background-color:#0000CC;
- color:yellow;
- padding:2px;
-}
-.MintyBlue .portlet-section-body {
- background-color:#66FF66;
- text-align:left;
-}
-.MintyBlue .portlet-section-alternate {
- background-color:#C0C0C0;
- text-align:left;
-}
-.MintyBlue .portlet-section-selected {
- background-color:#0000CC;
- color:white;
- font-weight:bold;
- text-align:left;
-}
-.MintyBlue .portlet-section-subheader {
- background-color:#0066CC;
- color:white;
- font-weight:bold;
- font-style:italic;
- padding:1px;
-}
-.MintyBlue .portlet-section-footer {
- background-color:#0066CC;
- color:white;
- font-family: courier, serif;
- text-align:center;
-}
-.MintyBlue .portlet-section-text {
- text-decoration:underline;
-}
-
-/* --------------------------------- */
-/* PLT.C.5 Forms */
-/* --------------------------------- */
-.MintyBlue .portlet-form-label {
- font-weight:bold;
-}
-.MintyBlue .portlet-form-input-field {
- font-family: arial, "lucida console", sans-serif;
- background-color:#66CCFF;
-}
-.MintyBlue .portlet-form-button {
- font-family: arial, "lucida console", sans-serif;
-}
-.MintyBlue .portlet-icon-label {
- /* XXX */
-}
-.MintyBlue .portlet-dlg-icon-label {
- /* XXX */
-}
-.MintyBlue .portlet-form-field-label {
- font-family: arial, "lucida console", sans-serif;
-}
-.MintyBlue .portlet-form-field {
- background-color:transparent;
-}
-
-
-/* --------------------------------- */
-/* PLT.C.6 Menus */
-/* --------------------------------- */
-.MintyBlue .portlet-menu {
- background-color:#00CC66;
-}
-.MintyBlue .portlet-menu-item {
- background-color:#00CC66;
-}
-.MintyBlue .portlet-menu-item-selected {
- background-color:#0000CC;
- color:white;
-}
-
-.MintyBlue .portlet-menu-item-hover {
- background-color:#003366;
- color:#FFFFFF;
-}
-.MintyBlue .portlet-menu-item-hover-selected {
- background-color:#003366;
- color:#FFFFFF;
-}
-.MintyBlue .portlet-menu-cascade-item {
- background-color:#00CC66;
- color:black;
- text-decoration:none;
-}
-.MintyBlue .portlet-menu-cascade-item-selected {
- background-color:#0000CC;
- color:white;
-}
-.MintyBlue .portlet-menu-description {
- background-color:#F0F8FF;
-}
-.MintyBlue .portlet-menu-caption {
- /* XXX */
-}
-
Index: webapp/WEB-INF/decorations/layout/html/metal/decorator-top.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/metal/decorator-top.vm,v
retrieving revision 1.1
diff -u -r1.1 decorator-top.vm
--- webapp/WEB-INF/decorations/layout/html/metal/decorator-top.vm 20 Jul 2004 15:51:11 -0000 1.1
+++ webapp/WEB-INF/decorations/layout/html/metal/decorator-top.vm 20 Jul 2004 20:15:16 -0000
@@ -19,10 +19,15 @@
Welcome to Jetspeed 2
-
+
-
+
Index: webapp/WEB-INF/decorations/layout/html/metal/css/styles.css
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/metal/css/styles.css,v
retrieving revision 1.1
diff -u -r1.1 styles.css
--- webapp/WEB-INF/decorations/layout/html/metal/css/styles.css 20 Jul 2004 15:51:11 -0000 1.1
+++ webapp/WEB-INF/decorations/layout/html/metal/css/styles.css 20 Jul 2004 20:15:16 -0000
@@ -19,235 +19,6 @@
Metal Skin that uses the cascading capability of CSS
**/
-.Metal .PTitleLeft
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
-
- /** Always use relative path ! **/
- background: url(content/metal/images/titleleft.gif);
-
-}
-
-.Metal .PTitle
-{
- /**Specify the height of the image usedelse it will use the text height**/
- height:16px;
- color:#FFFFFF;
- background: url(content/metal/images/title.gif);
- font-family : monospace;
- font-weight:bold;
- font-size:12pt;
-}
-
-.Metal .PTitleRight
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
- background: url(content/metal/images/titleright.gif);
-}
-
-.Metal .PContentLeft
-{
- width:10px;
- background: url(content/metal/images/contentleft.gif);
- height : 100%;
-
-}
-
-.Metal .PContent
-{
- padding-left:5px;
- background-color:#717171;
-}
-
-.Metal .PContentRight
-{
- width:10px;
- background: url(content/metal/images/contentright.gif);
-}
-
-.Metal .PBottomLeft
-{
- width:10px;
- background: url(content/metal/images/bottomleft.gif);
-}
-
-.Metal .PBottom
-{
- /**
- Specify the height of the image used
- else it won't appear
- **/
- height:13px;
- background: url(content/metal/images/bottom.gif);
-}
-
-.Metal .PBottomRight
-{
- width:10px;
- background: url(content/metal/images/bottomright.gif);
-}
-
-
-/* --------------------------------- */
-
-
-/* --------------------------------- */
-/* PLT.C.1 Links (Anchor) */
-/* --------------------------------- */
-
-.Metal A:link,
-.Metal A:visited {
- color:#0000FF;
- text-decoration: none;
-}
-
-.Metal A:hover,
-.Metal A:active {
- color:#CC0033;
-}
-
-
-
-/* --------------------------------- */
-/* PLT.C.2 Fonts */
-/* --------------------------------- */
-
-.Metal .portlet-font {
- color: black;
-}
-.Metal .portlet-font-dim {
- color:#F0F8FF;
-}
-
-
-
+BODY.layout-Metal {
-/* --------------------------------- */
-/* PLT.C.3 Messages */
-/* --------------------------------- */
-.Metal .portlet-msg-status {
- font-style:italic;
- font-family: courier, serif;
}
-.Metal .portlet-msg-info {
- font-weight:bold;
-}
-.Metal .portlet-msg-error {
- color:#CC0033;
- font-weight:bold;
-}
-.Metal .portlet-msg-alert {
- color:#CCCC00;
- font-weight:bold;
- font-style:italic;
-}
-.Metal .portlet-msg-success {
- color:#00CC33;
- font-weight:bold;
-}
-
-/* --------------------------------- */
-/* PLT.C.4 Sections */
-/* --------------------------------- */
-.Metal .portlet-section-header {
- background-color: #C0C0C0;
- font-weight:bold;
-}
-.Metal .portlet-section-body {
- background-color: white;
- text-align:left;
-}
-.Metal .portlet-section-alternate {
- color: black;
- background-color:#666633;
- text-align:left;
-}
-.Metal .portlet-section-selected {
- background-color: #000000;
- color: #FF0000;
- font-weight:bold;
- text-align:left;
-}
-.Metal .portlet-section-subheader {
- background-color: #C0C0C0;
- font-weight:bold;
- font-style:italic;
-}
-.Metal .portlet-section-footer {
- background-color: #C0C0C0;
- text-align:center;
-}
-.Metal .portlet-section-text {
- text-decoration:underline;
-}
-
-/* --------------------------------- */
-/* PLT.C.5 Forms */
-/* --------------------------------- */
-.Metal .portlet-form-label {
- font-weight:bold;
-}
-.Metal .portlet-form-input-field {
- font-family: arial, "lucida console", sans-serif;
-}
-.Metal .portlet-form-button {
- font-family: arial, "lucida console", sans-serif;
-}
-.Metal .portlet-icon-label {
- /* XXX */
-}
-.Metal .portlet-dlg-icon-label {
- /* XXX */
-}
-.Metal .portlet-form-field-label {
- font-family: arial, "lucida console", sans-serif;
-}
-.Metal .portlet-form-field {
- background-color:transparent;
-}
-
-
-/* --------------------------------- */
-/* PLT.C.6 Menus */
-/* --------------------------------- */
-.Metal .portlet-menu {
- background-color: #C0C0C0;
-}
-.Metal .portlet-menu-item {
- background-color: #C0C0C0;
-}
-.Metal .portlet-menu-item-selected {
- background-color:#CCCC00;
-}
-
-.Metal .portlet-menu-item-hover {
- background-color: #000000;
- color: #FF0000;
-}
-.Metal .portlet-menu-item-hover-selected {
- background-color:#000000;
- color:#0000FF;
-}
-.Metal .portlet-menu-cascade-item {
- background-color:#666633;
- color:black;
- text-decoration:none;
-}
-.Metal .portlet-menu-cascade-item-selected {
- background-color:#CCCC00;
-}
-.Metal .portlet-menu-description {
- background-color: #C0C0C0;
-}
-.Metal .portlet-menu-caption {
- /* XXX */
-}
-
Index: webapp/WEB-INF/decorations/layout/html/minty-blue/decorator-top.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/minty-blue/decorator-top.vm,v
retrieving revision 1.1
diff -u -r1.1 decorator-top.vm
--- webapp/WEB-INF/decorations/layout/html/minty-blue/decorator-top.vm 20 Jul 2004 15:51:11 -0000 1.1
+++ webapp/WEB-INF/decorations/layout/html/minty-blue/decorator-top.vm 20 Jul 2004 20:15:16 -0000
@@ -19,10 +19,15 @@
Welcome to Jetspeed 2
-
+
-
+
Index: webapp/WEB-INF/decorations/layout/html/minty-blue/css/styles.css
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/minty-blue/css/styles.css,v
retrieving revision 1.1
diff -u -r1.1 styles.css
--- webapp/WEB-INF/decorations/layout/html/minty-blue/css/styles.css 20 Jul 2004 15:51:12 -0000 1.1
+++ webapp/WEB-INF/decorations/layout/html/minty-blue/css/styles.css 20 Jul 2004 20:15:16 -0000
@@ -15,239 +15,6 @@
*/
-.MintyBlue .PTitleLeft
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
-
- /** Always use relative path ! **/
- background: url(content/minty-blue/images/titleleft.gif);
-
-}
-
-.MintyBlue .PTitle
-{
- /**Specify the height of the image usedelse it will use the text height**/
- height:16px;
- color:#FFFFFF;
- background: url(content/minty-blue/images/title.gif);
- font-family : monospace;
- font-weight:bold;
- font-size:12pt;
-}
-
-.MintyBlue .PTitleRight
-{
- /**
- Needs to specify the width of image used
- otherwise it won't show !
- **/
- width:10px;
- background: url(content/minty-blue/images/titleright.gif);
-}
-
-.MintyBlue .PContentLeft
-{
- width:10px;
- background: url(content/minty-blue/images/contentleft.gif);
- height : 100%;
-
-}
-
-.MintyBlue .PContent
-{
- padding-left:5px;
-}
-
-.MintyBlue .PContentRight
-{
- width:10px;
- background: url(content/minty-blue/images/contentright.gif);
-}
-
-.MintyBlue .PBottomLeft
-{
- width:10px;
- background: url(content/minty-blue/images/bottomleft.gif);
-}
-
-.MintyBlue .PBottom
-{
- /**
- Specify the height of the image used
- else it won't appear
- **/
- height:13px;
- background: url(content/minty-blue/images/bottom.gif);
-}
-
-.MintyBlue .PBottomRight
-{
- width:10px;
- background: url(content/minty-blue/images/bottomright.gif);
-}
-
-
-
-/* --------------------------------- */
-
-
-
-/* --------------------------------- */
-/* PLT.C.1 Links (Anchor) */
-/* --------------------------------- */
-
-.MintyBlue A:link,
-.MintyBlue A:visited {
- text-decoration: none;
-}
-
-.MintyBlue A:hover,
-.MintyBlue A:active {
- text-decoration: underline;
-}
-
-
-
-/* --------------------------------- */
-/* PLT.C.2 Fonts */
-/* --------------------------------- */
-
-.MintyBlue .portlet-font {
- color: black;
-}
-.MintyBlue .portlet-font-dim {
- color: gray;
-}
-
-
-
-
-/* --------------------------------- */
-/* PLT.C.3 Messages */
-/* --------------------------------- */
-.MintyBlue .portlet-msg-status {
- font-style:italic;
- font-family: courier, serif;
-}
-.MintyBlue .portlet-msg-info {
-}
-.MintyBlue .portlet-msg-error {
- color:#FF0000;
-}
-.MintyBlue .portlet-msg-alert {
- color:#CCCC00;
- font-style:italic;
-}
-.MintyBlue .portlet-msg-success {
- color:#00CC33;
-}
-
-/* --------------------------------- */
-/* PLT.C.4 Sections */
-/* --------------------------------- */
-.MintyBlue .portlet-section-header {
- font-weight:bold;
- background-color:#0000CC;
- color:yellow;
- padding:2px;
-}
-.MintyBlue .portlet-section-body {
- background-color:#66FF66;
- text-align:left;
-}
-.MintyBlue .portlet-section-alternate {
- background-color:#C0C0C0;
- text-align:left;
-}
-.MintyBlue .portlet-section-selected {
- background-color:#0000CC;
- color:white;
- font-weight:bold;
- text-align:left;
-}
-.MintyBlue .portlet-section-subheader {
- background-color:#0066CC;
- color:white;
- font-weight:bold;
- font-style:italic;
- padding:1px;
-}
-.MintyBlue .portlet-section-footer {
- background-color:#0066CC;
- color:white;
- font-family: courier, serif;
- text-align:center;
-}
-.MintyBlue .portlet-section-text {
- text-decoration:underline;
-}
-
-/* --------------------------------- */
-/* PLT.C.5 Forms */
-/* --------------------------------- */
-.MintyBlue .portlet-form-label {
- font-weight:bold;
-}
-.MintyBlue .portlet-form-input-field {
- font-family: arial, "lucida console", sans-serif;
- background-color:#66CCFF;
-}
-.MintyBlue .portlet-form-button {
- font-family: arial, "lucida console", sans-serif;
-}
-.MintyBlue .portlet-icon-label {
- /* XXX */
-}
-.MintyBlue .portlet-dlg-icon-label {
- /* XXX */
-}
-.MintyBlue .portlet-form-field-label {
- font-family: arial, "lucida console", sans-serif;
-}
-.MintyBlue .portlet-form-field {
- background-color:transparent;
-}
-
-
-/* --------------------------------- */
-/* PLT.C.6 Menus */
-/* --------------------------------- */
-.MintyBlue .portlet-menu {
- background-color:#00CC66;
-}
-.MintyBlue .portlet-menu-item {
- background-color:#00CC66;
-}
-.MintyBlue .portlet-menu-item-selected {
- background-color:#0000CC;
- color:white;
-}
-
-.MintyBlue .portlet-menu-item-hover {
- background-color:#003366;
- color:#FFFFFF;
-}
-.MintyBlue .portlet-menu-item-hover-selected {
- background-color:#003366;
- color:#FFFFFF;
-}
-.MintyBlue .portlet-menu-cascade-item {
- background-color:#00CC66;
- color:black;
- text-decoration:none;
-}
-.MintyBlue .portlet-menu-cascade-item-selected {
- background-color:#0000CC;
- color:white;
-}
-.MintyBlue .portlet-menu-description {
- background-color:#F0F8FF;
-}
-.MintyBlue .portlet-menu-caption {
- /* XXX */
-}
+BODY.layout-MintyBlue {
+}
\ No newline at end of file
Index: webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm,v
retrieving revision 1.9
diff -u -r1.9 decorator.vm
--- webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm 20 Jul 2004 15:54:25 -0000 1.9
+++ webapp/WEB-INF/decorations/portlet/html/jetspeed/decorator.vm 20 Jul 2004 20:15:16 -0000
@@ -24,7 +24,7 @@
-
+
##
## Portlet Title Bar
Index: webapp/WEB-INF/decorations/portlet/html/metal/decorator.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/metal/decorator.vm,v
retrieving revision 1.7
diff -u -r1.7 decorator.vm
--- webapp/WEB-INF/decorations/portlet/html/metal/decorator.vm 20 Jul 2004 15:54:25 -0000 1.7
+++ webapp/WEB-INF/decorations/portlet/html/metal/decorator.vm 20 Jul 2004 20:15:16 -0000
@@ -24,7 +24,7 @@
-