Author: ssmiweve
Date: 2009-09-15 10:24:57 +0200 (Tue, 15 Sep 2009)
New Revision: 7282
Modified:
branches/2.18/generic.sesam/sesam.com/pom.xml
branches/2.18/generic.sesam/sesam.com/war/src/main/conf/views.xml
branches/2.18/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
Log:
- for every environment presume localhost:80 is accessible. makes
configuration for all easier.
- disable type-ahead suggestions
- remove search box on bottom
- remove attribution to yahoo. not required with yahoo! boss
Modified: branches/2.18/generic.sesam/sesam.com/pom.xml
===================================================================
--- branches/2.18/generic.sesam/sesam.com/pom.xml 2009-09-13 14:52:54 UTC
(rev 7281)
+++ branches/2.18/generic.sesam/sesam.com/pom.xml 2009-09-15 08:24:57 UTC
(rev 7282)
@@ -162,7 +162,7 @@
<properties>
<sesam.site>alpha.test.sesam.com</sesam.site>
<!-- The parent Site -->
-
<sesam.site.parent>generic.alpha.test.sesam:8084</sesam.site.parent>
+
<sesam.site.parent>generic.alpha.test.sesam</sesam.site.parent><!-- presume
localhost:80 is accessible -->
</properties>
</profile>
<profile>
@@ -173,7 +173,7 @@
<properties>
<sesam.site>nuclei.test.sesam.com</sesam.site>
<!-- The parent Site -->
-
<sesam.site.parent>generic.nuclei.test.sesam:8082</sesam.site.parent>
+
<sesam.site.parent>generic.nuclei.test.sesam</sesam.site.parent><!-- presume
localhost:80 is accessible -->
</properties>
</profile>
<profile>
@@ -184,7 +184,7 @@
<properties>
<sesam.site>beta.test.sesam.com</sesam.site>
<!-- The parent Site -->
-
<sesam.site.parent>generic.beta.test.sesam:8085</sesam.site.parent>
+
<sesam.site.parent>generic.beta.test.sesam</sesam.site.parent><!-- presume
localhost:80 is accessible -->
</properties>
</profile>
<profile>
@@ -195,7 +195,7 @@
<properties>
<sesam.site>electron.test.sesam.com</sesam.site>
<!-- The parent Site -->
-
<sesam.site.parent>generic.electron.test.sesam:8083</sesam.site.parent>
+
<sesam.site.parent>generic.electron.test.sesam</sesam.site.parent><!-- presume
localhost:80 is accessible -->
</properties>
</profile>
<profile>
@@ -206,7 +206,7 @@
<properties>
<sesam.site>gamma.test.sesam.com</sesam.site>
<!-- The parent Site -->
- <sesam.site.parent>generic.sesam:8086</sesam.site.parent>
+ <sesam.site.parent>generic.sesam</sesam.site.parent><!--
presume localhost:80 is accessible -->
</properties>
</profile>
@@ -219,7 +219,7 @@
<properties>
<sesam.site>sesam.com</sesam.site>
<!-- The parent Site -->
- <sesam.site.parent>generic.sesam:8080</sesam.site.parent>
+ <sesam.site.parent>generic.sesam</sesam.site.parent><!--
presume localhost:80 is accessible -->
</properties>
</profile>
</profiles>
Modified: branches/2.18/generic.sesam/sesam.com/war/src/main/conf/views.xml
===================================================================
--- branches/2.18/generic.sesam/sesam.com/war/src/main/conf/views.xml
2009-09-13 14:52:54 UTC (rev 7281)
+++ branches/2.18/generic.sesam/sesam.com/war/src/main/conf/views.xml
2009-09-15 08:24:57 UTC (rev 7282)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (2008) Schibsted ASA
+<!-- Copyright (2008-2009) Schibsted ASA
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
<!-- The one vertical we have. -->
<tab id="international" inherit="default-sesam-com"
key="g"
- mode="international"
+ mode="international"
page-size="10"
rss-result-name="globalSearch">
<navigation>
@@ -39,14 +39,16 @@
</navigation>
<layout main="sesam.com/main.jsp" front="sesam.com/index.jsp">
<include key="head-element" template="sesam.com/head.jsp"/>
- <include key="head-element-extra"
template="sesam.com/mwsuggest.jsp"/>
+ <!-- Uncomment to enable type-ahead suggestion using mediawiki's
library -->
+ <!--include key="head-element-extra"
template="sesam.com/mwsuggest.jsp"/-->
<include key="top-col-one" template="sesam.com/searchbar-top.jsp"/>
<include key="main-col-three"
template="sesam.com/globalSearch.jsp"/>
<include key="bottom-col-one"
template="sesam.com/offsetPager.jsp"/>
<include key="bottom-col-three" template="sesam.com/footer.jsp"/>
- <include key="bottom-col-two"
template="sesam.com/searchbar-bottom.jsp"/>
- <include key="offsetPagerLogo" template=""/>
- <include key="no-hits" template="sesam.com/no-hits.jsp"/>
+ <!-- Uncomment following to add search box under search results -->
+ <!--include key="bottom-col-two"
template="sesam.com/searchbar-bottom.jsp"/-->
+ <include key="offsetPagerLogo" template=""/>
+ <include key="no-hits" template="sesam.com/no-hits.jsp"/>
</layout>
</tab>
</views>
Modified:
branches/2.18/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
===================================================================
---
branches/2.18/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
2009-09-13 14:52:54 UTC (rev 7281)
+++
branches/2.18/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
2009-09-15 08:24:57 UTC (rev 7282)
@@ -26,24 +26,8 @@
<div id="footer_help">
<jsp:text><![CDATA[<div id="copyright">©2008-2009</div>]]></jsp:text>
<div id="builtWithSesat"><search:text key="builtWithSesat"/></div>
- <div id="resultsFromYahoo"><search:text key="resultsFromYahoo"/></div>
+ <!-- Uncomment to gove attribution to Yahoo! Not required with Yahoo! BOSS
-->
+ <!--div id="resultsFromYahoo"><search:text key="resultsFromYahoo"/></div-->
</div>
-<!-- This is to collect statistics against http://sesam.com -->
-<jsp:text><![CDATA[
- <script type='text/javascript' src='/javascript/tmv11.js'></script>
- <script type="text/javascript">
- <!--
- var tmsec = new Array(3);
- tmsec[0]="tmsec=sesam";
- tmsec[1]="tmsec=sesamsok";
- tmsec[2]="tmsec=sesamsok";
- getTMqs('','', 'sesam_no', 'no', 'iso-8859-15', tmsec);
- //-->
- </script>
- <noscript><div>
- <img
src="http://statistik-gallup.net/V11***sesam_no/no/iso-8859-15/tmsec=sesam&tmsec=sesamsok&tmsec=sesamsok";
alt="" />
- </div></noscript>
-]]></jsp:text>
-
</jsp:root>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
