portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r239722 - in /portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations: layout/html/neat/ layout/html/neat/css/ layout/html/neat/images/ layout/html/neat/javascript/ portlet/html/neat/ portlet/html/neat/css/ portlet/htm...
Date Wed, 24 Aug 2005 18:11:12 GMT
Author: juan
Date: Wed Aug 24 10:01:04 2005
New Revision: 239722

URL: http://svn.apache.org/viewcvs?rev=239722&view=rev
Log:
General renew of the skin, adding the beginning of the ajax support.
Removing of the old images and adding the new ones.

Added:
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/background.gif   (with props)
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/folders.gif   (with props)
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/page.gif   (with props)
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/javascript/
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/javascript/ajax.js
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/background.gif   (with props)
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/select.gif   (with props)
Removed:
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-bottom-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-bottom-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-bottom.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-middle-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-middle-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-top-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-top-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/data-decorator-top.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/l-tab-left-low.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/l-tab-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/l-tab-right-low.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/l-tab-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/logo-bottom-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/logo-bottom-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/logo-top-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/logo-top-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/menu-bottom-left-clear.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/menu-bottom-left-dark.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/menu-bottom-right-clear.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/menu-bottom-right-dark.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/menu-top-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/menu-top-right.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/bottom-left-continuation.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/bottom-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/bottom.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/curve-bottom.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/curve-top.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/middle-bottom-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/middle-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/pixel.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/sw_med_rond.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/top-left-continuation.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/top-left.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/top.gif
Modified:
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/css/styles.css
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-bottom.vm
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-macros.vm
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-top.vm
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/jetspeed-logo.gif
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/css/styles.css
    portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/decorator.vm

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/css/styles.css?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/css/styles.css (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/css/styles.css Wed Aug 24 10:01:04 2005
@@ -15,198 +15,66 @@
 */
 
 body {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    padding: 1em;
-    background: #fff;
-    color: #000;
-
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	voice-family: "\"}\"";
+	voice-family: inherit;
+	background: #F2F5F6;
+	color: #000;
+	margin: 0;
+	padding: 0;
 }
 
 a:link, a:visited, a:active {
-	color: #1D53A1;
+	color: #8AA1B2;
 }
 
 a:hover {
-    color: #fff !important;
+    color: #1D53A1 !important;
 }
 
-body.layout-neat
+.layout-neat
 {
-    margin: 0;
-    padding: 0;
-}
 
-/**
-.PTitle
-{
- 
+	border: 1px #D7DBDF solid;
+	width: 80%;
+	margin: 10px 0px 10px 10px;
+	padding: 5px 5px 0px 5px;
+	background: #FFF ;
 }
-**/
 
 .Link
 {
-	color: #1D53A1;
+	color: #8AA1B2;
 }
 
-/**
-.LinkFolder
+.layout-neat .BannerDecorator
 {
+	border: 1px #D7DBDF solid;
+	margin: 0px 0px 5px 0px;
 }
 
-.LinkPage
+.layout-neat .Banner
 {
-}
-**/
-.layout-neat .LTabLeftLow
-{
-	width: 10px;
-
-    background-image: url(content/images/l-tab-left-low.gif);
-    background-repeat: no-repeat;
-    background-color: #95AFD9;
-    padding-left: 9px;
-    padding-right: 0px;
-}
-
-.layout-neat .LTabLow
-{
-    height:25px;
-    background-color: #95AFD9;
-    padding-right: 9px;
-
-}
-
-.layout-neat .LTabLow A:link, 
-.layout-neat .LTabLow A:visited,
-.layout-neat .LTabLow A:hover, 
-.layout-neat .LTabLow A:active
-{
-	text-decoration: none;
-    color: #DEE6F3;
-}
-
-.layout-neat .LTabRightLow
-{
-	width: 0px;
-
-    background-color: #ADC2E4;
-    padding-left: 0px;
-    padding-right: 9px;
-    background-image: url(content/images/l-tab-right-low.gif);
-    background-repeat: no-repeat;
-}
-
-.layout-neat .LTabLeft
-{
-    width: 10px;
-    background-repeat: no-repeat;
-    background-color: #86A4D2;
-    padding-left: 9px;
-    padding-right: 0px;
-    background-image: url(content/images/l-tab-left.gif);
-
-}
-
-.layout-neat .LTab
-{
-	height:25px;	
-	font-size: 12pt;
-    background-color: #86A4D2;
-    color: #FFF;
-    padding-right: 9px;
-    background-image: url(content/images/l-tab.gif);
-}
- 
-.layout-neat .LTabRight
-{
-    width:10px;
-    background-color: #ADC2E4;
-    background-repeat: no-repeat;
-    padding-left: 0px;
-    padding-right: 2px;
-    background-image: url(content/images/l-tab-right.gif);
-}
-
-.layout-neat .tabs {
-    /** margin-top: .67em; **/
-    margin-right: 0px;
-    margin-left: 0px;
-    padding-left: 8px;
-    border-bottom: 6px #86A4D2 solid;
-    background-color: #ADC2E4;
-}
-
-
-.layout-neat .tabs td {
-    padding-top: 3px;
-    padding-bottom: 3px;
-    font-weight: bold;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: x-small;
-
-}
-
-.layout-neat #banner{
-	text-align: center;
-	background-color: #ADC2E4;
+	padding: 0px;
+	background-color: #FFF;
+	border: 1px #F6F8F9 solid;
+	background: #FFF url(content/images/background.gif);
 }
 
 .layout-neat .Logo
 {
-	margin-top: 8px;
-	margin-bottom: 8px;
-	background-color: #ADC2E4;
-}
-
-.layout-neat .LogoTopLeft
-{
-	height: 28px;
-	width: 28px;
-	background-image: url(content/images/logo-top-left.gif);
-}
-
-.layout-neat .LogoTopRight
-{
-	height: 28px;
-	width: 28px;
-	background-image: url(content/images/logo-top-right.gif);
-}
-
-.layout-neat .LogoTop,
-.layout-neat .LogoBottom
-{
-	height: 28px;
-	background-color: #FFFFFF;
-}
-
-.layout-neat .LogoLeft,
-.layout-neat .LogoRight
-{
-	width: 28px;
-	background-color: #FFFFFF;
-}
-
-.layout-neat .LogoBottomLeft
-{
-	height: 28px;
-	width: 28px;
-	background-image: url(content/images/logo-bottom-left.gif);
+	border: 1px #DDDDDD solid;
 }
 
