[jboss-svn-commits] JBoss Portal SVN: r5168 - in trunk/core/src: bin/portal-core-war/layouts/generic bin/portal-core-war/themes/industrial bin/portal-core-war/themes/maple bin/portal-core-war/themes/mission-critical bin/portal-core-war/themes/phalanx bin/portal-core-war/themes/renaissance bin/portal-core-war/themes/renaissance/images resources/portal-cms-sar/META-INF resources/portal-core-sar/conf/data resources/portal-core-war/WEB-INF resources/portal-server-war
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 8 18:03:28 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-09-08 18:03:24 -0400 (Fri, 08 Sep 2006)
New Revision: 5168
Removed:
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_admin_center.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_admin_left.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_admin_right.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_center.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_left.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_right.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_selected_center.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_selected_left.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_selected_right.gif
trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_swizzle.gif
Modified:
trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp
trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css
trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css
trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
trunk/core/src/resources/portal-server-war/login.jsp
Log:
JBPORTAL-1025 - theme set to default. necessary selectors added to other themes. login page colors changed.
JBPORTAL-1026 - Navigation tabs aligned and working with OS/browser combinations.
Modified: trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/bin/portal-core-war/layouts/generic/index.jsp 2006-09-08 22:03:24 UTC (rev 5168)
@@ -1,4 +1,4 @@
-<%@ page import="org.jboss.portal.server.PortalConstants"%>
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -8,8 +8,8 @@
<meta http-equiv="Content-Type" content="text/html;"/>
<!-- to correct the unsightly Flash of Unstyled Content. -->
<script type="text/javascript"></script>
- <!-- inject the theme; default to the Nphalanx theme if nothing is selected for the portal or the page -->
- <p:theme themeName='Nphalanx'/>
+ <!-- inject the theme; default to the renaissance theme if nothing is selected for the portal or the page -->
+ <p:theme themeName='renaissance'/>
<!-- insert header content that was possibly set by portlets on the page -->
<p:headerContent/>
</head>
@@ -22,6 +22,10 @@
<table border="0" cellpadding="0" cellspacing="0" id="header-container">
<tr>
<td align="center" valign="top" id="header">
+
+ <!-- TODO: Needs to be defined as a region for access control -->
+ <div id="utilitynavigation"><a href="#" class="addcontent">Add Content</a></div>
+
<p:region regionName='navigation' regionID='navigation'/>
<div id="spacer"></div>
</td>
Modified: trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2006-09-08 22:03:24 UTC (rev 5168)
@@ -317,6 +317,31 @@
/* fixes IE6 win hack */
+ /***************************
+ * Utility Navigation *
+ *****************************/
+
+ #utilitynavigation {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #000000;
+ z-index: 20;
+ }
+
+ #utilitynavigation a {
+ color: #FFFFFF;
+ }
+
+ #utilitynavigation .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+ }
+
/****************************
* Portlet Container Windows *
*****************************/
Modified: trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/bin/portal-core-war/themes/maple/portal_style.css 2006-09-08 22:03:24 UTC (rev 5168)
@@ -311,6 +311,31 @@
/* fixes IE6 win hack */
+ /***************************
+ * Utility Navigation *
+ *****************************/
+
+#utilitynavigation {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #000000;
+ z-index: 20;
+}
+
+#utilitynavigation a {
+ color: #FFFFFF;
+}
+
+#utilitynavigation .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
+
/****************************
* Portlet Container Windows *
*****************************/
Modified: trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2006-09-08 22:03:24 UTC (rev 5168)
@@ -313,6 +313,31 @@
/* fixes IE6 win hack */
+ /***************************
+ * Utility Navigation *
+ *****************************/
+
+ #utilitynavigation {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #000000;
+ z-index: 20;
+ }
+
+ #utilitynavigation a {
+ color: #FFFFFF;
+ }
+
+ #utilitynavigation .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+ }
+
/****************************
* Portlet Container Windows *
*****************************/
Modified: trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2006-09-08 22:03:24 UTC (rev 5168)
@@ -304,7 +304,7 @@
background-color: #fff;
background-image: url( images/tab_right.gif );
background-repeat: no-repeat;
- background-position: right top;
+ background-position: right bottom;
/* margin-bottom: -3px;
padding-top: 3px;
border-bottom: 1px solid #fff;*/
@@ -345,6 +345,31 @@
/* fixes IE6 win hack */
+ /***************************
+ * Utility Navigation *
+ *****************************/
+
+#utilitynavigation {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #000000;
+ z-index: 20;
+}
+
+#utilitynavigation a {
+ color: yellow;
+}
+
+#utilitynavigation .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
+
/****************************
* Portlet Container Windows *
*****************************/
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_admin_center.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_admin_left.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_admin_right.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_center.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_left.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_right.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_selected_center.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_selected_left.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_selected_right.gif
===================================================================
(Binary files differ)
Deleted: trunk/core/src/bin/portal-core-war/themes/renaissance/images/navigationtab_swizzle.gif
===================================================================
(Binary files differ)
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-09-08 22:03:24 UTC (rev 5168)
@@ -31,14 +31,14 @@
width: 100%;
min-width: 770px;
z-index: 5;
-margin: 0px -3px 0px 3px;
+ margin: 0px -3px 0px 3px;
}
/* Header background */
#header {
height: 65px;
- width:100%;
+ width: 100%;
padding: 0px;
margin: 0px;
z-index: 1;
@@ -47,7 +47,7 @@
#logoName {
background-image: url( images/logo.gif );
background-repeat: no-repeat;
- float:left;
+ float: left;
width: 250px;
height: 25px;
z-index: 2;
@@ -63,21 +63,21 @@
/* wrapper for entire portal. starts/ends after/before body tag */
#portal-container {
- /* part of below IE hack to preserve min-width for portlet regions */
- /*width: 100%;*/
- margin: 4px 2% 0px 2%;
+/* part of below IE hack to preserve min-width for portlet regions */
+/*width: 100%;*/
+ margin: 4px 2% 0px 2%;
-padding: 0 350px 0 350px;
- }
+ padding: 0 350px 0 350px;
+}
/* min width for IE */
#expander {
- position: relative;
- padding: 0 0 0 0;
+ position: relative;
+ padding: 0 0 0 0;
margin: 0 -350px 0 -350px;
min-width: 770px;
-padding: 0 0 0 0;
+ padding: 0 0 0 0;
}
/* min width hack for IE */
@@ -97,17 +97,16 @@
/* table that contains all regions. does not include header */
#content-container {
- height: 100%;
- text-align: left;
-width:100%;
- min-width: 770px;
- position: absolute;
- top: 70px;
- left: 0px;
- /* z-index: 1; */
- /*part of below IE hack
- padding: 0 350px 0 350px; */
- padding: 0px 100px 0px 0px;
+ height: 100%;
+ text-align: left;
+ width: 100%;
+ min-width: 770px;
+ position: absolute;
+ top: 70px;
+ left: 0px; /* z-index: 1; */
+ /*part of below IE hack
+padding: 0 350px 0 350px; */
+ padding: 0px 100px 0px 0px;
}
/* Login JSP Selectors */
@@ -191,14 +190,14 @@
#footer-container {
padding: 10px;
text-align: center;
- clear:both;
+ clear: both;
}
#navigation-container {
margin: 0px;
- position:absolute;
- width:100%;
- z-index:-1;
+ position: absolute;
+ width: 100%;
+ z-index: -1;
}
/* used to clear float in regionA,B,C divs so that
@@ -214,38 +213,187 @@
visibility: hidden;
}
- /****************************
- * Tab Navigation for Header *
+/***************************
+* Primary Navigation (Tabbed Nav) *
+*****************************/
+
+UL#tabsHeader {
+ margin: 0;
+ padding-left:0px;
+ min-width: 550px;
+}
+
+UL#tabsHeader li {
+display: inline;
+ list-style: none;
+ float: left;
+ margin-left: 0px;
+ margin-top: 39px;
+ margin-right: 0px;
+ position: relative;
+ top: 0px;
+ background-image: url(images/tab_right.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
+ white-space: nowrap;
+}
+
+UL#tabsHeader li:hover {
+ background-image: url(images/tab_right_hover2.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
+ white-space: nowrap;
+}
+
+/* hover selectors for main header tabs */
+UL#tabsHeader li.hoverOn {
+ background-image: url(images/tab_right_hover2.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
+ white-space: nowrap;
+}
+
+UL#tabsHeader li.hoverOff {
+ background-image: url(images/tab_right.gif);
+ background-repeat: no-repeat;
+ background-position: top right ;
+ white-space: nowrap;
+}
+
+UL#tabsHeader a {
+ display: inline;
+ float: left;
+ text-decoration: none;
+ font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-weight:bold;
+ color: #8a8a8a;
+ line-height: 22px;
+ padding: 5px 15px 3px 15px;
+ /*background-image: url(../images/tab_left.gif);*/
+ background-repeat: no-repeat;
+ background-position: top left;
+ width: 90px;
+ white-space: nowrap;
+}
+
+UL#tabsHeader a:hover {
+ text-decoration: underline;
+ color: #000000;
+ /*background-image: url(../images/tab_left_hover2.gif);*/
+ background-repeat: no-repeat;
+ background-position: top left;
+ white-space: nowrap;
+}
+
+UL#tabsHeader #current {
+ line-height: 22px;
+ background-color: #fff;
+ background-image: url(images/tab_right_current.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
+ padding-top: -3px;
+ border-bottom: 2px solid #fff;
+}
+
+UL#tabsHeader #current a, #current a:hover {
+ font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-weight: bold;
+ color: #000;
+/* background-image: url(../images/tab_left_current.gif); */
+ background-repeat: no-repeat;
+ background-position: top left;
+}
+
+/* -------- These are new selectors for the admin and add page styles ------- */
+
+
+UL#tabsHeader #admin {
+ display: inline;
+ background-image: url(images/tab_right_admin.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
+padding-top: -3px;
+line-height: 22px;
+}
+
+UL#tabsHeader #admin a {
+ text-decoration: none;
+ color: #4386b5;
+/* background-image: url(../images/tab_left_admin.gif);*/
+ background-repeat: no-repeat;
+ background-position: top left;
+ white-space: nowrap;
+padding-top: -3px;
+line-height: 22px;
+}
+UL#tabsHeader #admin a:hover {
+ text-decoration: underline;
+}
+
+
+UL#tabsHeader #addpage {
+ display: inline;
+ background-color: none;
+ background-image: none;
+ margin-bottom: -3px;
+ padding-top: 1px;
+}
+
+UL#tabsHeader #addpage a, #addpage a:hover {
+ font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-weight: bold;
+ color: white;
+ line-height: 22px;
+ background-image: none;
+ white-space:nowrap;
+}
+
+UL#tabsHeader #addpage a:hover {
+ text-decoration: underline;
+}
+
+/* Tab background color for selected global nav item */
+li.currentTabBackground {
+ background: #fff;
+}
+
+/* backslash hack for IE5-Mac \*/
+UL#tabsHeader a {
+ float: none;
+}
+
+/* End Mac Hack */
+html>body UL#tabsHeader a {
+ width: auto;
+}
+
+/* fixes IE6 win hack */
+
+
+ /***************************
+ * Utility Navigation *
*****************************/
-/* TODO: Change this to standard CSS */
-#NavigationTab { text-align: center; margin-top: 44px; }
-#NavigationTab ul { font-family: Verdana; font-size: 11px; font-weight: bold; text-decoration: none; margin: 0; padding: 0; list-style:none;}
-#NavigationTab li { display:inline; background: url(images/navigationtab_center.gif) repeat-x center top; text-align: center; padding: 0; float: left; }
-#NavigationTab a { color: #8a8a8a; background: url(images/navigationtab_left.gif) no-repeat left top; float: left; margin: 0; padding-left:7px; text-decoration: none;}
-#NavigationTab a span { background: url(images/navigationtab_right.gif) no-repeat right top; display: block; padding: 3px 13px 4px 5px;}
-#NavigationTab a span {float: none; }
-#NavigationTab a:hover{text-decoration: underline; color:#a0a0a0; }
-#NavigationTab li.selected { display: inline; background: url(images/navigationtab_selected_center.gif) repeat-x center top; text-align: center; padding: 0; float: left; border-bottom: 1px solid white;}
-#NavigationTab .selected a { color: #454545; background: url(images/navigationtab_selected_left.gif) no-repeat left top; float: left; margin: 0; padding-left:7px; text-decoration: none;}
-#NavigationTab .selected a span { background: url(images/navigationtab_selected_right.gif) no-repeat right top; display: block; padding: 3px 13px 4px 5px;}
-#NavigationTab li.admin { display: inline; background: url(images/navigationtab_admin_center.gif) repeat-x center top; text-align: center; padding: 0; float: left;}
-#NavigationTab .admin a { color: #4386b5; background: url(images/navigationtab_admin_left.gif) no-repeat left top; float: left; margin: 0; padding-left:7px; text-decoration: none;}
-#NavigationTab .admin a span { background: url(images/navigationtab_admin_right.gif) no-repeat right top; display: block; padding: 3px 13px 4px 5px;}
-#NavigationTab .admin a:hover{text-decoration: underline; color:#85badf; }
-#NavigationTab li.addpage { display: inline; background-image: none; text-align: center; padding: 0; float: left;}
-#NavigationTab .addpage a { color: #FFFFFF; background: none ; float: left; margin: 0; padding-left:7px; text-decoration: none;}
-#NavigationTab .addpage a span { background: none; display: block; padding: 3px 13px 4px 5px;}
-#NavigationTab .addpage a:hover{text-decoration: underline; color:#FFFFFF; }
-#NavigationTab .selected img {padding-left: 10px;}
+#utilitynavigation {
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #000000;
+ z-index: 20;
+}
-/***************************
-* Utility Navigation *
-*****************************/
+#utilitynavigation a {
+ color: #FFFFFF;
+}
-#utilitynavigation { float:right; font-size:10px; padding: 6px 12px 0px 0px; color:#000000; z-index:20; }
-#utilitynavigation a { color:#FFFFFF; }
-#utilitynavigation .addcontent { background-image:url(images/ico_addcontent.gif); background-repeat: no-repeat; background-position:left; height:20px; width: 20px; padding-left:16px; }
+#utilitynavigation .addcontent {
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
+}
/****************************
* Portlet Container Windows *
@@ -272,13 +420,13 @@
line-height: 100%;
float: left;
text-indent: 5px;
- padding-top:5px;
- padding-bottom:6px;
+ padding-top: 5px;
+ padding-bottom: 6px;
}
-/* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
-.portlet-titlebar-decoration {}
-*/
+ /* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
+ .portlet-titlebar-decoration {}
+ */
.portlet-titlebar-left {
background-image: url( images/portlet-top-left.gif );
@@ -287,14 +435,14 @@
height: 29px;
min-width: 9px;
background-position: bottom;
-/*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- border-left: 1px solid #98b7c6;
- width:20px;
- white-space: nowrap;
-*/
+ /*
+ background-color:#dfe8ed;
+ border-top: 1px solid #98b7c6;
+ border-bottom: 1px solid #98b7c6;
+ border-left: 1px solid #98b7c6;
+ width:20px;
+ white-space: nowrap;
+ */
}
.portlet-titlebar-center {
@@ -302,28 +450,28 @@
background-repeat: repeat-x;
height: 29px;
background-position: bottom;
-/* background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- white-space: nowrap;
-*/
+ /* background-color:#dfe8ed;
+ border-top: 1px solid #98b7c6;
+ border-bottom: 1px solid #98b7c6;
+ white-space: nowrap;
+ */
}
.portlet-titlebar-right {
- background-image: url(images/portlet-top-right.gif );
+ background-image: url( images/portlet-top-right.gif );
background-repeat: no-repeat;
width: 10px;
height: 30px;
min-width: 10px;
background-position: bottom left;
-/*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-right: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- width:10px;
- white-space: nowrap;
-*/
+ /*
+ background-color:#dfe8ed;
+ border-top: 1px solid #98b7c6;
+ border-right: 1px solid #98b7c6;
+ border-bottom: 1px solid #98b7c6;
+ width:10px;
+ white-space: nowrap;
+ */
}
.portlet-content-left {
@@ -331,11 +479,11 @@
background-repeat: repeat-y;
width: 9px;
min-width: 9px;
-/*
- width:20px;
- background-color:#FFFFFF;
- border-left: 1px solid #dfe8ed;
-*/
+ /*
+ width:20px;
+ background-color:#FFFFFF;
+ border-left: 1px solid #dfe8ed;
+ */
}
.portlet-content-center {
@@ -353,11 +501,11 @@
background-position: left;
width: 5px;
min-width: 5px;
-/*
- width:5px;
- background-color:#FFFFFF;
- border-right: 1px solid #dfe8ed;
-*/
+ /*
+ width:5px;
+ background-color:#FFFFFF;
+ border-right: 1px solid #dfe8ed;
+ */
}
.portlet-footer-left {
@@ -368,22 +516,22 @@
background-position: top right;
min-width: 9px;
-/*
- background-color:#FFFFFF;
- border-bottom: 1px solid #98b7c6;
- border-left: 1px solid #dfe8ed;
- height:5px;
- */
+ /*
+ background-color:#FFFFFF;
+ border-bottom: 1px solid #98b7c6;
+ border-left: 1px solid #dfe8ed;
+ height:5px;
+ */
}
.portlet-footer-center {
background-image: url( images/portlet-bottom-middle.gif );
height: 4px;
background-repeat: repeat-x;
-/* background-color:#FFFFFF;
- border-bottom: 1px solid #98b7c6;
- height:5px;
-*/
+ /* background-color:#FFFFFF;
+ border-bottom: 1px solid #98b7c6;
+ height:5px;
+ */
}
.portlet-footer-right {
@@ -392,63 +540,64 @@
height: 4px;
background-repeat: no-repeat;
min-width: 5px;
-/*
- background-color:#FFFFFF;
- border-bottom: 1px solid #98b7c6;
- border-right: 1px solid #dfe8ed;
- height:5px;
-*/
+ /*
+ background-color:#FFFFFF;
+ border-bottom: 1px solid #98b7c6;
+ border-right: 1px solid #dfe8ed;
+ height:5px;
+ */
}
+
/***********************
* Portlet Window Modes *
************************/
.portlet-mode-maximized {
-background-image:url(images/ico_16_maximize.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_16_maximize.gif );
+ background-repeat: no-repeat;
width: 16px;
height: 16px;
float: left;
display: inline;
cursor: pointer;
- padding-left:3px;
+ padding-left: 3px;
}
.portlet-mode-minimized {
- background-image:url(images/ico_16_minimize.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_16_minimize.gif );
+ background-repeat: no-repeat;
width: 16px;
height: 16px;
float: left;
display: inline;
cursor: pointer;
- padding-left:3px;
+ padding-left: 3px;
}
.portlet-mode-normal {
- background-image:url(images/ico_16_normal.gif);
+ background-image: url( images/ico_16_normal.gif );
width: 16px;
height: 16px;
background-repeat: no-repeat;
float: left;
display: inline;
cursor: pointer;
- padding-left:3px;
+ padding-left: 3px;
}
.portlet-mode-help {
- background-image: url(images/ico_16_help.gif );
+ background-image: url( images/ico_16_help.gif );
width: 16px;
height: 16px;
background-repeat: no-repeat;
float: left;
display: inline;
cursor: pointer;
- padding-left:3px;
+ padding-left: 3px;
}
.portlet-mode-edit {
- background-image:url(images/ico_edit.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_edit.gif );
+ background-repeat: no-repeat;
width: 28px;
height: 16px;
float: left;
@@ -458,19 +607,19 @@
}
.portlet-mode-remove {
- background-image:url(images/ico_16_remove.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_16_remove.gif );
+ background-repeat: no-repeat;
width: 16px;
height: 16px;
float: left;
display: inline;
cursor: pointer;
- padding-left:3px;
+ padding-left: 3px;
}
.portlet-mode-view {
- background-image:url(images/ico_cancel.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_cancel.gif );
+ background-repeat: no-repeat;
width: 28px;
height: 16px;
float: left;
@@ -480,20 +629,20 @@
padding-right: 20px;
}
-
.portlet-mode-reload {
- background-image:url(images/ico_16_reload.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_16_reload.gif );
+ background-repeat: no-repeat;
width: 16px;
height: 16px;
float: left;
display: inline;
cursor: pointer;
- padding-left:3px;
+ padding-left: 3px;
}
+
.portlet-mode-hide {
- background-image:url(images/ico_16_swizzleclosed.gif);
- background-repeat:no-repeat;
+ background-image: url( images/ico_16_swizzleclosed.gif );
+ background-repeat: no-repeat;
width: 16px;
height: 16px;
float: right;
@@ -520,8 +669,8 @@
text-decoration: underline;
}
-#ThemeBy:before {
- content: "Portal Theme: JBoss Default by JBoss.org Design";
+#ThemeBy {
+ content: "Theme by JBoss.org Design";
}
/*************
@@ -538,33 +687,36 @@
}
hr {
- border-top: 1px dashed #d5d5d5 ;
- border-bottom: 0px;
- border-left: 0px;
- border-right: 0px;
+ border-top: 1px dashed #d5d5d5;
+ border-bottom: 0px;
+ border-left: 0px;
+ border-right: 0px;
}
ul {
- padding-left:20px;
+ padding-left: 20px;
}
li {
-list-style: url(images/ico_listelement.gif);
+ list-style: url( images/ico_listelement.gif );
}
-
input {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
}
-SELECT { }
+SELECT {
+}
-FONT { }
+FONT {
+}
-FIELDSET { }
+FIELDSET {
+}
-LEGEND { }
+LEGEND {
+}
/********
* FONTS *
@@ -607,12 +759,12 @@
/* Form Button Style */
.portlet-form-button {
-font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 10px;
- font-weight:bold;
- color:#FFFFFF;
+ font-weight: bold;
+ color: #FFFFFF;
background-color: #5078aa;
- border:1px solid #175877;
+ border: 1px solid #175877;
}
/* Text that appears beside a context dependent action icon */
Modified: trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2006-09-08 22:03:24 UTC (rev 5168)
@@ -129,7 +129,7 @@
<!-- XMLPersistenceManager: uses FileSystem for storage -->
<!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
- <!--SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
<param name="path" value="${wsp.home}/index"/>
<param name="useCompoundFile" value="true"/>
<param name="minMergeDocs" value="100"/>
@@ -140,7 +140,7 @@
<param name="cacheSize" value="1000"/>
<param name="forceConsistencyCheck" value="false"/>
<param name="autoRepair" value="true"/>
- </SearchIndex-->
+ </SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/versions">
<!--
Modified: trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2006-09-08 22:03:24 UTC (rev 5168)
@@ -18,7 +18,7 @@
-->
<property>
<name>theme.id</name>
- <value>Nphalanx</value>
+ <value>renaissance</value>
</property>
<!--
| Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml 2006-09-08 22:03:24 UTC (rev 5168)
@@ -20,4 +20,10 @@
<link rel="stylesheet" id="main_css" href="/themes/maple/portal_style.css" type="text/css"/>
<link rel="shortcut icon" href="/themes/maple/images/favicon.ico"/>
</theme>
+ <theme>
+ <name>renaissance</name>
+ <link rel="stylesheet" id="main_css" href="/themes/renaissance/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/renaissance/images/favicon.ico"/>
+ <link rel="icon" href="/themes/renaissance/images/animated_favicon1.gif" type="image/gif"/>
+ </theme>
</themes>
\ No newline at end of file
Modified: trunk/core/src/resources/portal-server-war/login.jsp
===================================================================
--- trunk/core/src/resources/portal-server-war/login.jsp 2006-09-08 17:48:16 UTC (rev 5167)
+++ trunk/core/src/resources/portal-server-war/login.jsp 2006-09-08 22:03:24 UTC (rev 5168)
@@ -16,9 +16,9 @@
}
table.form {
- background-color: #CCFF99;
+ background-color: #DFE8ED;
border-style: dashed;
- border-color: #000000;
+ border-color: #98B7C6;
border-width: 1px;
}
More information about the jboss-svn-commits
mailing list