Author: ssmiweve
Date: 2008-04-21 14:27:20 +0200 (Mon, 21 Apr 2008)
New Revision: 6516
Modified:
branches/2.17/generic.sesam/sesam.com/war/src/main/conf/views.xml
branches/2.17/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
Log:
base default tab got display-css="false" added.
Modified: branches/2.17/generic.sesam/sesam.com/war/src/main/conf/views.xml
===================================================================
--- branches/2.17/generic.sesam/sesam.com/war/src/main/conf/views.xml
2008-04-21 11:53:51 UTC (rev 6515)
+++ branches/2.17/generic.sesam/sesam.com/war/src/main/conf/views.xml
2008-04-21 12:27:20 UTC (rev 6516)
@@ -23,7 +23,11 @@
Purpose of the document follows.
-->
<views>
+ <!-- Override default to show its css -->
+ <tab id="default" display-css="true" inherit="default"/>
+ <!-- Our base sesam.com view -->
<tab id="default-sesam-com" inherit="default"/>
+ <!-- The one vertical we have. -->
<tab id="international" inherit="default-sesam-com"
key="g"
mode="international"
Modified:
branches/2.17/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
===================================================================
---
branches/2.17/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
2008-04-21 11:53:51 UTC (rev 6515)
+++
branches/2.17/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
2008-04-21 12:27:20 UTC (rev 6516)
@@ -33,13 +33,17 @@
<!-- Css -->
<c:forEach var="ww" items="${tab.css}">
<c:set var="ww_link"><search:findResource
url="/css/tab/${ww.id}.css"/></c:set>
- <link rel="stylesheet" type="text/css" href="${ww_link}" media="screen"/>
+ <c:if test="${not empty ww_link}">
+ <link rel="stylesheet" type="text/css" href="${ww_link}"
media="screen"/>
+ </c:if>
</c:forEach>
<c:forEach var="w" items="${tab.ancestry}">
<c:set var="w_link"><search:findResource
url="/css/tab/${w.id}.css"/></c:set>
- <link rel="stylesheet" type="text/css" href="${w_link}" media="screen"/>
+ <c:if test="${not empty w_link}">
+ <link rel="stylesheet" type="text/css" href="${w_link}"
media="screen"/>
+ </c:if>
</c:forEach>
-<c:set var="w_link"><search:findResource url="/css/print-style.css"/></c:set>
+<c:set var="w_link"><search:findResource url="/css/print.css"/></c:set>
<link rel="stylesheet" type="text/css" href="${w_link}" media="print"/>
<!-- Page Icons -->
@@ -55,7 +59,9 @@
<c:forEach var="js" items="${tab.javascript}">
<c:set var="js_link"><search:findResource
url="/javascript/${js}.js"/></c:set>
- <script type='text/javascript' src="${js_link}"></script>
+ <c:if test="${not empty js_link}">
+ <script type='text/javascript' src="${js_link}"></script>
+ </c:if>
</c:forEach>
</jsp:root>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