-.layout-neat .LogoBottomRight
+.layout-neat .LogoDecorator
 {
-	height: 28px;
-	width: 28px;
-	background-image: url(content/images/logo-bottom-right.gif);
+	width: 230px;
+	height: 70px;
+	border: 1px #F4F4F4 solid;
+	margin-bottom: 5px;
+	margin-top: 5px;
 }
 
-.layout-neat .LogoMiddle
-{
-	background-color: #FFFFFF;
-}
 
 /**
 .layout-neat #login {
@@ -217,80 +85,66 @@
     background-color: #ADC2E4;
 }
 **/
-.layout-neat #breadcrumbs {
-    border: 1px solid #FFFFFF;
-    background-color: #CDDAEE;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: x-small;
-    padding: 2px 8px;
-    color: #000000;
-}
 
-.layout-neat #breadcrumbs a {
-    text-decoration: none;
-}
-
-.layout-neat #navcolumn 
+.layout-neat #Breadcrumbs
 {
-	margin-top: 15px;
+	border: 1px #F6F8F9 solid;
+	background: #FFF url(content/images/background.gif);
+	
+	height: 20px
 }
 
-.layout-neat #navcolumn p {
-    background-image: none;
-
-}
-
-.layout-neat #dataDecorationTopLeft
+.layout-neat #BreadcrumbsText
 {
-	width: 35px;
-	height: 38px;
-	background-image: url(content/images/data-decorator-top-left.gif);
+	border: 1px #F6F8F9 solid;
+	background: #FFF url(content/images/background.gif);
+	voice-family: "\"}\"";
+	voice-family: inherit;
+	font-size: x-small;
+	padding: 2px 8px;
+	color: #000000;
+	font-weight: bold;
+	float: left;
 }
 
-.layout-neat #dataDecorationTop
+.layout-neat #BreadcrumbsText a
 {
-	height: 38px;
-	background-image: url(content/images/data-decorator-top.gif);
+	text-decoration: none;
 }
 
-.layout-neat #dataDecorationTopRight
+.layout-neat .BreadcrumbsDecorator
 {
-	width: 35px;
-	height: 38px;
-	background-image: url(content/images/data-decorator-top-right.gif);
+	border: 1px #D7DBDF solid;
+	margin: 0px 0px 5px 0px;
 }
 
-.layout-neat #dataDecorationMiddleLeft
+.layout-neat #navcolumn 
 {
-	width: 35px;
-	background-image: url(content/images/data-decorator-middle-left.gif);
+	border: 1px #F6F8F9 solid;
+	border-bottom-style: none;
+	height: 100%;
 }
 
-.layout-neat #dataDecorationMiddleRight
+.layout-neat .navcolumnDecorator
 {
-	width: 35px;
-	background-image: url(content/images/data-decorator-middle-right.gif);
+	border: 1px  solid #D7DBDF;
+	border-bottom: 1px #F6F8F9 solid;
+	margin: 0px 1px 5px 1px;
 }
 
-.layout-neat #dataDecorationBottomLeft
-{
-	width: 35px;
-	height: 38px;
-	background-image: url(content/images/data-decorator-bottom-left.gif);
-}
 
-.layout-neat #dataDecorationBottom
+.layout-neat .MTabs
 {
-	height: 38px;
-	background-image: url(content/images/data-decorator-bottom.gif);
+	border: 1px #F6F8F9 solid;
+	border-bottom-style: none;
+	height: 100%;
 }
 
