You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2005/11/30 19:11:21 UTC
svn commit: r350005 - in /portals/jetspeed-2/trunk/src/webapp/WEB-INF:
decorations/layout/html/tigris/css/ decorations/portlet/html/
decorations/portlet/html/blue-gradient/css/
decorations/portlet/html/gray-gradient-noborder/css/
decorations/portlet/ht...
Author: weaver
Date: Wed Nov 30 10:11:15 2005
New Revision: 350005
URL: http://svn.apache.org/viewcvs?rev=350005&view=rev
Log:
JS2-400:
- Column wrapping now fixed in IE.
- Profiler Admin appears to be displaying correctly.
- Fixed an odd issue in IE were the specification of the height for .PTitle cause an od
indentation in the title bar. Compenstated for removal of height using padding instead.
- Removed hard coding of the leftcol's width. Specification moved to stylesheet.
- Removed "layout-gutter" as it is unneeded now.
- Sizing of column width's is now relative using percentages instead of fixed widths and is
now also based on the type of layout in use i.e. TwoColumns, OneColumn and ThreeColumns now
can now be adjusted via a CSS cascade.
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css Wed Nov 30 10:11:15 2005
@@ -56,11 +56,6 @@
padding: 0;
}
-.PTitle
-{
-
-}
-
.Link
{
@@ -213,7 +208,9 @@
border-top: 1px solid #999;
}
-.layout-tigris #leftcol {
+.layout-tigris #leftcol
+{
+ width: 15%;
voice-family: "\"}\"";
voice-family: inherit;
font-size: x-small;
@@ -371,21 +368,44 @@
display: inline;
}
-.portal-layout-column
+
+
+
+.layout-tigris .portal-layout
+{
+ padding-top:6px;
+}
+
+
+
+/** TwoColumn Sepcific widths */
+.layout-tigris .portal-layout-TwoColumns .portal-layout-column
{
- float: left;
+ padding-left:1%;
+ width: 48%;
+ float: left;
}
-.portal-layout-column-gutter
+
+/** TwoColumn Sepcific widths */
+.layout-tigris .portal-layout-OneColumn .portal-layout-column
+{
+ padding-left:1%;
+ padding-right:1%;
+ width: 97%;
+ float: left;
+}
+
+
+/** TwoColumn Sepcific widths */
+.layout-tigris .portal-layout-ThreeColumns .portal-layout-column
{
- /** This is the "gutter" setting for columns */
- padding-right: 4px;
- padding-top: 4px;
+ padding-left:1%;
+ width: 31%;
+ float: left;
}
.portal-layout-cell
{
- width: 100%;
- height:100%;
padding-bottom: 4px;
}
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/blue-gradient/css/styles.css Wed Nov 30 10:11:15 2005
@@ -18,20 +18,15 @@
.blue-gradient .PTitle
{
- width: 100%;
+ padding-top: 2px;
+ padding-bottom: 16px;
+ padding-right: 2px;
border-left: 1px solid #517B94;
border-right: 1px solid #517B94;
border-top: 1px solid #517B94;
color: #01375D;
background-image: url(content/blue-gradient/images/grad2blue.png);
-
- /**
- Specify the height of the image used
- else it will use the text height
- **/
- height:16px;
-
}
.blue-gradient .PTitleContent
@@ -39,30 +34,21 @@
font-weight:bold;
display: inline;
float: left;
- padding-left: 2px;
- padding-top: 2px;
+
}
.blue-gradient .PActionBar
{
float: right;
display: inline;
- padding-right: 2px;
- padding-top: 2px;
+
}
.blue-gradient .PContent
{
- width: 100%;
border-left: 1px solid #517B94;
border-right: 1px solid #517B94;
border-bottom: 1px solid #517B94;
-}
-
-.blue-gradient .PContent
-{
- \width: 110%;
- w\idth: 100%;
}
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm Wed Nov 30 10:11:15 2005
@@ -41,7 +41,9 @@
#foreach ($action in $actions)
<a href="${action.Action}" title="${action.Name}" ><img src="${action.Link}" alt="${action.Alt}" border="0" /></a>
#end
- </div>
+
+ </div>
+
</div>
#if (!$jetspeed.isHidden($myF) || $jetspeed.WindowState != "minimized")
<div class="PContent"><span style="line-height:0.005px;"> </span>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient-noborder/css/styles.css Wed Nov 30 10:11:15 2005
@@ -21,16 +21,12 @@
.gray-gradient-noborder .PTitle
{
- padding: 2px;
+ padding-top: 2px;
+ padding-bottom: 16px;
+ padding-right: 2px;
color: #01375D;
- background-image: url(content/gray-gradient-noborder/images/grad2gray.png);
-
- /**
- Specify the height of the image used
- else it will use the text height
- **/
- height:16px;
+ background-image: url(content/gray-gradient-noborder/images/grad2gray.png);
}
.gray-gradient-noborder .PTitleContent
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/gray-gradient/css/styles.css Wed Nov 30 10:11:15 2005
@@ -23,19 +23,16 @@
.gray-gradient .PTitle
{
- padding: 2px;
+ padding-top: 2px;
+ padding-bottom: 16px;
+ padding-right: 2px;
border-left: 1px solid #999999;
border-right: 1px solid #999999;
border-top: 1px solid #999999;
color: #01375D;
- background-image: url(content/gray-gradient/images/grad2gray.png);
-
- /**
- Specify the height of the image used
- else it will use the text height
- **/
- height:16px;
+ background-image: url(content/gray-gradient/images/grad2gray.png);
+
}
.gray-gradient .PTitleContent
@@ -65,7 +62,7 @@
border-left: 1px solid #999999;
border-right: 1px solid #999999;
border-bottom: 1px solid #999999;
- padding-left: 1em;
+
}
.gray-gradient .PContentRight
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css Wed Nov 30 10:11:15 2005
@@ -24,7 +24,10 @@
.portlet-tigris .PTitle
{
- padding: 2px;
+
+ padding-top: 2px;
+ padding-bottom: 16px;
+ padding-right: 2px;
border-left: 1px solid #DDDDDD;
border-right: 1px solid #666666;
border-top: 1px solid #DDDDDD;
@@ -32,11 +35,7 @@
color: #000000;
background-color: #DDDDDD;
- /**
- Specify the height of the image used
- else it will use the text height
- **/
- height:16px;
+
}
.portlet-tigris .PTitleContent
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=350005&r1=350004&r2=350005&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm Wed Nov 30 10:11:15 2005
@@ -49,20 +49,21 @@
#set($layoutType =$portletConfig.getInitParameter("layoutType"))
#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
-
- <div id="$renderResponse.namespace" class="portal-layout">
+ <div id="$renderResponse.namespace" class="portal-layout portal-layout-$layoutType">
#set ($sizeIndex = 0)
#set ($layoutImageBase = "${jetspeed.pageBasePath}/content/images")
#foreach($column in $columnLayout.columns)
#set($columnWidth = "auto")
+ #*
#if ($columnLayout.getColumnWidth($sizeIndex) > 0)
#set($columnWidth = $columnLayout.getColumnWidth($sizeIndex))
#end
+ *#
#set ($sizeIndex = $sizeIndex + 1)
- <div class="portal-layout-column" style="width:${columnWidth}%;">
- <div class="portal-layout-column-gutter">
+ <div id="column-$sizeIndex" class="portal-layout-column" >
+ <!-- <div class="portal-layout-column-gutter"> -->
#foreach($f in $column)
## Set up coordinates for this fragment
@@ -133,7 +134,7 @@
#end
</div>
#end
- </div>
+ <!-- </div> -->
</div>
#end
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org