Index: D:/java_files/eclipse/workspace/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm =================================================================== --- D:/java_files/eclipse/workspace/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (revision 370867) +++ D:/java_files/eclipse/workspace/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (working copy) @@ -1,3 +1,4 @@ + #* Copyright 2004 The Apache Software Foundation @@ -13,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. *# +#set($theme = $request.getAttribute("org.apache.jetspeed.theme")) #set($sizes = $jetspeed.columnSizes) @@ -22,9 +24,8 @@ #set($decorator = $myPage.getDefaultDecorator($myFragment.getType())) -#set($actions = $jetspeed.PageDecoratorActions) +#set($actions = $myFragment.decoration.actions) -#set($editing = false) #if($jetspeed.portletMode.toString() == "edit") #set($editing = true) #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1) @@ -32,30 +33,15 @@ #if($myFragment.getDecorator()) #set($decorator = $myFragment.getDecorator()) - #end - - #if ($decorator) - #set($decoTop = "${decorator}/header.vm") - #set($decoBottom = "${decorator}/footer.vm") - #end - + #end + +#parse($myFragment.decoration.header) - - #if (($decoTop) && ($myFragment == $myPage.getRootFragment())) - #parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath) - #end - #set($layoutType =$portletConfig.getInitParameter("layoutType")) #set($columnLayout = $renderRequest.getAttribute("columnLayout")) #set($decorationFactory = $renderRequest.getAttribute("decorationFactory")) #set($rc = $renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext")) - -
- - -
- #set ($dcnt = 0) #if($editing) @@ -69,151 +55,148 @@ #end + - #end + #set($layoutClass = "portal-layout") + #if($myFragment != $myPage.getRootFragment()) + #set($layoutClass = "portal-nested-layout") + #end +
+ + + #set ($columnIndex = 0) + #foreach($column in $columnLayout.columns) + + #set($columnFloat = $columnLayout.getColumnFloat($columnIndex)) + #set($columnWidth = $columnLayout.getColumnWidth($columnIndex)) -#set($layoutClass = "portal-layout") -#if($myFragment != $myPage.getRootFragment()) - #set($layoutClass = "portal-nested-layout") -#end -
-
- - #set ($sizeIndex = 0) - #set ($layoutImageBase = "${jetspeed.pageBasePath}/content/images") - #foreach($column in $columnLayout.columns) - #if ($sizes) - #if ($sizeIndex < $sizes.size()) - + #end -
- #else - - #end - #else - - #end - #set ($sizeIndex = $sizeIndex + 1) - - #foreach($f in $column) - - - #end + +
- #set($coords = $columnLayout.getCoordinate($f)) - #set($col = $coords.x) - #set($lastRow = $columnLayout.getLastRowNumber($col)) - #set($row = $coords.y) - #if($editing)
-
-
- - - - - - - - - - - - - + + #end - #if($editing) - - - #end - - - - #end - -
- #if($row > 0) - #set($upUrl = $renderResponse.createActionURL()) - $!upUrl.setParameter("move","1") - $!upUrl.setParameter("fragmentToMove","$f.id") - $!upUrl.setParameter("editingPage","$myPage.path") - - #end -
- #if($lastColumn > 0 && $col > 0) - #set($leftUrl = $renderResponse.createActionURL()) - $!leftUrl.setParameter("move","3") - $!leftUrl.setParameter("fragmentToMove","$f.id") - $!leftUrl.setParameter("editingPage","$myPage.path") - - #end - -   Position   - - #if($lastColumn > 0 && $col < $lastColumn) - #set($rightUrl = $renderResponse.createActionURL()) - $!rightUrl.setParameter("move","4") - $!rightUrl.setParameter("fragmentToMove","$f.id") - $!rightUrl.setParameter("editingPage","$myPage.path") - - #end - + ## ColumnLayout returns a .99% width for the last column, but IE seems to be unable to + ## handle this width in tables (results in a very narrow column) + ## very ugly hack: + #if( $columnWidth.endsWith(".99%") ) + #set($cw = $columnLayout.numberOfColumns.parseInt( $columnWidth.substring( 0, $columnWidth.indexOf(".") ) ) + 1 ) + + #else + #if( $columnWidth.endsWith(",99%") ) + #set($cw = $columnLayout.numberOfColumns.parseInt( $columnWidth.substring( 0, $columnWidth.indexOf(",") ) ) + 1 ) + + #else + + #end + #end + + + + +
+ #foreach($f in $column) +
+ - - - - - - - - - -
+ ## Set up coordinates for this fragment + #set($coords = $columnLayout.getCoordinate($f)) + #set($col = $coords.x) + #set($lastRow = $columnLayout.getLastRowNumber($col)) + #set($row = $coords.y) + + ## get the decorated Portlet content +
+ ## editing block + #if($editing) +
+ #set ($dcnt = $dcnt + 1) + #set($decUrl = $renderResponse.createActionURL()) + $!decUrl.setParameter("fragmentToMove","$f.id") + $!decUrl.setParameter("editingPage","$myPage.path") + #set ($temp = ".submit();") +
+ + ## Move portlet left + #if($lastColumn > 0 && $col > 0) + #set($leftUrl = $renderResponse.createActionURL()) + $!leftUrl.setParameter("move","3") + $!leftUrl.setParameter("fragmentToMove","$f.id") + $!leftUrl.setParameter("editingPage","$myPage.path") + + #end + + ## Move portlet up + #if($row > 0) + #set($upUrl = $renderResponse.createActionURL()) + $!upUrl.setParameter("move","1") + $!upUrl.setParameter("fragmentToMove","$f.id") + $!upUrl.setParameter("editingPage","$myPage.path") + + #end + + ## Remove portlet from page #set($deleter = $renderResponse.createActionURL()) $deleter.setParameter("deleteId","$f.id") $deleter.setParameter("page","$myPage") -   -
- #set ($dcnt = $dcnt + 1) - #set($decUrl = $renderResponse.createActionURL()) - $!decUrl.setParameter("fragmentToMove","$f.id") - $!decUrl.setParameter("editingPage","$myPage.path") - #set ($temp = ".submit();") - - - - -
- #if($row < $lastRow) - #set($downUrl = $renderResponse.createActionURL()) - $!downUrl.setParameter("move","2") - $!downUrl.setParameter("fragmentToMove","$f.id") - $!downUrl.setParameter("editingPage","$myPage.path") - - #end -
- - #end - ## get the decorated Portlet content - #if($f.type == "portlet") - $jetspeed.setCurrentFragment($f) + + + ## Move portlet down + #if($row < $lastRow) + #set($downUrl = $renderResponse.createActionURL()) + $!downUrl.setParameter("move","2") + $!downUrl.setParameter("fragmentToMove","$f.id") + $!downUrl.setParameter("editingPage","$myPage.path") + + #end + + ## Move portlet right + #if($lastColumn > 0 && $col < $lastColumn) + #set($rightUrl = $renderResponse.createActionURL()) + $!rightUrl.setParameter("move","4") + $!rightUrl.setParameter("fragmentToMove","$f.id") + $!rightUrl.setParameter("editingPage","$myPage.path") + + #end + + + #end + + #if($f.type == "portlet") + $jetspeed.setCurrentFragment($f) #parse($f.decoration.template) - #else + #else $jetspeed.setCurrentFragment($f) $f.renderedContent - #end - - ##$jetspeed.decorateAndInclude($f) + #end + +
-
+ #set ($columnIndex = $columnIndex + 1) +
-
+ + +
-#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment())) - #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath) -#end \ No newline at end of file + #if ($myFragment == $myPage.getRootFragment()) + #parse($myFragment.decoration.footer) + #end + +
+ + +