-.layout-neat #dataDecorationBottomRight
+.layout-neat .MTabsDecorator
 {
-	width: 35px;
-	height: 38px;
-	background-image: url(content/images/data-decorator-bottom-right.gif);
+	border: 1px  solid #D7DBDF;
+	border-bottom: 1px #F6F8F9 solid;
+	margin: 0px 1px 5px 1px;
 }
 
 .layout-neat #Powered
@@ -304,7 +158,6 @@
 }**/
 
 .layout-neat #main {
-    border-top: 1px solid #999;
 }
 
 .layout-neat #leftcol {
@@ -350,68 +203,59 @@
 	font-size: small;
 }
 
-.layout-neat .MMiddle
+.layout-neat ul
 {
-	background-color: #EAF0F8;
-	voice-family: "\"}\"";
-	voice-family: inherit;
-	font-size: small;
-	color: #1D53A1;
-	padding: 4px 4px 4px 4px;
-	border: 1px #ADC2E4 solid;
-}
-.layout-neat .MMiddle a:link,
-.layout-neat .MMiddle a:active,
-.layout-neat .MMiddle a:visited
-{
-	font-size: small;
-	color: #1D53A1;
+	margin: 0px;
+	padding: 0px;
+	text-align: left;
+	list-style: none;
 }
 
-.layout-neat .MTopLeft
+.layout-neat li
 {
-	height: 18px;
-	width: 19px;
-	background: url(content/images/menu-top-left.gif) no-repeat;
-	background-color: #ADC2E4;
+	padding: 6px 0 6px 20px;
+	border-bottom: 1px solid #ddd;
+	background-repeat: no-repeat;
+	background-position: 6px 8px;
+	display: block;
+	list-style: none;
 }
 
-.layout-neat .MTopImage
+.layout-neat li:hover
 {
-	height: 18px;
-	width: 19px;
+	background-color: #F2F8FF;
 }
 
-.layout-neat .MTopRight
+.layout-neat .Folder
 {
-	height: 18px;
-	width: 19px;
-	background: url(content/images/menu-top-right.gif) no-repeat;
-	background-color: #ADC2E4;
+	background-image: url(content/images/folders.gif);
 }
-
-.layout-neat .MBottomMiddle
+.layout-neat .Archive
 {
-	background-color: #ADC2E4;
-	height: 18px;
+	background-image: url(content/images/page.gif);
+}
+.layout-neat .Url
+{
+	background-image: url(content/images/page.gif);
 }
 
-.layout-neat .MBottomLeft
+.layout-neat .MTitle
 {
-	background-color: #ADC2E4;
-	height: 18px;
-	width: 19px;
-	background: url(content/images/menu-bottom-left-dark.gif) no-repeat;
+	background: #EAF0F8;
+	font-weight: bold;
+	color: #333;
+	padding: 3px 0 3px 5px;
+	background-image: url(content/images/background.gif);
 }
 
-.layout-neat .MBottomRight
+.layout-neat .TActual
 {
-	background-color: #ADC2E4;
-	height: 18px;
-	width: 19px;
-	background: url(content/images/menu-bottom-right-dark.gif) no-repeat;
+	background: #F2F8FF;
+	color: #777;
+	padding: 6px 0 6px 20px;
 }
 
+
 .layout-neat .Separator
 {
 	background-color: #FFFFFF;
@@ -431,6 +275,60 @@
     voice-family: inherit;
     font-size: x-small;
 }
