Author: vkumar
Date: Mon Oct 13 22:45:40 2008
New Revision: 704321
URL: http://svn.apache.org/viewvc?rev=704321&view=rev
Log:
Patch applied from Vitaly Baranovsky for Jira Issue
https://issues.apache.org/jira/browse/JS2-848
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=704321&r1=704320&r2=704321&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Mon Oct 13 22:45:40 2008
@@ -177,13 +177,13 @@
<input type="hidden" name="remove" value="">
<label
for="decorators">$messages.getString("portal.page.editing.portlet.decorator")</label>
<select id="decorators" name="decorators">
- <option value=''>
- #foreach($pd in
$decorationFactory.getPortletDecorations($rc))
+ <option value=''>
#set ($fd = "")
- #if (!$f.Decorator)
+ #if ($f.Decorator)
#set ($fd = $f.Decorator)
#end
- <option value='$pd' #if ($pd == $fd) SELECTED #end>$pd
+ #foreach($pd in
$decorationFactory.getPortletDecorations($rc))
+ <option value='$pd' #if ($pd == $fd) SELECTED #end>$pd
#end
</select>
<input type="submit" name="jsChangeThemeAll"
value="$messages.getString("portal.page.editing.changethemeall")"/>
@@ -317,7 +317,6 @@
## get the decorated Portlet content
<div class="portal-layout-cell
portal-layout-cell-${layoutType}-${row}-${col}" >
-
## editing block
#if($editing)
<div class="portlet-edit-bar">
@@ -332,7 +331,7 @@
<select id='decorator' name='decorator'
onChange="$form$dcnt$submit">
<option value=''>
#set ($fd = "")
- #if (!$f.Decorator)
+ #if ($f.Decorator)
#set ($fd = $f.Decorator)
#end
#foreach($pd in
$decorationFactory.getPortletDecorations($rc))
@@ -373,8 +372,7 @@
#end
</form>
</div>
- #end
-
+ #end
## Now get the real content
$jetspeed.setCurrentFragment($f)
#if($f.type == "portlet")
@@ -386,16 +384,13 @@
#end
</div>
#set ($columnIndex = $columnIndex + 1)
-#end
-
+#end
</div>
-
<br style="clear:both;"/>
-
#if ($isRoot)
<form name='portletform' action="" method="post">
<input type='hidden' name='portlets'/>
<input type='hidden' name='page' value='$myPage'/>
</form>
#parse($myFragment.decoration.footer)
-#end
+#end
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
