portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns_jsp layout.jsp
Date Fri, 07 May 2004 02:44:08 GMT
taylor      2004/05/06 19:44:08

  Modified:    portal/src/webapp/WEB-INF/templates/vm clear-bottom.vm
                        clear-top.vm
               portal/src/webapp/WEB-INF/templates/layout/html/columns
                        layout.vm
               portal/src/webapp/WEB-INF/templates/layout/html/columns_jsp
                        layout.jsp
  Log:
  *** keyword substitution change ***
  
  Revision  Changes    Path
  1.3       +14 -14    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/vm/clear-bottom.vm
  
  Index: clear-bottom.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/vm/clear-bottom.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- clear-bottom.vm	18 Mar 2004 19:38:56 -0000	1.2
  +++ clear-bottom.vm	7 May 2004 02:44:08 -0000	1.3
  @@ -1,15 +1,15 @@
  -#*
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed 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
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  +#*
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed 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
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
   *#
  
  
  
  1.3       +14 -14    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/vm/clear-top.vm
  
  Index: clear-top.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/vm/clear-top.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- clear-top.vm	18 Mar 2004 19:38:56 -0000	1.2
  +++ clear-top.vm	7 May 2004 02:44:08 -0000	1.3
  @@ -1,15 +1,15 @@
  -#*
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed 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
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  +#*
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed 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
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
   *#
  
  
  
  1.4       +62 -62    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
  
  Index: layout.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- layout.vm	18 Mar 2004 19:38:44 -0000	1.3
  +++ layout.vm	7 May 2004 02:44:08 -0000	1.4
  @@ -1,62 +1,62 @@
  -#*
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed 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
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  -*#
  -
  -#set($table = $jetspeed.columns)
  -
  -#set($myPage = $jetspeed.page)
  -
  -#set($myFragment = $jetspeed.currentFragment)
  -
  -#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
  -
  -  
  - #if($myFragment.getDecorator())
  -        #set($decorator = $myFragment.getDecorator())
  -  #end
  -
  -  #if ($decorator)
  -        #set($decoTop = "${decorator}/decorator-top.vm")
  -        #set($decoBottom = "${decorator}/decorator-bottom.vm")
  -  #end
  -
  -<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
  -
  -
  -  #if (($decoTop) && ($myFragment == $myPage.getRootFragment()))
  -      #parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
  -  #end
  -
  -<table width="100%" cellspacing="0" cellpadding="0">
  -  <tr>
  -
  -     #foreach($entry in $table)
  -    <td valign="top">
  -       <table width="100%">
  -       #foreach($f in $entry)       
  -        <tr>
  -       	   	<td width="100%">
  -                ## get the decorated Portlet content
  -               $jetspeed.decorateAndInclude($f)                
  -     </td></tr>
  -      #end
  -     </table></td>
  -   #end
  -  </tr>
  -</table>
  -
  -#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
  -   #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
  -#end
  +#*
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed 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
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +*#
  +
  +#set($table = $jetspeed.columns)
  +
  +#set($myPage = $jetspeed.page)
  +
  +#set($myFragment = $jetspeed.currentFragment)
  +
  +#set($decorator = $myPage.getDefaultDecorator($myFragment.getType()))
  +
  +  
  + #if($myFragment.getDecorator())
  +        #set($decorator = $myFragment.getDecorator())
  +  #end
  +
  +  #if ($decorator)
  +        #set($decoTop = "${decorator}/decorator-top.vm")
  +        #set($decoBottom = "${decorator}/decorator-bottom.vm")
  +  #end
  +
  +<!-- Decorator  $decorator  ${decoTop} - ${decoBottom}-->
  +
  +
  +  #if (($decoTop) && ($myFragment == $myPage.getRootFragment()))
  +      #parse($jetspeed.getDecoration($decoTop, "layout").appRelativePath)
  +  #end
  +
  +<table width="100%" cellspacing="0" cellpadding="0">
  +  <tr>
  +
  +     #foreach($entry in $table)
  +    <td valign="top">
  +       <table width="100%">
  +       #foreach($f in $entry)       
  +        <tr>
  +       	   	<td width="100%">
  +                ## get the decorated Portlet content
  +               $jetspeed.decorateAndInclude($f)                
  +     </td></tr>
  +      #end
  +     </table></td>
  +   #end
  +  </tr>
  +</table>
  +
  +#if (($decoBottom ) && ($myFragment == $myPage.getRootFragment()))
  +   #parse($jetspeed.getDecoration($decoBottom, "layout").appRelativePath)
  +#end
  
  
  
  1.3       +91 -91    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns_jsp/layout.jsp
  
  Index: layout.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns_jsp/layout.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- layout.jsp	18 Mar 2004 19:38:50 -0000	1.2
  +++ layout.jsp	7 May 2004 02:44:08 -0000	1.3
  @@ -1,91 +1,91 @@
  -<%--
  -Copyright 2004 The Apache Software Foundation
  -
  -Licensed 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
  -
  -Unless required by applicable law or agreed to in writing, software
  -distributed under the License is distributed on an "AS IS" BASIS,
  -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -See the License for the specific language governing permissions and
  -limitations under the License.
  ---%>
  -<%@ page language="java" 
  -         import="javax.portlet.*, java.util.*, org.apache.jetspeed.aggregator.*, org.apache.jetspeed.om.page.*,org.apache.jetspeed.velocity.JetspeedPowerTool"
  -         session="false" %>
  -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -<portlet:defineObjects/>
  -
  -<% 
  -JetspeedPowerTool jetspeed = new JetspeedPowerTool(pageContext);
  -List[] table = jetpseed.getColumns();
  -Page myPage = jetspeed.getPage();
  -Fragment myFragment = jetspeed.getCurrentFragment();
  -org.apache.pluto.om.entity.PortletEntity portletEntity =jetspeed.getCurrentPortletEntity();
  -%>
  -
  -<%
  -  String decorator = myPage.getDefaultDecorator(myFragment.getType());
  -  String decoTop = null;
  -  String decoBottom = null;
  -  
  -  if (myFragment.getDecorator()!=null)
  -  {
  -        decorator = myFragment.getDecorator();
  -  }
  -
  -  if (decorator != null)
  -  {
  -        decoTop = decorator+"-top.jsp";
  -        decoBottom = decorator+"-bottom.jsp";
  -  }
  -%>
  -<!-- Decorator <%= decorator %>  <%=decoTop%>-<%=decoBottom%>-->
  -<%
  -  if ((decoTop != null) && (myFragment == myPage.getRootFragment()))
  -  {
  -%>
  -<jsp:include page="<%=decoTop%>" />
  -<%
  -  }
  -%>
  -<table width="100%" cellspacing="0" cellpadding="0">
  -  <tr>
  -  <%
  -     for(int i=0; i < table.length; i++)
  -     {
  -  %>
  -    <td valign="top"><table width="100%">
  -    <%
  -        for(Iterator it=table[i].iterator(); it.hasNext();)
  -        {
  -           Fragment f = (Fragment)it.next();
  -     %>
  -     <tr><td width="100%">
  -     <%
  -         jetspeed.decorateAndInclude(f);
  -      %>
  -
  -     </td></tr>
  -     <%
  -        }
  -     %>
  -     </table></td>
  -  <%
  -     }
  -  %>
  -  </tr>
  -</table>
  -<%
  -
  -  if ((decoBottom != null) && (myFragment == myPage.getRootFragment()))
  -  {
  -%>
  -<jsp:include page="<%=decoBottom%>" />
  -<%
  -  }
  -%>
  +<%--
  +Copyright 2004 The Apache Software Foundation
  +
  +Licensed 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
  +
  +Unless required by applicable law or agreed to in writing, software
  +distributed under the License is distributed on an "AS IS" BASIS,
  +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +See the License for the specific language governing permissions and
  +limitations under the License.
  +--%>
  +<%@ page language="java" 
  +         import="javax.portlet.*, java.util.*, org.apache.jetspeed.aggregator.*, org.apache.jetspeed.om.page.*,org.apache.jetspeed.velocity.JetspeedPowerTool"
  +         session="false" %>
  +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  +<portlet:defineObjects/>
  +
  +<% 
  +JetspeedPowerTool jetspeed = new JetspeedPowerTool(pageContext);
  +List[] table = jetpseed.getColumns();
  +Page myPage = jetspeed.getPage();
  +Fragment myFragment = jetspeed.getCurrentFragment();
  +org.apache.pluto.om.entity.PortletEntity portletEntity =jetspeed.getCurrentPortletEntity();
  +%>
  +
  +<%
  +  String decorator = myPage.getDefaultDecorator(myFragment.getType());
  +  String decoTop = null;
  +  String decoBottom = null;
  +  
  +  if (myFragment.getDecorator()!=null)
  +  {
  +        decorator = myFragment.getDecorator();
  +  }
  +
  +  if (decorator != null)
  +  {
  +        decoTop = decorator+"-top.jsp";
  +        decoBottom = decorator+"-bottom.jsp";
  +  }
  +%>
  +<!-- Decorator <%= decorator %>  <%=decoTop%>-<%=decoBottom%>-->
  +<%
  +  if ((decoTop != null) && (myFragment == myPage.getRootFragment()))
  +  {
  +%>
  +<jsp:include page="<%=decoTop%>" />
  +<%
  +  }
  +%>
  +<table width="100%" cellspacing="0" cellpadding="0">
  +  <tr>
  +  <%
  +     for(int i=0; i < table.length; i++)
  +     {
  +  %>
  +    <td valign="top"><table width="100%">
  +    <%
  +        for(Iterator it=table[i].iterator(); it.hasNext();)
  +        {
  +           Fragment f = (Fragment)it.next();
  +     %>
  +     <tr><td width="100%">
  +     <%
  +         jetspeed.decorateAndInclude(f);
  +      %>
  +
  +     </td></tr>
  +     <%
  +        }
  +     %>
  +     </table></td>
  +  <%
  +     }
  +  %>
  +  </tr>
  +</table>
  +<%
  +
  +  if ((decoBottom != null) && (myFragment == myPage.getRootFragment()))
  +  {
  +%>
  +<jsp:include page="<%=decoBottom%>" />
  +<%
  +  }
  +%>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message