+
+.layout-neat .portal-layout,
+.layout-neat .portal-layout-column,
+.layout-neat form,
+.layout-neat table,
+.layout-neat td
+{
+	margin: 0px;
+	padding: 0px;
+}
+
+/** NUEVO!!! **/
+
+#portal-page-actions A img
+{
+   display: inline;
+}
+
+#portal-page-actions
+{
+	display: inline;
+	float: right;
+	padding: 0px 4px 0px 0px;
+	text-align: right;
+	letter-spacing: -5px;
+}
+
+.FolderList
+{
+   display: inline;
+}
+
+.portal-layout-column
+{  
+  float: left;
+  /** This id the "gutter" setting for columns */
+  margin-right: 0px;
+  margin-top: 4px;
+ 
+}
+.portal-layout-cell
+{
+  margin-bottom: 5px;
+  margin-right: 7px;
+}
+
+.portal-layout-maxed
+{
+  margin-right: 6px;
+}
+/** FIN NUEVO **/
+
+
+
 /**
 .layout-neat .toolgroup .body div div {
     padding-left: .5em;

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-bottom.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-bottom.vm?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-bottom.vm (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-bottom.vm Wed Aug 24 10:01:04 2005
@@ -15,22 +15,39 @@
 *#
 
           </td>
-	  <td id="dataDecorationMiddleRight" rowSpan="2" colspan="1"></td>
+		<td valign="top" id="leftcol" width="20%">
+<!-- Top Tabs Menu -->
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+      <div class="MTabsDecorator">
+		<div class="MTabs">
+			#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
+		 </div>
+      </div>
+#end
+
+
+	<!-- Left Navigations Menu Table Data -->
+	#set($navigationsStandardMenu = $site.getMenu("navigations"))
+	#if(!$navigationsStandardMenu.empty)
+
+			<div class="navcolumnDecorator">
+				<div id="navcolumn">
+					<ul>
+						#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+					</ul>
+				</div>
+			</div>
+		</td>
+	#end
 	</tr>
-	<tr>
-		<td rowSpan="1" colspan="2">
-			<div id="Powered">
-      				<img src="$response.encodeURL('content/images/jetspeed-powered.gif')" alt="Jetspeed 2 Powered" border="0">
-   			</div>
-   		</td>
-	</tr>
-	<tr>
-		<td  id="dataDecorationBottomLeft"></td>
-		<td id="dataDecorationBottom" rowSpan="1" colspan="2"></td>
-		<td id="dataDecorationBottomRight"></td>
-	</tr>
-      </table> 
+      </table>
     </div>
+
+
+	<div id="Powered">
+		<img src="$response.encodeURL('content/images/jetspeed-powered.gif')" alt="Jetspeed 2 Powered" border="0">
+	</div>
     
   </body>
 </html>

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-macros.vm?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-macros.vm (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-macros.vm Wed Aug 24 10:01:04 2005
@@ -12,28 +12,23 @@
 
 #* include tabs navigation component *#
 #macro (includeTabsNavigation $_menu $_orientation)
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
+       <ul>
+		<li class="MTitle">Tabs</li>
     #foreach($element in $_menu.elements.iterator())
       #if($element.elementType == "option")
         #set($tabTitle = $element.getTitle($preferedLocale))
         #set($tabName = $element.getShortTitle($preferedLocale))
         #if($_orientation == $LEFT_TO_RIGHT)
           #if($element.isSelected($site))
-            <td class="LTabLeft" nowrap="true">&nbsp;</td>
-            <td class="LTab" align="center" valign="middle" nowrap="true" title="$!tabTitle">${tabName}</td>
-            <td class="LTabRight"  nowrap="true">&nbsp;</td>
+           <li class="TActual" title="$!tabTitle">${tabName}</li>
           #else
             #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
-            <td class="LTabLeftLow"  nowrap="true">&nbsp;</td>
-            <td class="LTabLow" align="center" valign="middle" nowrap="true" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></td>
-            <td class="LTabRightLow"  nowrap="true">&nbsp;</td>
+           <li class="TLow" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></li>
           #end
         #end
       #end
     #end
-          </tr>
-        </table>
+	</ul>
 #end
 
 #* include links navigation component *#
@@ -91,9 +86,9 @@
       #set($separatorTitle = $element.getTitle($preferedLocale))
       #set($separatorText = $element.getText($preferedLocale))
       #if($_orientation == $LEFT_TO_RIGHT)
-        <span title="$!separatorTitle">${separatorText}${_delimiter}</span>              
+        <span title="$!separatorTitle">${separatorText}${_delimiter}</span>
       #elseif($_orientation == $TOP_TO_BOTTOM)
-        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+        <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
       #end
     #end
   #end
@@ -107,6 +102,7 @@
       </div>
 #end
 
+
 #* include nested menu links navigation component *#
 #macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
   #set($menuTitle = $_menu.getTitle($preferedLocale))
@@ -121,22 +117,22 @@
       #set($linkName = $element.getShortTitle($preferedLocale))
       #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
       #if($element.type == "page")
-                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+                <div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>1</div>
       #elseif($element.type == "link")
         #set($linkTarget = $element.target)
-                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>	
+                <div><a href="$linkUrl" target="$linkTarget" class="Link" title="$!linkTitle">${linkName}</a>2</div>	
       #elseif($element.type == "folder")
-                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+                <div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a>3</div>
       #end
     #elseif($element.elementType == "menu")
       #includeNestedLinksWithIconNavigation($element $_orientation)
     #elseif($element.elementType == "separator")
       #set($separatorTitle = $element.getTitle($preferedLocale))
       #set($separatorText = $element.getText($preferedLocale))
-                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>              
+                  <div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
     #end
   #end
-              </div>
+              <!-- </div> -->
 #end
 
 #* include top level menu links navigation component *#
@@ -146,99 +142,50 @@
   #foreach($element in $_menu.elements.iterator())
     #if($element.elementType == "option")
       #if(!$rowStarted)
-        <tr>
-          <td>
-            <div class="toolgroup">
-              <div class="body">
-                <div class="FolderList">
+
       #elseif(!$elementsStarted)
-              <!-- <div class="body">
-                <div class="FolderList"> -->
-		<tr>
-      			<td rowSpan="1" colspan="3" class="MMiddle">
+
       #end
       #set($linkTitle = $element.getTitle($preferedLocale))
       #set($linkName = $element.getShortTitle($preferedLocale))
       #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
       #if($element.type == "page")
-                  <div><strong>::</strong> <a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+                  <li class="Page"><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></li>
       #elseif($element.type == "link")
         #set($linkTarget = $element.target)
-                  <div><strong>::</strong> <a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></div>
+                  <li class="Url"><a href="$linkUrl" target="$!linkTarget" class="Link" title="$!linkTitle">${linkName}</a></li>
       #elseif($element.type == "folder")
-                  <div><strong>::</strong> <a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+                   <li class="Folder"><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></li>
       #end
       #set($rowStarted = true)
       #set($elementsStarted = true)
     #elseif($element.elementType == "menu")
       #if(!$rowStarted)
-        <tr>
-          <td>
-            <tr class="toolgroup">
-              <div class="body">
-                <div class="FolderList">
+
       #elseif(!$elementsStarted)
-              <div class="body">
-                <div class="FolderList">
+
       #end
       #includeNestedLinksWithIconNavigation($element $_orientation)
       #set($rowStarted = true)
       #set($elementsStarted = true)
     #elseif($element.elementType == "separator")
       #if(!$rowStarted)
-        <tr>
-          <td>
-	  	
-	   <table cellpadding="0" cellspacing="0">
-           <!-- <div class="toolgroup"> -->
+	<!-- Start of the Menu -->
       #elseif($elementsStarted)
-                </td>
-    	</tr>
-	<tr>
-      		<td class="MBottomLeft"></td>
-      		<td class="MBottomMiddle"></td>
-      		<td class="MBottomRight"></td>
-    	</tr>
-	<tr>
-        	<td rowSpan="1" colspan="3" class="separator"></td>
-        </tr>
+       <!-- End of the Menu Folders-->
       #end
       #set($separatorTitle = $element.getTitle($preferedLocale))
       #set($separatorText = $element.getText($preferedLocale))
-      
-              <tr>
-	        <td class="MTopLeft"><img src="content/images/pixel.gif" class="MTopImage"></td>
-		<td class="label">
-	          <!-- <div class="label"> -->
-                   ${separatorText}
-                  <!--</div>-->
-		 </td>
-		 <td class="MTopRight"><img src="content/images/pixel.gif" class="MTopImage"></td>
-	       </tr>
+                   <li class="MTitle">${separatorText}</li>
       #set($rowStarted = true)
       #set($elementsStarted = false)
     #end
   #end
   #if($elementsStarted)
-  
-                </td>
-    	</tr>
-	<tr>
-      		<td class="MBottomLeft"></td>
-      		<td class="MBottomMiddle"></td>
-      		<td class="MBottomRight"></td>
-    	</tr> 
-	<tr>
-      <td rowSpan="1" colspan="3" class="separator"></td>
-       </tr>
-                <!--</div>
-              </div>-->
-  #end
-  #if($rowStarted)	
-	</table>
-             <!-- </div>
-            </div> -->
-          </td>
-        </tr>
+	
+       <!-- End of the Menu Others-->
+  #end
+  #if($rowStarted)
+
   #end
 #end

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-top.vm?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-top.vm (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/decorator-top.vm Wed Aug 24 10:01:04 2005
@@ -33,47 +33,26 @@
     <meta name="version" content="/* $Id: decorator-top.vm 220061 2005-08-06 15:07:29Z Juan $" />
     <meta name="keywords" content="" />
     <meta name="description" content="$jetspeed.page.getTitle($preferedLocale)" />
+    <script src="content/javascript/ajax.js" language="JavaScript1.2" type="text/javascript"></script>
   </head>
-  <body marginwidth="0" marginheight="0" class="layout-neat">
+  <body>
 
 #set($myF = $jetspeed.currentFragment)
 #set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
 
 <!--  BEGIN: layout/html/neat/decorator.vm -->
 
-    <div class="layout-neat">
+	<div class="layout-neat">
 
 <!-- Banner Content -->
-      <div id="banner">
-              <div align="center">
-			<table cellspacing="0" cellpadding="0"  class="Logo">
-				<tr>
-					<td class="LogoTopLeft"></td>
-					<td class="LogoTop"></td>
-					<td class="LogoTopRight"></td>
-				</tr>
-				<tr>
-					<td class="LogoLeft"></td>
-					<td class="LogoMiddle">
-						<img src="$response.encodeURL('content/images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0"/></td>
-					<td class="LogoRight"></td>
-				</tr>
-				<tr>
-					<td class="LogoBottomLeft"></td>
-					<td class="LogoBottom"></td>
-					<td class="LogoBottomRight"></td>
-				</tr>
-			</table>
-		</div>
-      </div>
 
-<!-- Top Tabs Menu -->
-#set($pagesStandardMenu = $site.getMenu("pages"))
-#if(!$pagesStandardMenu.empty)
-      <div class="tabs">
-#includeTabsNavigation($pagesStandardMenu $LEFT_TO_RIGHT)
-      </div>
-#end
+		<div align="center" class="BannerDecorator">
+			<div class="Banner">
+				<div class="LogoDecorator">
+					<img src="$response.encodeURL('content/images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" class="Logo">
+				</div>
+			</div>
+		</div>
 
 ## <!-- Back Navigation -->
 ##       <div id="breadcrumbs">
@@ -86,39 +65,38 @@
 ##       </div>
 
 <!-- Breadcrumbs Back Navigation -->
-      <div id="breadcrumbs">
-#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
-#if(!$breadcrumbsStandardMenu.empty)
-#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
-#else
-        &nbsp;
-#end
-      </div>
+	<div class="BreadcrumbsDecorator">
+		<div id="Breadcrumbs">
+			<div id="BreadcrumbsText">
+				#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+				#if(!$breadcrumbsStandardMenu.empty)
+				#includeLinksNavigation($breadcrumbsStandardMenu $LEFT_TO_RIGHT "" $BREADCRUMBS_STYLE "")
+				#else
+					&nbsp;
+				#end
+			</div>
+			<!-- Page Action Bar -->
+			#if ($actions.size()>0)
+			<div id="portal-page-actions" >
+			#foreach ($action in $actions)
+					
+				<a href="${action.Action}" title="${action.Name}" class="pageAction" ><img src="${action.Link}" alt="${action.Alt}" border="0" /></a>
+				#end
+				#if($editing == true)    		  	  
+				#set ($chooser = "${jetspeed.basePath}/system/customizer/portlet-selector.psml")
+			
+				<a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$response.encodeURL('content/images/select.gif')" border="0" title="Add a Portlet"/></a>
+				#end 
+				
+			</div>
+			#end
+		</div>
+	</div>
 
 <!-- Content Table -->
-      <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
-	<tr>
-		<td id="dataDecorationTopLeft"></td>
-		<td rowSpan="1" colspan="2" id="dataDecorationTop"></td>
-	  	<td id="dataDecorationTopRight"></td>
-	</tr>
+      <table cellpadding="0" cellspacing="0" border="0" id="main">
         <tr>
-		<td id="dataDecorationMiddleLeft"  rowSpan="2" colspan="1"></td>
-<!-- Left Navigations Menu Table Data -->
-#set($navigationsStandardMenu = $site.getMenu("navigations"))
-#if(!$navigationsStandardMenu.empty)
-          <td valign="top" id="leftcol" width="20%">
-            <div id="navcolumn">
-              <table cellpadding="0" cellspacing="4" border="0" width="100%">
-#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
-              </table>
-            </div>
-          </td>
-#end
 
 <!-- Content Table Data -->
           <td nowrap valign="top">
-  
-## $jetspeed.include($jetspeed.currentFragment)
-
 <!--  END: layout/html/neat/decorator.vm -->

Added: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/background.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/background.gif?rev=239722&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/background.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/background.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/folders.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/folders.gif?rev=239722&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/folders.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/folders.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/jetspeed-logo.gif?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
Binary files - no diff available.

Added: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/page.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/page.gif?rev=239722&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/page.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/images/page.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/javascript/ajax.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/javascript/ajax.js?rev=239722&view=auto
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/javascript/ajax.js (added)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/javascript/ajax.js Wed Aug 24 10:01:04 2005
@@ -0,0 +1,72 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+var req;
+var response;
+
+function retrieveUrl(url)
+{
+		req = new XMLHttpRequest();
+		req.onreadystatechange = processReqChange(req);
+		req.open("GET", url, true);
+		req.send(null);
+}
+
+function processReqChange()
+{
+	if (req.readyState == 4)
+	{
+		if (req.status == 200)
+		{
+			response = req.responseXML.documentElement;
+			return true;
+		}
+		else
+		{
+			alert("There was a problem retrieving the XML data:\n" + req.statusText);
+			return false;
+		}
+	}
+}
+
+
+function processAction(portletId, actionName, msgUrl)
+{
+	switch (actionName)
+	{
+		case 'minimized':
+			var mostrar;
+			if (response == null)
+			{
+				mostrar = response;
+			}
+			else
+				mostrar = response.getElementById("actions-"+portletId).innerHTML;
+			retrieveUrl(msgUrl);
+			document.getElementById("actions-"+portletId).innerHTML =  mostrar;
+			
+
+			//document.getElementById("content-"+portletId).style.display = "none";
+			
+		break
+		case 'restore':
+			document.getElementById("content-"+portletId).style.display = "inline";
+			retrieveUrl(msgUrl);
+		break
+		default:
+		break
+	}
+}
+

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/css/styles.css?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/css/styles.css (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/css/styles.css Wed Aug 24 10:01:04 2005
@@ -14,176 +14,112 @@
 limitations under the License.
 */
 
