Index: src/java/org/apache/jetspeed/portal/BasePortletSkin.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSkin.java,v retrieving revision 1.3 diff -u -r1.3 BasePortletSkin.java --- src/java/org/apache/jetspeed/portal/BasePortletSkin.java 16 Nov 2001 22:44:34 -0000 1.3 +++ src/java/org/apache/jetspeed/portal/BasePortletSkin.java 20 Mar 2003 14:14:43 -0000 @@ -66,7 +66,7 @@ { public String name = null; - + /** * Returns the name of this color scheme * @return the color scheme name @@ -75,7 +75,7 @@ { return this.name; } - + /** Sets the name of this Skin */ public void setName(String name) @@ -84,9 +84,30 @@ } /** + * Returns the CSS class to use for the main page + * @return the CSS class to use (bodyStyleClass) + */ + public String getBodyStyleClass() + { + return (String)get(BODY_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the main page + * @param bodyStyleClass the new class to be used + */ + public void setBodyStyleClass(String bodyStyleClass) + { + if (bodyStyleClass != null) + { + put(BODY_STYLE_CLASS,bodyStyleClass); + } + } + /** * Returns the color to use for displaying the portlet text * @return the text color value in HTML format (#RRGGBB) */ + public String getTextColor() { return (String)get(TEXT_COLOR); @@ -102,7 +123,7 @@ { put(TEXT_COLOR,color); } - } + } /** * Returns the color to use for displaying the portlet background @@ -123,8 +144,8 @@ { put(BACKGROUND_COLOR,color); } - } - + } + /** * Returns the color to use for displaying the portlet title text @@ -134,7 +155,7 @@ { return (String)get(TITLE_TEXT_COLOR); } - + /** * Sets the color to use for displaying the portlet title text @@ -146,7 +167,7 @@ { put(TITLE_TEXT_COLOR,color); } - } + } /** * Returns the color to use for displaying the portlet title background @@ -156,7 +177,7 @@ { return (String)get(TITLE_BACKGROUND_COLOR); } - + /** * Sets the color to use for displaying the portlet title background * @param titleColor the title color value in HTML format (#RRGGBB) @@ -167,7 +188,7 @@ { put(TITLE_BACKGROUND_COLOR,color); } - } + } /** * Returns the color to use for displaying an highlighted text @@ -188,7 +209,7 @@ { put(HIGHLIGHT_TEXT_COLOR,color); } - } + } /** * Returns the color to use for displaying an highlighted background @@ -209,7 +230,7 @@ { put(HIGHLIGHT_BACKGROUND_COLOR,color); } - } + } /** * Returns the CSS class to use for the portlet overall @@ -230,7 +251,7 @@ { put(PORTLET_STYLE_CLASS,portletStyleClass); } - } + } /** * Returns the CSS class to use for the portlet title @@ -251,7 +272,49 @@ { put(TITLE_STYLE_CLASS,titleStyleClass); } - } + } + + /** + * Returns the CSS class to use for the left portlet title + * @return the CSS class to use (titleLeftStyleClass) + */ + public String getTitleLeftStyleClass() + { + return (String)get(TITLE_LEFT_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the left portlet title + * @param titleLeftStyleClass the new class to be used + */ + public void setTitleLeftStyleClass(String titleLeftStyleClass) + { + if (titleLeftStyleClass!=null) + { + put(TITLE_LEFT_STYLE_CLASS,titleLeftStyleClass); + } + } + + /** + * Returns the CSS class to use for the right portlet title + * @return the CSS class to use (titleRightStyleClass) + */ + public String getTitleRightStyleClass() + { + return (String)get(TITLE_RIGHT_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the right portlet title + * @param titleRightStyleClass the new class to be used + */ + public void setTitleRightStyleClass(String titleRightStyleClass) + { + if (titleRightStyleClass!=null) + { + put(TITLE_RIGHT_STYLE_CLASS,titleRightStyleClass); + } + } /** * Returns the CSS class to use for the portlet content @@ -272,7 +335,112 @@ { put(CONTENT_STYLE_CLASS,contentStyleClass); } - } + } + + /** + * Returns the CSS class to use for the left portlet content + * @return the CSS class to use (contentLeftStyleClass) + */ + public String getContentLeftStyleClass() + { + return (String)get(CONTENT_LEFT_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the left portlet content + * @param contentLeftStyleClass the new class to be used + */ + public void setContentLeftStyleClass(String contentLeftStyleClass) + { + if (contentLeftStyleClass!=null) + { + put(CONTENT_LEFT_STYLE_CLASS,contentLeftStyleClass); + } + } + + /** + * Returns the CSS class to use for the right portlet content + * @return the CSS class to use (contentRightStyleClass) + */ + public String getContentRightStyleClass() + { + return (String)get(CONTENT_RIGHT_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the right portlet content + * @param contentRightStyleClass the new class to be used + */ + public void setContentRightStyleClass(String contentRightStyleClass) + { + if (contentRightStyleClass!=null) + { + put(CONTENT_RIGHT_STYLE_CLASS,contentRightStyleClass); + } + } + + /** + * Returns the CSS class to use for the portlet bottom + * @return the CSS class to use (bottomStyleClass) + */ + public String getBottomStyleClass() + { + return (String)get(BOTTOM_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the portlet bottom + * @param bottomStyleClass the new class to be used + */ + public void setBottomStyleClass(String bottomStyleClass) + { + if (bottomStyleClass!=null) + { + put(BOTTOM_STYLE_CLASS,bottomStyleClass); + } + } + + /** + * Returns the CSS class to use for the left bottom of portlet + * @return the CSS class to use (bottomLeftStyleClass) + */ + public String getBottomLeftStyleClass() + { + return (String)get(BOTTOM_LEFT_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the left bottom of portlet + * @param bottomLeftStyleClass the new class to be used + */ + public void setBottomLeftStyleClass(String bottomLeftStyleClass) + { + if (bottomLeftStyleClass!=null) + { + put(BOTTOM_LEFT_STYLE_CLASS,bottomLeftStyleClass); + } + } + + /** + * Returns the CSS class to use the right bottom of portlet + * @return the CSS class to use (bottomRightStyleClass) + */ + public String getBottomRightStyleClass() + { + return (String)get(BOTTOM_RIGHT_STYLE_CLASS); + } + + /** + * Sets the CSS class to use for the right portlet title + * @param bottomRightStyleClass the new class to be used + */ + public void setBottomRightStyleClass(String bottomRightStyleClass) + { + if (bottomRightStyleClass!=null) + { + put(BOTTOM_RIGHT_STYLE_CLASS,bottomRightStyleClass); + } + } /** * Returns the CSS class to use overall for the tabbed control @@ -293,7 +461,7 @@ { put(TAB_STYLE_CLASS,tabStyleClass); } - } + } /** * Returns the CSS class to use on the title of the tabbed control @@ -314,7 +482,7 @@ { put(TAB_TITLE_STYLE_CLASS,tabTitleStyleClass); } - } + } /** * Returns the CSS class to use on the control of the tabbed control @@ -335,7 +503,7 @@ { put(TAB_CONTENT_STYLE_CLASS,tabContentStyleClass); } - } + } /** * Returns the CSS class to use on the control of the Highlighted title tab or menu item @@ -356,7 +524,7 @@ { put(HIGHLIGHT_TITLE_STYLE_CLASS, highlightTitleStyleClass); } - } + } /** * Returns the CSS class to use for the controller overall Index: src/java/org/apache/jetspeed/portal/PortletSkin.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletSkin.java,v retrieving revision 1.3 diff -u -r1.3 PortletSkin.java --- src/java/org/apache/jetspeed/portal/PortletSkin.java 16 Nov 2001 22:44:34 -0000 1.3 +++ src/java/org/apache/jetspeed/portal/PortletSkin.java 20 Mar 2003 14:14:43 -0000 @@ -73,12 +73,20 @@ public static final String CONTROLLER_STYLE_CLASS = "controller-style-class"; public static final String PORTLET_STYLE_CLASS = "portlet-style-class"; public static final String TITLE_STYLE_CLASS = "title-style-class"; + public static final String TITLE_LEFT_STYLE_CLASS = "title-left-style-class"; + public static final String TITLE_RIGHT_STYLE_CLASS = "title-right-style-class"; public static final String CONTENT_STYLE_CLASS = "content-style-class"; + public static final String CONTENT_LEFT_STYLE_CLASS = "content-left-style-class"; + public static final String CONTENT_RIGHT_STYLE_CLASS = "content-right-style-class"; public static final String HIGHLIGHT_TITLE_STYLE_CLASS = "highlight-title-style-class"; public static final String TAB_STYLE_CLASS = "tab-style-class"; public static final String TAB_TITLE_STYLE_CLASS = "tab-title-style-class"; public static final String TAB_CONTENT_STYLE_CLASS = "tab-content-style-class"; public static final String STYLESHEET = "stylesheet"; + public static final String BOTTOM_STYLE_CLASS = "bottom-style-class"; + public static final String BOTTOM_LEFT_STYLE_CLASS = "bottom-left-style-class"; + public static final String BOTTOM_RIGHT_STYLE_CLASS = "bottom-right-style-class"; + public static final String BODY_STYLE_CLASS = "body-style-class"; /** * Returns the name of this color scheme @@ -87,6 +95,18 @@ public String getName(); /** + * Returns the CSS class to use for the main page + * @return the CSS class to use (bodyStyleClass) + */ + public String getBodyStyleClass(); + + /** + * Sets the CSS class to use for the main page + * @param bodyStyleClass the new class to be used + */ + public void setBodyStyleClass(String bodyStyleClass); + + /** * Returns the color to use for displaying the portlet text * @return the text color value in HTML format (#RRGGBB) */ @@ -183,6 +203,30 @@ public void setTitleStyleClass(String titleStyleClass); /** + * Returns the CSS class to use for the left portlet title + * @return the CSS class to use (titleLeftStyleClass) + */ + public String getTitleLeftStyleClass(); + + /** + * Sets the CSS class to use for the left portlet title + * @param titleLeftStyleClass the new class to be used + */ + public void setTitleLeftStyleClass(String titleLeftStyleClass); + + /** + * Returns the CSS class to use for the right portlet title + * @return the CSS class to use (titleRightStyleClass) + */ + public String getTitleRightStyleClass(); + + /** + * Sets the CSS class to use for the right portlet title + * @param titleRightStyleClass the new class to be used + */ + public void setTitleRightStyleClass(String titleRightStyleClass); + + /** * Returns the CSS class to use for the portlet content * @return the CSS class to use (ContentStyleClass) */ @@ -193,6 +237,66 @@ * @param contentStyleClass the new class to be used */ public void setContentStyleClass(String contentStyleClass); + + /** + * Returns the CSS class to use for the left portlet content + * @return the CSS class to use (contentLeftStyleClass) + */ + public String getContentLeftStyleClass(); + + /** + * Sets the CSS class to use for the left portlet content + * @param contentLeftStyleClass the new class to be used + */ + public void setContentLeftStyleClass(String contentLeftStyleClass); + + /** + * Returns the CSS class to use for the right portlet content + * @return the CSS class to use (contentRightStyleClass) + */ + public String getContentRightStyleClass(); + + /** + * Sets the CSS class to use for the right portlet content + * @param contentRightStyleClass the new class to be used + */ + public void setContentRightStyleClass(String contentRightStyleClass); + + /** + * Returns the CSS class to use for the portlet bottom + * @return the CSS class to use (bottomStyleClass) + */ + public String getBottomStyleClass(); + + /** + * Sets the CSS class to use for the portlet bottom + * @param bottomStyleClass the new class to be used + */ + public void setBottomStyleClass(String bottomStyleClass); + + /** + * Returns the CSS class to use for the left bottom of portlet + * @return the CSS class to use (bottomLeftStyleClass) + */ + public String getBottomLeftStyleClass(); + + /** + * Sets the CSS class to use for the left bottom of portlet + * @param bottomLeftStyleClass the new class to be used + */ + public void setBottomLeftStyleClass(String bottomLeftStyleClass); + + /** + * Returns the CSS class to use the right bottom of portlet + * @return the CSS class to use (bottomRightStyleClass) + */ + public String getBottomRightStyleClass(); + + /** + * Sets the CSS class to use for the right portlet title + * @param bottomRightStyleClass the new class to be used + */ + public void setBottomRightStyleClass(String bottomRightStyleClass); /** * Returns the CSS class to use overall for the tabbed control Index: webapp/WEB-INF/conf/skins.xreg =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/skins.xreg,v retrieving revision 1.8 diff -u -r1.8 skins.xreg --- webapp/WEB-INF/conf/skins.xreg 30 Dec 2001 09:32:33 -0000 1.8 +++ webapp/WEB-INF/conf/skins.xreg 20 Mar 2003 14:14:44 -0000 @@ -17,13 +17,17 @@