Author: woonsan
Date: Wed Aug 8 23:24:56 2007
New Revision: 564109
URL: http://svn.apache.org/viewvc?view=rev&rev=564109
Log:
JS2-762: Cannot return to view mode after changing to simple layout theme in
page edit mode.
The simple theme will show simple text-based links to show actions (View|Edit,
Help) on the top right of the page.
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/decorator-macros.vm
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/header.vm
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/decorator-macros.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/decorator-macros.vm?view=diff&rev=564109&r1=564108&r2=564109
==============================================================================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/decorator-macros.vm
(original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/decorator-macros.vm
Wed Aug 8 23:24:56 2007
@@ -104,3 +104,14 @@
</tr>
</table>
#end
+
+#macro (PageActionBar)
+ #set($_actions = $layoutDecoration.actions)
+ <div align="right">
+ #if($_actions.size() >0)
+ #foreach ($_action in $_actions)
+ <a href="${_action.Action}" title="${_action.Name}" class="action
pageAction" >${_action.Alt}</a>
+ #end
+ #end
+ </div>
+#end
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/header.vm?view=diff&rev=564109&r1=564108&r2=564109
==============================================================================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/header.vm
(original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/decorations/layout/simple/header.vm
Wed Aug 8 23:24:56 2007
@@ -1,9 +1,9 @@
#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
@@ -42,3 +42,5 @@
<meta name="description" content="#PageDescription()" />
</head>
<body marginwidth="0" marginheight="0" class="#PageBaseCSSClass()">
+
+ #PageActionBar()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