-
-.portlet-neat .PTitleLeft
+.portlet-neat .PHeader
 {
+	border: 1px #F6F8F9 solid;
+	background: #FFF url(content/images/background.gif);
+	height: 18px;
 }
 
-.portlet-neat .PTitleContent
+.portlet-neat .PortletDecorator
 {
-    padding: 4px;
-    font-weight:bold;
-    color: #FFFFFF;
-
-    /**
-    Specify the height of the image used
-    else it will use the text height    
-    height:11px;    **/
+	border: 1px #D7DBDF solid;
+	width: 100%;
 }
 
-.portlet-neat .PTitleIcons
+.portlet-neat .PActions
 {
-    padding: 6px 8px 4px 0px;
+	padding: 0px 4px 0px 0px;
+	text-align: right;
+	float: right;
+	letter-spacing: -5px;
 }
 
 .portlet-neat .PTitle
 {
-    height: 24px; 
-    background: #ADC2E4 url(content/neat/images/top.gif) no-repeat;
-}
-
-
- 
-.portlet-neat .PTop-Left
-{
-	width: 8px;
-	height: 24px;
-	background: #ADC2E4;
-} 
-
-
-.portlet-neat .PTop-Left-Continuation
-{
-	width: 11px;
-	height: 24px;
-	background: #ADC2E4;
-}
-
-.portlet-neat .PMiddle-Left
-{
-	width: 8px;
-	background: #ADC2E4 url(content/neat/images/middle-left.gif) no-repeat;
-}
-
-.portlet-neat .PMiddle-Bottom-Left
-{
-	width: 8px;
-	height: 14px;
-	background: #ADC2E4 url(content/neat/images/middle-bottom-left.gif) no-repeat;
-}
-
-.portlet-neat .PBottom-Left
-{
-	width: 8px;
-	height: 8px;
-	background: #ADC2E4 url(content/neat/images/bottom-left.gif) no-repeat;
-}
-
-.portlet-neat .PCurve-Top
-{
-	width: 11px;
-	height: 8px;
-	background: #ADC2E4 url(content/neat/images/curve-top.gif) no-repeat;
-}
-
-.portlet-neat .PBlank-Middle
-{
-	width: 11px;
-	background: #FFFFFF;
-}
-
-.portlet-neat .PCurve-Bottom
-{
-	width: 11px;
-	height: 12px;
-	background: #ADC2E4 url(content/neat/images/curve-bottom.gif) no-repeat;
-	font-size: 0px;
+	display: inline;
+	float: left;
+	padding: 3px 0px 3px 10px;
+	font-weight: bold;
 }
 
