portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject svn commit: r233254 - in /portals/jetspeed-2/trunk/src/webapp/WEB-INF: decorations/layout/html/tigris/decorator-top.vm decorations/portlet/html/decorator.vm templates/layout/html/columns/layout.vm
Date Wed, 17 Aug 2005 19:56:04 GMT
Author: weaver
Date: Wed Aug 17 12:56:02 2005
New Revision: 233254

URL: http://svn.apache.org/viewcvs?rev=233254&view=rev
Log:
more layout tweaking.

Modified:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/html/decorator.vm
    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/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm?rev=233254&r1=233253&r2=233254&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
Wed Aug 17 12:56:02 2005
@@ -91,8 +91,8 @@
 	  #end
 	  #if($editing == true)    		  	  
 	    #set ($chooser = "${jetspeed.basePath}/Administrative/choosers/portlet-selector.psml")
-		
-        <a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$jetspeed.getAbsoluteUrl($imgsrc)"
border="0" title="Select"/></a>
+
+        <a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$response.encodeURL('content/images/select.gif')"
border="0" title="Add a Portlet"/></a>
 	  #end 
 	  
     </div>

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=233254&r1=233253&r2=233254&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
Aug 17 12:56:02 2005
@@ -31,7 +31,7 @@
 
 <!-- Begin: Fragment: ${myF.id} Decoration: ${decoratorId} -->
 
-<div id="portlet-${myF.id}" class="${decoratorId}">
+<div id="${myF.id}" class="${decoratorId}">
   <div class="PTitle" >
     <div class="PTitleContent">
       $jetspeed.getTitle($myPE, $myF)

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=233254&r1=233253&r2=233254&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
Aug 17 12:56:02 2005
@@ -49,21 +49,8 @@
 #set($layoutType =$portletConfig.getInitParameter("layoutType"))
 #set($columnLayout = $renderRequest.getAttribute("columnLayout"))
 
-#*
-<!-- 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}/Administrative/choosers/portlet-selector.psml")
-       <a href="javascript:openWindow('$response.encodeURL($chooser)')"><img src="$jetspeed.getAbsoluteUrl($imgsrc)"
border="0" title="Select"/></a>
-	 #end   
-  </div>
-#end
-*#
-  <div id="portal-layout-$htmlUtil.getSafeElementId($myPage.id)" class="portal-layout">
+
+  <div id="$renderResponse.namespace" class="portal-layout">
 	#set ($sizeIndex = 0)
     #set ($layoutImageBase = "${jetspeed.pageBasePath}/content/images")
 	#foreach($column in $columnLayout.columns)
@@ -138,22 +125,6 @@
 			 $f.renderedContent			
 		   #end
 		   </div>
-		 #end
-		 #if($column.size() == 0)
-			<!-- IE Hack -->
-			<div class="portal-layout-cell" >
-			  <div class="PTitle" >
-                <div class="PTitleContent">
-                  &nbsp;
-                </div>   
-                <div class="PActionBar">
-                  &nbsp;
-                </div>
-              </div>
-              <div class="PContent"><span style="line-height:0.005px;">&nbsp;</span>
-                &nbsp;
-              </div>  
-			</div>
 		 #end
 	  </div>
 	 #end



---------------------------------------------------------------------
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