Author: thomas.heute(a)jboss.com Date: 2008-07-01 12:05:22 -0400 (Tue, 01 Jul 2008) New Revision: 11233 Removed: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/catalog/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/main-bg.jpg branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/portletIcon_Users.gif branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/role/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/user/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/mission-critical/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/phalanx/ Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html branches/JBoss_Portal_Branch_2_7/core-samples/build.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/industrial/portal_style.css branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/maple/portal_style.css branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml Log: - Did some cleanup - Removed 2 broken themes - 'Fixed' 2 broken themes - Move 'catalog' related images to samples Deleted: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/main-bg.jpg =================================================================== (Binary files differ) Deleted: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/portletIcon_Users.gif =================================================================== (Binary files differ) Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/industrial/portal_style.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2008-07-01 16:05:22 UTC (rev 11233) @@ -232,16 +232,23 @@ * Tab Navigation for Header * *****************************/ -UL#tabsHeader { +div#navigation { + position:relative; + width: 100%; + height: 64px; +} + +ul#tabsHeader { + width: 100%; + list-style: none; margin: 0; - padding-left: 300px; + padding-left: 0px; min-width: 550px; - z-index: 100; /* added for submenu hover */ - position: relative; /* added for submenu hover */ + z-index: 1; /* added for submenu hover */ + position: absolute; /* added for submenu hover */ } -UL#tabsHeader li { - list-style: none; +ul#tabsHeader li { float: left; margin-left: -1px; margin-top: 74px; @@ -250,11 +257,13 @@ padding: 0px; border-right: 1px solid #72828E; border-left: 1px solid #72828E; + position:relative; } -UL#tabsHeader li:hover { - background-image: url( images/highlightedTab.gif ); - background-repeat: repeat-x; +UL#tabsHeader li, +ul#tabsHeader li#current { + background-position:top right; + background-repeat: no-repeat; } /* hover selectors for main header tabs done to deal @@ -293,7 +302,7 @@ /* Begin Submenu selectors */ /* hide the sub levels and give them a positon absolute so that they take up no room */ -UL#tabsHeader ul { +ul#tabsHeader ul { visibility: hidden; position: absolute; height: 0; @@ -303,18 +312,19 @@ text-align: left; margin: 0px; padding: 0px; - margin-top: 22px; + margin-top: 24px; } -UL#tabsHeader ul a { +ul#tabsHeader ul a { + text-decoration: none; font-size: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; color: #5078aa; - + background-image: none; } -UL#tabsHeader ul a:hover { +ul#tabsHeader ul a:hover { font-size: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; @@ -326,6 +336,7 @@ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; color: #5078aa; + background-image: none; } UL#tabsHeader li:hover ul { @@ -337,16 +348,20 @@ color: #5078aa; padding: 3px; width: 120px; - + list-style: none; border: 1px solid #FFFFFF; - border-width: 1px 1px 0 0; - + border-width: 0 1px 1px 1px; + background-image:none; margin-left: 0px; margin-top: 0px; margin-right: 0px; } -UL#tabsHeader ul li:hover { +ul#tabsHeader ul li#current ul li { + background-image: none; +} + +ul#tabsHeader ul li:hover { background: #E2E2E2; } @@ -389,7 +404,9 @@ *****************************/ #dashboardnav { - float: right; + position:absolute; + top:0; + right: 15px; font-size: 10px; padding: 6px 12px 0px 0px; color: #FFFFFF; @@ -427,6 +444,9 @@ line-height: 100%; float: left; text-indent: 15px; + padding-top: 5px; + padding-bottom: 6px; + display: block; } .portlet-titlebar-decoration { Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/maple/portal_style.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/maple/portal_style.css 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/maple/portal_style.css 2008-07-01 16:05:22 UTC (rev 11233) @@ -294,7 +294,7 @@ UL#tabsHeader #current, UL#tabsHeader #current a { font: 13px / normal Arial, Helvetica, Sans-Serif, sans-serif; font-weight: 500; - color: #E4EECC; + color: #95A490; line-height: 25px; border-right: 0px; border-left: 0px; @@ -315,7 +315,7 @@ height: 0; top: 0px; left: 0; - width: 150px; + width: 200px; text-align: left; margin: 0px; padding: 0px; @@ -325,23 +325,23 @@ UL#tabsHeader ul a { font-size: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; - font-weight: normal; - color: #5078aa; + font-weight: bold; + color: #9F625D; } UL#tabsHeader ul a:hover { font-size: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; - font-weight: normal; - color: #5078aa; + font-weight: bold; + color: #9F625D; } UL#tabsHeader #current ul a { font-size: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; - color: #5078aa; + color: #9F625D; } UL#tabsHeader li:hover ul { @@ -349,21 +349,22 @@ } UL#tabsHeader ul li { - background: #EDECEC; + background: #e4eecc; color: #5078aa; - padding: 3px; - width: 120px; + padding: 5px; + width: 150px; + height: 18px; + + border: 1px solid #95A490; + border-width: 0 1px 1px 1px; - border: 1px solid #FFFFFF; - border-width: 1px 1px 0 0; - margin-left: 0px; margin-top: 0px; margin-right: 0px; } UL#tabsHeader ul li:hover { - background: #E2E2E2; + background: #cad6b8; } /* End Submenu selectors */ @@ -437,13 +438,14 @@ height: 22px; width: 17px; float: left; + margin-top: -1px; } /* wrapper for floating portlet window modes */ .portlet-mode-container { float: right; padding-left: 4px; - padding-top: 1px; + padding-top: 0px; } .portlet-titlebar-left { Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2008-07-01 16:05:22 UTC (rev 11233) @@ -23,25 +23,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <layouts> - <!-- layout> - <name>nodesk</name> - <uri>/nodesk/index.jsp</uri> - <uri state="maximized">/nodesk/index.jsp</uri> - <regions> - <region name="left"/> - <region name="center"/> - </regions> - </layout> <layout> - <name>phalanx</name> - <uri>/phalanx/index.jsp</uri> - <uri state="maximized">/phalanx/index.jsp</uri> - <regions> - <region name="left"/> - <region name="center"/> - </regions> - </layout--> - <layout> <name>generic</name> <uri>/layouts/generic/index.jsp</uri> <uri state="maximized">/layouts/generic/maximized.jsp</uri> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml 2008-07-01 16:05:22 UTC (rev 11233) @@ -35,16 +35,6 @@ <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico"/> </theme> <theme> - <name>nphalanx</name> - <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css"/> - <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico"/> - </theme> - <theme> - <name>mission-critical</name> - <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css"/> - <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico"/> - </theme> - <theme> <name>maple</name> <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"/> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-01 16:05:22 UTC (rev 11233) @@ -1,9 +1,9 @@ <div> - <img src="default/images/2_7-go-faster.gif" width="626" height="148" alt="JBoss Portal 2.7: Go Faster!"/> + <img src="default/images/2_7-go-faster.gif" width="626" height="148" style="margin:10px auto auto auto" alt="JBoss Portal 2.7: Go Faster!"/> </div> <br/> <div> - <img src="default/images/info-banner.gif" width="626" height="73" border="0" usemap="#Map" style="margin:0 0 0 7px"> + <img src="default/images/info-banner.gif" width="626" height="73" border="0" usemap="#Map" alt="Services"/> <map name="Map"> <area shape="rect" coords="1,1,201,72" href="/portal/content/default/support.html"> <area shape="rect" coords="201,0,439,73" href="http://www.jboss.org/index.html?module=bb&op=viewforum&... Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-07-01 16:05:22 UTC (rev 11233) @@ -221,6 +221,7 @@ <!-- portal-catalog-samples.war --> <copy todir="${build.resources}/portal-catalog-samples.war"> + <fileset dir="${source.bin}/portal-catalog-samples-war"/> <fileset dir="${build.resources}/portal-catalog-samples-war"/> </copy> <mkdir dir="${build.resources}/portal-catalog-samples.war/WEB-INF/lib/"/> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-07-01 16:05:22 UTC (rev 11233) @@ -56,7 +56,7 @@ <height>0</height> </window> <page> - <page-name>event test</page-name> + <page-name>Event test</page-name> <listener>test_listener</listener> <window> <window-name>CatalogPortletWindow</window-name> @@ -78,7 +78,7 @@ </window> </page> <page> - <page-name>page event test</page-name> + <page-name>Page event test</page-name> <listener>window_event_listener</listener> <window> <window-name>EventPortletWindow1</window-name> @@ -118,7 +118,7 @@ </window> </page> <page> - <page-name>secure test</page-name> + <page-name>Secure test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -133,7 +133,7 @@ </window> </page> <page> - <page-name>exception test</page-name> + <page-name>Exception test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -148,7 +148,7 @@ </window> </page> <page> - <page-name>cache test</page-name> + <page-name>Cache test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -169,7 +169,7 @@ </window> </page> <page> - <page-name>session test</page-name> + <page-name>Session test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -184,7 +184,7 @@ </window> </page> <page> - <page-name>missing portlet</page-name> + <page-name>Missing portlet</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -220,7 +220,7 @@ </window> </page> <page> - <page-name>missing instance</page-name> + <page-name>Missing instance</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -235,7 +235,7 @@ </window> </page> <page> - <page-name>charset test</page-name> + <page-name>Charset test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -250,7 +250,7 @@ </window> </page> <page> - <page-name>encoding test</page-name> + <page-name>Encoding test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -265,7 +265,7 @@ </window> </page> <page> - <page-name>header test</page-name> + <page-name>Header test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -280,7 +280,7 @@ </window> </page> <page> - <page-name>javascript test</page-name> + <page-name>Javascript test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -295,7 +295,7 @@ </window> </page> <page> - <page-name>mode test</page-name> + <page-name>Mode test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -310,7 +310,7 @@ </window> </page> <page> - <page-name>window id test</page-name> + <page-name>Window id test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -325,7 +325,7 @@ </window> </page> <page> - <page-name>public parameters test</page-name> + <page-name>Public parameters test</page-name> <window> <window-name>PublicParametersPortletWindow1</window-name> <instance-ref>PublicParametersPortletInstance1</instance-ref> @@ -346,7 +346,7 @@ </window> </page> <page> - <page-name>file system content</page-name> + <page-name>File system content</page-name> <window> <window-name>FSWindow</window-name> <content> @@ -389,7 +389,7 @@ <height>0</height> </window> <page> - <page-name>event test</page-name> + <page-name>Event test</page-name> <listener>test_listener</listener> <window> <window-name>CatalogPortletWindow</window-name> @@ -411,7 +411,7 @@ </window> </page> <page> - <page-name>page event test</page-name> + <page-name>Page event test</page-name> <listener>window_event_listener</listener> <window> <window-name>CatalogPortletWindow1</window-name> @@ -451,7 +451,7 @@ </window> </page> <page> - <page-name>secure test</page-name> + <page-name>Secure test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -466,7 +466,7 @@ </window> </page> <page> - <page-name>exception test</page-name> + <page-name>Exception test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -481,7 +481,7 @@ </window> </page> <page> - <page-name>cache test</page-name> + <page-name>Cache test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -502,7 +502,7 @@ </window> </page> <page> - <page-name>session test</page-name> + <page-name>Session test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -517,7 +517,7 @@ </window> </page> <page> - <page-name>missing portlet</page-name> + <page-name>Missing portlet</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -553,7 +553,7 @@ </window> </page> <page> - <page-name>missing instance</page-name> + <page-name>Missing instance</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -568,7 +568,7 @@ </window> </page> <page> - <page-name>charset test</page-name> + <page-name>Charset test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -583,7 +583,7 @@ </window> </page> <page> - <page-name>encoding test</page-name> + <page-name>Encoding test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -598,7 +598,7 @@ </window> </page> <page> - <page-name>header test</page-name> + <page-name>Header test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -613,7 +613,7 @@ </window> </page> <page> - <page-name>javascript test</page-name> + <page-name>Javascript test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -628,7 +628,7 @@ </window> </page> <page> - <page-name>mode test</page-name> + <page-name>Mode test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -643,7 +643,7 @@ </window> </page> <page> - <page-name>window id test</page-name> + <page-name>Window id test</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -658,7 +658,7 @@ </window> </page> <page> - <page-name>public parameters test</page-name> + <page-name>Public parameters test</page-name> <window> <window-name>PublicParametersPortletWindow1</window-name> <instance-ref>PublicParametersPortletInstance1</instance-ref> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp 2008-07-01 16:05:22 UTC (rev 11233) @@ -21,18 +21,16 @@ list-style-position: outside; margin-left: 20px; vertical-align: top; - list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ); + list-style-image: url( <%= contextPath %>/images/bullet.gif ); } .pagenosub { margin-top: 5px; margin-left: 0px; font-weight: bold; - list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ); + list-style-image: url( <%= contextPath %>/images/bullet.gif ); } - / - / --> </style> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp 2008-07-01 15:24:31 UTC (rev 11232) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp 2008-07-01 16:05:22 UTC (rev 11233) @@ -20,7 +20,7 @@ padding: 0px 0px 0px 0px; cursor: pointer; cursor: hand; - list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ); + list-style-image: url( <%= contextPath %> /images/bullet.gif ); } #foldinglist { @@ -30,12 +30,12 @@ margin-left: 0px; padding: 0px 0px 0px 0px; vertical-align: top; - list-style-image: url( <%= contextPath %> /images/catalog/T.gif ) + list-style-image: url( <%= contextPath %> /images/T.gif ) } #pagenosub { margin-left: -10px; - list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ) + list-style-image: url( <%= contextPath %> /images/bullet.gif ) } / @@ -83,7 +83,7 @@ PortalNodeURL subchildURL = jresponse.createRenderURL(subChild); %> <tr> - <td><img src="<%= contextPath %>/images/catalog/T.gif"/></td> + <td><img src="<%= contextPath %>/images/T.gif"/></td> <td><a href="<%= subchildURL %>"><%= subChild.getName() %> </a></td> </tr>