-.portlet-neat .PBottom-Left-Continuation
-{
-	width: 11px;
-	height: 8px;
-	background: #ADC2E4 url(content/neat/images/bottom-left-continuation.gif) no-repeat;
-}
-
-.portlet-neat .PBottom
-{
-	height: 8px;
-	background: #ADC2E4 url(content/neat/images/bottom.gif) no-repeat;
-}
-
-.portlet-neat .PRight
-{
-	width: 8px;
-	background: #ADC2E4;
-}
-
-.portlet-neat .PRightImage
-{
-	width: 8px;
-	height: 8px;
-}
-
-
 .portlet-neat .PContent
 {
-    padding: 3px;
+	padding: 3px;
     /** overflow : scroll; **/
-    border: 0px solid #999999
+	border: 0px solid #999999;
+	border-top: 1px #D7DBDF solid;
 }
 
 .portlet-neat .PSeparator
 {
-	height: 10px;
+	height: 5px;
+	font-size:0px;
 }
 
 /* font */
-.portlet-neat .PTitle,
-.portlet-neat .PTitleContent
+.portlet-neat .PTitle
 {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-family: Arial, Tahoma, sans-serif;
     voice-family: "\"}\"";
     voice-family: inherit;
-    font-size: 80%;
+    font-size: 70%;
 }
 
 .portlet-neat .PContent
 {
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    voice-family: "\"}\"";
-    voice-family: inherit;
-    font-size: 90%;
-}
-
-.portlet-neat h1,h2,h3,h4
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	voice-family: "\"}\"";
+	voice-family: inherit;
+	font-size: 80%;
+	white-space: normal !important;
+	clear: both;
+	overflow: auto;
+}
+
+.portlet-neat .PContent p,
+.portlet-neat .PContent pre,
+.portlet-neat .PContent div,
+.portlet-neat .PContent input,
+.portlet-neat .PContent img,
+.portlet-neat .PContent textarea,
+.portlet-neat .PContent span
+{
+	overflow: auto;
+}
+
+.portlet-neat h1,
+.portlet-neat h2,
+.portlet-neat h3,
+.portlet-neat h4
 {
     color: #1D53A1;
 }
 
 .portlet-neat h1
 {
-	font-size: 100%;
+	font-size: 110%;
 }
 
 .portlet-neat h2
 {
-	font-size: 150%;
+	font-size: 120%;
 }
 
 .portlet-neat h3
 {
-	font-size: 170%;
+	font-size: 130%;
 }
 
 .portlet-neat h4
 {
-	font-size: 200%;
+	font-size: 170%;
 }
 
 .portlet-neat input, select, textarea
 {
 	border: 1px #ADC2E4 solid;
+	background: #FEFEFE;
 }
 
 .portlet-neat input, textarea
@@ -191,6 +127,11 @@
 	padding: 0px 4px 0px 4px;
 }
 
+.portlet-neat hr
+{
+	height: 1px;
+	
+}
 
 
 /* --------------------------------- */

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/decorator.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/decorator.vm?rev=239722&r1=239721&r2=239722&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/decorator.vm (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/decorator.vm Wed Aug 24 10:01:04 2005
@@ -25,87 +25,42 @@
 <!-- Begin portlet/html/neat/decorator.vm  -->
 
 <div id="portlet-${myF.id}" class="portlet-neat">
-
-<div  width="100%">
-
-##
-## Portlet Title Bar
-##
-#set ($cspan = 2)
-  
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-      <td class="PTop-Left"><img alt="Top Left Decorator" src="content/neat/images/top-left.gif"></td>
-      <td class="PTop-Left-Continuation"><img src="content/neat/images/top-left-continuation.gif" alt="Top Left Decorator continuation"></td>
-      <td rowSpan="1" colspan="2" class="PTitle">
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-	    <td class="PTitleContent" width="100%" valign="middle">
-	      $jetspeed.getTitle($myPE, $myF)
-	    </td>
-	    <td class="PTitleIcons" valign="middle">      
-              <table border="0" cellpadding="0" cellspacing="0">
-                <tr> 
- #foreach ($action in $actions)
-                  <td align="right" valign="middle">
-                    <a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}" alt="${action.Alt}" border="0"></a>
-                  </td>
-#end    
-                </tr>  
-              </table>
-	    </td>
-	  </tr>
-	</table>
-      </td>
-    </tr>
-    
-##
-## Portlet Content
-##
-#if ((!$jetspeed.isHidden($myF) || $jetspeed.WindowState != "minimized") && $myF.renderedContent != "")
-	<tr>
-		<td rowSpan="2" colspan="1" class="PMiddle-Left"></td>
-		<td class="PCurve-Top"></td>
-		<td rowSpan="3" colspan="1">
+	<div class="PortletDecorator">
+		##
+		## Portlet Title Bar
+		##
+		#set ($cspan = 2)
+		<div class="PHeader">
+			<div id="title-${myF.id}" class="PTitle">$jetspeed.getTitle($myPE, $myF)</div>
+			<div id="actions-${myF.id}" class="PActions">
+		#foreach ($action in $actions)
+			<!-- <a href='' title="${action.Name}" > --><img src="${action.Link}" alt="${action.Alt}" onclick="processAction('${myF.id}', '${action.Name}', '${action.Action}');"><!-- </a> ${action.Action} -->
+		#end
+			</div>
+		</div>
+		##
+		## Portlet Content
+		##
+		<div  id="content-${myF.id}">
+		#if ((!$jetspeed.isHidden($myF) || $jetspeed.WindowState != "minimized") && $myF.renderedContent != "")
 			<div class="PContent">
-			
 			#if($portletErrors && $portletErrors.size() > 0)
 			The following errors ocurred:<br />
 				#foreach($errorMsg in $portletErrors)
-				<p class="portlet-msg-error">$errorMsg</p>
+				<div class="portlet-msg-error">$errorMsg</div>
 				#end
 			#end
 			$myF.renderedContent
-			</div>   
-		</td>
-      		<td rowSpan="3" colspan="1" class="PRight"><img src="content/images/pixel.gif" class="PRightImage"></td>
-    	</tr>
-    	<tr>
-    		<td class="PBlank-Middle"></td>
-   	</tr>
-   	<tr>
-		<td class="PMiddle-Bottom-Left"></td>
-		<td class="PCurve-Bottom"></td>
-    	</tr>
-	
-	
-    <tr>
-      <td class="PBottom-Left"></td>
-      <td class="PBottom-Left-Continuation"></td>
-      <td rowSpan="1" colspan="2" class="PBottom"></td>
-    </tr>	
-#end
-
-
-  </table>
-      
-
-##
-## Portlet Bottom
-##
-    <div class="PSeparator" style="font-size:1pt;" nowrap="true">&nbsp;</div>
-  </div>
+			</div>
+		#end
+		</div>
+		
+		##
+		## Portlet Bottom
+		##
+	</div>
 </div>
+
 
 <!--  portlet/html/neat/decorator.vm -->
 

Added: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/background.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/background.gif?rev=239722&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/background.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/background.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/select.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/select.gif?rev=239722&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/select.gif
------------------------------------------------------------------------------
    svn:executable = *

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/images/select.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message