Author: ssmiweve
Date: 2008-03-25 23:40:05 +0100 (Tue, 25 Mar 2008)
New Revision: 6273
Added:
trunk/generic.sesam/sesam.com/war/src/main/css/
trunk/generic.sesam/sesam.com/war/src/main/css/print.css
trunk/generic.sesam/sesam.com/war/src/main/css/tab/
trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
trunk/generic.sesam/sesam.com/war/src/main/images/
trunk/generic.sesam/sesam.com/war/src/main/images/favicon.gif
trunk/generic.sesam/sesam.com/war/src/main/images/international_icon.png
trunk/generic.sesam/sesam.com/war/src/main/images/logo.png
trunk/generic.sesam/sesam.com/war/src/main/images/search_button.png
trunk/generic.sesam/sesam.com/war/src/main/javascript/common.js
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
trunk/generic.sesam/war/src/main/css/tab/default.css
Removed:
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/
trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/
Modified:
trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
trunk/generic.sesam/sesam.com/war/src/main/conf/views.xml
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/no-hits.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/offsetPager.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-top.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/main.jsp
trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultItem.java
trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultList.java
trunk/result-spi/src/main/java/no/sesat/search/result/ResultList.java
trunk/war/src/main/webapp/WEB-INF/SearchPortal.tld
Log:
SEARCH-4302 - Building Sesam.com tutorial
Modified: trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
2008-03-25 11:11:57 UTC (rev 6272)
+++ trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,16 +4,16 @@
international_icon_alt=International search results
logo_alt=Sesam
-atom_link=Atom
-rss_link=RSS
international_search_results=Showing {0} - {1} of {2} results for <b>{3}</b>
moreHitsFrom=similar hits
goTopDomain=top of domain
result_pages=Pages:
noHits=No results for {0}
noHitsPossibleReasons=
-poweredBySesat=Powered by <a href="http://sesat.no";>Sesat</a>
+builtWithSesat=Built with <a href="http://sesat.no";>Sesat</a>
poweredByYahoo=Results from Yahoo index
+previous=previous
+next=next
# different file formats detected by FindFileFormatResultHandler
fileformat_text/html=
Modified: trunk/generic.sesam/sesam.com/war/src/main/conf/views.xml
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/conf/views.xml 2008-03-25
11:11:57 UTC (rev 6272)
+++ trunk/generic.sesam/sesam.com/war/src/main/conf/views.xml 2008-03-25
22:40:05 UTC (rev 6273)
@@ -23,7 +23,8 @@
Purpose of the document follows.
-->
<views>
- <tab id="international" inherit="default-internet"
+ <tab id="default-sesam-com" inherit="default"/>
+ <tab id="international" inherit="default-sesam-com"
key="g"
mode="international"
page-size="10"
@@ -33,8 +34,8 @@
<result-paging id="offset" command-name="globalSearch"
page-size="10" number-of-pages="10" hitcount-source="totalhits"/>
</navigation>
</navigation>
- <layout main="sesam.com/main.jsp">
- <include key="header-element" template="sesam.com/head.jsp"/>
+ <layout main="sesam.com/main.jsp" front="sesam.com/index.jsp">
+ <include key="head-element" template="sesam.com/head.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"/>
Added: trunk/generic.sesam/sesam.com/war/src/main/css/print.css
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/css/print.css
(rev 0)
+++ trunk/generic.sesam/sesam.com/war/src/main/css/print.css 2008-03-25
22:40:05 UTC (rev 6273)
@@ -0,0 +1,62 @@
+/** Copyright (2008) Schibsted Søk AS
+ * This file is part of SESAT.
+ *
+ * SESAT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SESAT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
+ *
+ Created on : 25/03/2008, 19:30:49
+ Author : mick
+ Description:
+ Default print styles for sesam.com skin.
+*/
+
+* {
+ margin: 0;
+ padding: 0;
+}
+
+html{
+ font-size: 62.5%;
+}
+
+body {
+ font-family: arial, sans-serif;
+ font-size: 1.1em;
+ background-color: #fff;
+}
+
+h1 {
+ font-size: 2em;
+}
+
+li {
+ list-style: none;
+}
+
+img {
+ border: none;
+}
+
+a {
+ color: #0000CC;
+}
+
+
+.printhide{
+ display:none;
+}
+
+.timestamp {
+ color: gray;
+ margin-left: 10px;
+}
\ No newline at end of file
Added: trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
(rev 0)
+++ trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
2008-03-25 22:40:05 UTC (rev 6273)
@@ -0,0 +1,177 @@
+/** Copyright (2008) Schibsted Søk AS
+ * This file is part of SESAT.
+ *
+ * SESAT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SESAT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
+ *
+ Created on : 25/03/2008, 19:30:49
+ Author : mick
+ Description:
+ Default styles for sesam.com skin.
+*/
+
+#frame {
+ width: 100%;
+}
+
+#header {
+ width: 100%;
+}
+
+#footer {
+ width: 100%;
+}
+
+/* =Header */
+
+#logo {
+}
+
+/* =Search boxes */
+
+#sf {
+ min-width: 800px;
+ background: url(/images/searchbar/bg.png) repeat-x;
+ margin-left: 15px;
+ padding-right: 15px;
+}
+
+#inputBox {
+ float: left;
+ margin: 27px 0px 0px 20px;
+ border: 1px solid #bcc5cc;
+ padding: 4px 2px 3px 2px;
+ font-weight: bold;
+ height: 16px;
+}
+
+#inputButton {
+ float: left;
+ margin: 27px 0px 0px 0px;
+ padding-right: 8px;
+}
+
+/* =Search Results */
+
+.resultlist a:visited {
+ color: #990099;
+}
+
+#resultlist {
+ clear: both;
+ padding-right: 15px;
+}
+
+#resultlist p {
+ padding-top: 18px;
+}
+
+#resultlist .search_summary {
+ display: block;
+ padding: 2px 0px;
+}
+
+#resultlist .search_big_url {
+ font-size: 0.9em;
+}
+
+#resultlist .search_big_url_icon {
+ vertical-align: bottom;
+}
+
+#resultlist .search_small_url {
+ color: #008000;
+ text-decoration: none;
+ display: block;
+}
+
+#resultHits {
+ font-size: 1.1em;
+ padding: 20px 0px 10px 0px;
+}
+
+#resultHits span {
+ float: left;
+}
+
+#resultHits img {
+ vertical-align: middle;
+ float: left;
+ padding-right: 8px;
+}
+
+#resultHits a {
+ float: right;
+ padding-left: 10px;
+}
+
+#resultHits #rss {
+ float: right;
+ padding: 2px 0px 0px 0px;
+}
+
+.more_hits_link {
+ color: #7777CC;
+}
+.more_hits_link_hide {
+ color: #7777CC;
+ display: none;
+}
+/* ------------------------------------------------------------------ */
+/* =FOOTER */
+
+#offset {
+ padding: 20px 0px 10px 15px;
+ clear: both;
+}
+
+#offset a {
+ text-decoration: none;
+ color: #3566d7;
+}
+
+#offset .active {
+ border: none;
+}
+
+#offset span {
+ float: left;
+ margin-left: 9px;
+ padding: 2px 6px;
+ border:1px solid #ccdbe4;
+}
+
+#offset div {
+ float: left;
+ padding: 2px 10px 0px 0px;
+}
+
+#offset img {
+ padding-left: 15px;
+}
+
+#footer_help {
+ clear: both;
+ padding: 20px 0px 20px 15px;
+}
+
+/* ------------------------------------------------------------------ */
+/* =NO HITS */
+
+#no_hits {
+ margin: 20px 0 0 10px;
+}
+
+#no_hits p {
+ margin-top: 10px;
+}
\ No newline at end of file
Added: trunk/generic.sesam/sesam.com/war/src/main/images/favicon.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/generic.sesam/sesam.com/war/src/main/images/favicon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/generic.sesam/sesam.com/war/src/main/images/international_icon.png
===================================================================
(Binary files differ)
Property changes on:
trunk/generic.sesam/sesam.com/war/src/main/images/international_icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/generic.sesam/sesam.com/war/src/main/images/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/generic.sesam/sesam.com/war/src/main/images/logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/generic.sesam/sesam.com/war/src/main/images/search_button.png
===================================================================
(Binary files differ)
Property changes on:
trunk/generic.sesam/sesam.com/war/src/main/images/search_button.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/generic.sesam/sesam.com/war/src/main/javascript/common.js
===================================================================
Copied:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments
(from rev 6269, trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments)
Copied:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout
(from rev 6272,
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout)
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/footer.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,7 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since SearchPortal.tld never exists in the skin -->
<!--
- * Copyright (2008) Schibsted S�k AS
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -20,12 +20,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with SESAT. If not, see <http://www.gnu.org/licenses/>.
*
- Document : main
Author : mick
Version : $Id$
-->
<div id="footer_help">
-
<jsp:text><![CDATA[<span>©2008</span><![CDATA[ ]]></jsp:text>
- <search:boomerang key="poweredBySesat"/>
+ <jsp:text><![CDATA[<span>©2008</span> ]]></jsp:text>
+ <search:text key="builtWithSesat"/>
</div>
</jsp:root>
\ No newline at end of file
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/globalSearch.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/globalSearch.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -3,8 +3,8 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since this never exists in the skin -->
-<!--
- * Copyright (2008) Schibsted S�k AS
+<!--
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -25,38 +25,33 @@
Author : mick
Version : $Id$
-->
+ <c:set var="commandName" value="globalSearch"/>
<c:choose>
<c:when test="${DataModel.searches[commandName].results.hitCount gt
0}">
<div id="resultlist">
<div id="resultHits">
<c:set var="msg_international_icon_alt"><search:text
key="international_icon_alt"/></c:set>
- <img src="/images/menu/icons/nettsok.png" width="16"
height="16" alt="${msg_international_icon_alt}"/>
- <span>
+ <img src="/images/international_icon.png" width="16"
height="16" alt="${msg_international_icon_alt}"/>
+ <span>
<c:set var="hitcount"><search:hitcount
hitcount="${$DataModel.searches[commandName].results.hitCount}"/></c:set>
- <search:text key="international_search_results"
-
arg0="${DataModel.navigation.navigations.offset.fields.currentPageFromCount}"
-
arg1="${DataModel.navigation.navigations.offset.fields.currentPageToCount}"
- arg2="${hitcount}"
+ <search:text key="international_search_results"
+
arg0="${DataModel.navigation.navigations.offset.fields.currentPageFromCount}"
+
arg1="${DataModel.navigation.navigations.offset.fields.currentPageToCount}"
+ arg2="${hitcount}"
arg3="${DataModel.query.utf8UrlEncoded}"/>
</span>
-
- <c:set var="msg_rss_link"><search:text
key="rss_link"/></c:set>
- <a href=""><search:text key="atom_link"/></a>
- <a href="">${msg_rss_link}</a>
- <img src="/images/rssTest.jpg" id="rss"
alt="${msg_rss_link}"/>
- <div class="clear"></div>
</div>
- <c:forEach
items="${DataModel.searches[commandName].results.results}" var="item" index="i">
- <c:set var="pos"
value="${DataModel.navigation.navigations.offset.fields.currentPageFromCount +
i}"/>
+ <c:forEach
items="${DataModel.searches[commandName].results.results}" var="item"
varStatus="loop">
+ <c:set var="i" value="${loop.count}"/>
+ <c:set var="pos"
value="${DataModel.navigation.navigations.offset.fields.currentPageFromCount +
i}"/>
<p id="p${i}">
- <jsp:element name="a">
- <jsp:attribute name="href"><search:boomerang
url="${item.fields.url}" param="category:results;pos:${pos}"/></jsp:attribute>
- <jsp:attribute
name="class">search_big_url</jsp:attribute>
- <jsp:body>${item.fields.title}</jsp:body> <!--
FIXME needs triming at like 70 characters -->
- </jsp:element>
+ <img class="search_big_url_icon"
src="http://${item.fields.site}/favicon.ico"/>
+ <jsp:text><![CDATA[ ]]></jsp:text>
+ <c:set var="item_href"><search:boomerang
url="${item.fields.clickurl}" param="category:results;pos:${pos}"/></c:set>
+ <a href="${item_href}"
class="search_big_url">${item.fields.title}</a>
<br/>
<c:if test="${not empty item.fields.fileformat}">
@@ -67,27 +62,21 @@
</c:if>
<span class="search_small_url">
- ${item.fields.body}
+ ${item.fields.url}
<!-- More hits from -->
- <c:if test="${not empty
$DataModel.parameters.values.domain and
$DataModel.parameters.values.domain.xmlEscaped eq $item.fields.site}">
+ <c:if test="${empty
$DataModel.parameters.values.domain or
$DataModel.parameters.values.domain.xmlEscaped ne $item.fields.site}">
-
- <jsp:element name="a">
- <jsp:attribute
name="href"><search:boomerang
url="/search/?c=${tab.key}&q=${DataModel.searches[$commandName].query.utf8UrlEncoded}&domain=${item.fields.site}"
param="category:results;pos:${pos}"/></jsp:attribute>
- <jsp:attribute
name="class">more_hits_link</jsp:attribute>
- <jsp:body><search:text
key="moreHitsFrom"/></jsp:body>
- </jsp:element>
+ <c:set var="moreHits_href"><search:boomerang
url="/search/?c=${tab.key}&q=${DataModel.searches[commandName].query.utf8UrlEncoded}&domain=${item.fields.site}"
param="category:results;pos:${pos}"/></c:set>
+ <a href="${moreHits_href}"
class="more_hits_link"><search:text key="moreHitsFrom"/></a>
</c:if>
<!-- To website's front page -->
<c:set var="site"
value="http://${item.fields.site}"/>
<c:if test="${site ne item.fields.url}">
-
- <jsp:element name="a">
- <jsp:attribute
name="href"><search:boomerang url="http://${item.fields.site}/";
param="category:navigation;subcategory:site;pos:${pos}"/></jsp:attribute>
- <jsp:attribute
name="class">search_big_url</jsp:attribute>
- <jsp:body><search:text
key="goTopDomain"/></jsp:body>
- </jsp:element>
+ <c:set
var="goTopDomain_href"><search:boomerang url="http://${item.fields.site}/";
param="category:navigation;subcategory:site;pos:${pos}"/></c:set>
+ <a href="${goTopDomain_href}"
class="search_big_url"><search:text key="goTopDomain"/></a>
</c:if>
</span>
</p>
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/head.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/head.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,7 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since this never exists in the skin -->
<!--
- * Copyright (2008) Schibsted S�k AS
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -46,11 +46,10 @@
<link rel="icon" href="/images/favicon.gif" type="image/x-icon" />
<link rel="shortcut icon" href="/images/favicon.gif" type="image/x-icon" />
-<link rel="search" type="application/opensearchdescription+xml"
title="Sesam.no" href="/search/?q=*&c=${tab.key}&output=opensearch"/>
+<!-- OpenSearch -->
+<link rel="search" type="application/opensearchdescription+xml"
title="Sesam.com" href="/search/?q=*&c=${tab.key}&output=opensearch"/>
<!-- JavaScript -->
-<c:set var="js_link"><search:findResource
url="/javascript/external/prototype.js"/></c:set>
-<script type='text/javascript' src="${js_link}"></script>
<c:set var="js_link"><search:findResource url="/javascript/common.js"/></c:set>
<script type='text/javascript' src="${js_link}"></script>
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/no-hits.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/no-hits.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/no-hits.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,7 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since this never exists in the skin -->
<!--
- * Copyright (2008) Schibsted S�k AS
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/offsetPager.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPager.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/offsetPager.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,7 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since SearchPortal.tld never exists in the skin -->
<!--
- * Copyright (2008) Schibsted S�k AS
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -24,24 +24,20 @@
Author : mick
Version : $Id$
-->
-<c:set var="pages"
value="${DataModel.navigation.navigations['offset'].results}"/>
-<c:if test="${pages.size gt 1}">
-<!-- #if ($pages.size() > 1) -->
+<c:if test="${DataModel.navigation.navigations['offset'].resultsSize gt 1}">
+ <c:set var="pages"
value="${DataModel.navigation.navigations['offset'].results}"/>
<div id="offset">
- <search:text
key="result_pages"/><jsp:text><![CDATA[ ]]></jsp:text>
- <ul id="offsetList">
+ <span class="active"><search:text
key="result_pages"/><jsp:text><![CDATA[ ]]></jsp:text></span>
<c:forEach var="page" items="${pages}">
<c:choose>
<c:when test="${page.selected}">
- <li class="active">${page.title}</li>
+ <span class="active">${page.title}</span>
</c:when><c:otherwise>
<c:set var="link_page"><search:boomerang url="${page.url}"
param="category:navigation;subcategory:paging"/></c:set>
- <li><a href="${link_page}">${item.title}</a></li>
+ <a href="${link_page}"><span>${page.title}</span></a>
</c:otherwise>
</c:choose>
</c:forEach>
- </ul>
- <search:include template="offsetPagerLogo"/>
</div>
</c:if>
</jsp:root>
\ No newline at end of file
Deleted:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="2.0"
- xmlns:jsp="http://java.sun.com/JSP/Page";
- xmlns:c="http://java.sun.com/jsp/jstl/core";
- xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since SearchPortal.tld never exists in the skin -->
-<!--
- * Copyright (2008) Schibsted S�k AS
- * This file is part of SESAT.
- *
- * SESAT is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * SESAT is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
- *
- Document : main
- Author : mick
- Version : $Id$
--->
-<c:set var="img_yahooLogo"><search:findResource
url="/images/yahoo.gif"/></c:set>
-<c:set var="msg_logo_alt"><search:text key="poweredByYahoo"/></c:set>
-<img src="${img_yahooLogo}" id="yahooSearch" alt="${msg_logo_alt}" />
-</jsp:root>
\ No newline at end of file
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-bottom.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,7 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since this never exists in the skin -->
<!--
- * Copyright (2008) Schibsted S�k AS
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
-->
<c:set var="link_action"><search:boomerang url="/search/"
param="category:search;subcategory:bottom"/></c:set>
<form name="sf" id="sf" action="${link_action}">
- <c:set var="img_inputButton"><search:findResource
url="/images/searchbar/search.gif"/></c:set>
+ <c:set var="img_inputButton"><search:findResource
url="/images/search_button.png"/></c:set>
<input type="text" id="inputBox" name="q" size="60"
value="${DataModel.query.xmlEscaped}"/>
<input type="image" id="inputButton" src="${img_inputButton}"/>
<div class="clearEl"><jsp:text><![CDATA[ ]]></jsp:text></div>
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-top.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-top.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-top.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -4,7 +4,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since this never exists in the skin -->
<!--
- * Copyright (2008) Schibsted S�k AS
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -23,13 +23,13 @@
Author : mick
Version : $Id$
-->
+<c:set var="msg_logo_alt"><search:text key="logo_alt"/></c:set>
+<c:set var="link_logo"><search:boomerang url="/"
param="category:static;subcategory:home"/></c:set>
+<c:set var="img_logo"><search:findResource url="/images/logo.png"/></c:set>
+<a href="${link_logo}"><img src="${img_logo}" id="logo" alt="${msg_logo_alt}"
/></a>
<c:set var="link_action"><search:boomerang url="/search/"
param="category:search;subcategory:top"/></c:set>
<form name="sf" id="sf" action="${link_action}">
- <c:set var="link_logo"><search:boomerang url="/"
param="category:static;subcategory:home"/></c:set>
- <c:set var="img_logo"><search:findResource url="/images/logo.png"/></c:set>
- <c:set var="img_inputButton"><search:findResource
url="/images/searchbar/search.gif"/></c:set>
- <c:set var="msg_logo_alt"><search:text key="logo_alt"/></c:set>
- <a href="${link_logo}"><img src="${img_logo}" id="logo" width="138"
height="38" alt="${msg_logo_alt}" /></a>
+ <c:set var="img_inputButton"><search:findResource
url="/images/search_button.png"/></c:set>
<input type="text" id="inputBox" name="q" size="60"
value="${DataModel.query.xmlEscaped}" tabindex="1" />
<input type="image" id="inputButton" src="${img_inputButton}" tabindex="2"
/>
<div class="clearEl"><jsp:text><![CDATA[ ]]></jsp:text></div>
Copied: trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages
(from rev 6269, trunk/generic.sesam/sesam.com/war/src/main/webapp/pages)
Copied:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com
(from rev 6272,
trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com)
Added:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
(rev 0)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since SearchPortal.tld never exists in the skin --><jsp:output
+ doctype-root-element="html"
+ doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; /><!--
+ * Copyright (2008) Schibsted Søk AS
+ * This file is part of SESAT.
+ *
+ * SESAT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SESAT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
+ *
+ Document : index
+ Author : mick
+ Version : $Id$
+--><html xmlns="http://www.w3.org/1999/xhtml";>
+<head>
+ <search:include include="head-element"/>
+</head>
+<body>
+ <div id="frame">
+ <div id="header">
+ <search:include include="top-col-one" />
+ <search:include include="top-col-two" />
+ <search:include include="top-col-three" />
+ </div>
+ <div id="footer">
+ <search:include include="bottom-col-one" />
+ <search:include include="bottom-col-two" />
+ <search:include include="bottom-col-three" />
+ <search:include include="bottom-col-four" />
+ </div>
+ </div>
+
+</body>
+</html>
+</jsp:root>
\ No newline at end of file
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/main.jsp
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com/main.jsp
2008-03-25 11:11:57 UTC (rev 6272)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/main.jsp
2008-03-25 22:40:05 UTC (rev 6273)
@@ -3,9 +3,8 @@
xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little
awkward since SearchPortal.tld never exists in the skin --><jsp:output
doctype-root-element="html"
doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; />
-<!--
- * Copyright (2008) Schibsted S�k AS
+
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; /><!--
+ * Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -24,8 +23,7 @@
Document : main
Author : mick
Version : $Id$
--->
-<html xmlns="http://www.w3.org/1999/xhtml";>
+--><html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<search:include include="head-element"/>
</head>
@@ -36,26 +34,13 @@
<search:include include="top-col-two" />
<search:include include="top-col-three" />
</div>
- <table cellspacing="0" cellpadding="0" style="width: 100%;">
- <tr>
- <td style="vertical-align: top; border-right: 1px solid
#DADADA;">
- <div id="main">
- <div
id="dummy"><jsp:text><![CDATA[ ]]></jsp:text></div>
- <search:include include="main-col-one" />
- <search:include include="main-col-two" />
- <search:include include="main-col-three" />
- <search:include include="main-col-four" />
- </div>
- </td>
- <td style="vertical-align: top;">
- <div id="sidebar">
- <search:include include="sidebar-col-one" />
- <search:include include="sidebar-col-two" />
- <search:include include="sidebar-col-three" />
- </div>
- </td>
- </tr>
- </table>
+ <div id="main">
+ <div id="dummy"><jsp:text><![CDATA[ ]]></jsp:text></div>
+ <search:include include="main-col-one" />
+ <search:include include="main-col-two" />
+ <search:include include="main-col-three" />
+ <search:include include="main-col-four" />
+ </div>
<div id="footer">
<search:include include="bottom-col-one" />
<search:include include="bottom-col-two" />
Added: trunk/generic.sesam/war/src/main/css/tab/default.css
===================================================================
--- trunk/generic.sesam/war/src/main/css/tab/default.css
(rev 0)
+++ trunk/generic.sesam/war/src/main/css/tab/default.css 2008-03-25
22:40:05 UTC (rev 6273)
@@ -0,0 +1,67 @@
+/** Copyright (2008) Schibsted Søk AS
+ * This file is part of SESAT.
+ *
+ * SESAT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SESAT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
+ *
+ Created on : 25/03/2008, 19:30:49
+ Author : mick
+ Description:
+ Global CSS definitions for Sesat.
+ Syntax recommendation http://www.w3.org/TR/REC-CSS2/
+*/
+
+* {
+ margin: 0px;
+ padding: 0px;
+}
+
+html{
+ font-size: 62.5%;
+}
+
+body {
+ font-family: arial, sans-serif;
+ font-size: 1.3em;
+ background-color: #fff;
+ padding-right: 15px;
+}
+
+li {
+ list-style: none;
+}
+
+img {
+ border: none;
+}
+
+a {
+ color: #0000CC;
+}
+
+#main {
+ padding-left: 15px;
+}
+
+.clearEl {
+ clear: both;
+ height: 0px;
+}
+
+.clear {
+ clear: both;
+}
+
+#dummy {
+ height: 0px;
+}
\ No newline at end of file
Modified:
trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultItem.java
===================================================================
--- trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultItem.java
2008-03-25 11:11:57 UTC (rev 6272)
+++ trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultItem.java
2008-03-25 22:40:05 UTC (rev 6273)
@@ -22,6 +22,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
/**
* A simple implementation of a search result item.
@@ -38,6 +39,7 @@
private static final String TITLE_KEY = "title";
private final HashMap<String,Serializable> fields = new
HashMap<String,Serializable>();
+ private final Map<String,Serializable> fieldsReadOnly =
Collections.unmodifiableMap(fields);
/**
*
@@ -88,6 +90,14 @@
final String fieldValue = (String) fields.get(field);
return fieldValue != null && fieldValue.trim().length() > 0 ?
fieldValue : null;
}
+
+ /**
+ * JavaBean standards access (read-only) to the fields map. Useful for
JSPs.
+ * @return the fields map, via Collections.unmodifiableMap(..)
+ */
+ public Map<String,Serializable> getFields(){
+ return fieldsReadOnly;
+ }
/**
*
Modified:
trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultList.java
===================================================================
--- trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultList.java
2008-03-25 11:11:57 UTC (rev 6272)
+++ trunk/result-spi/src/main/java/no/sesat/search/result/BasicResultList.java
2008-03-25 22:40:05 UTC (rev 6273)
@@ -1,4 +1,4 @@
-/* Copyright (2006-2007) Schibsted Søk AS
+/* Copyright (2006-2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -156,6 +156,11 @@
public List<T> getResults() {
return Collections.unmodifiableList(results);
}
+
+ /** JavaBean compatability for JSPs. **/
+ public int getResultsSize(){
+ return results.size();
+ }
/** [EMAIL PROTECTED] **/
@Override
Modified: trunk/result-spi/src/main/java/no/sesat/search/result/ResultList.java
===================================================================
--- trunk/result-spi/src/main/java/no/sesat/search/result/ResultList.java
2008-03-25 11:11:57 UTC (rev 6272)
+++ trunk/result-spi/src/main/java/no/sesat/search/result/ResultList.java
2008-03-25 22:40:05 UTC (rev 6273)
@@ -1,4 +1,4 @@
-/* Copyright (2007) Schibsted Søk AS
+/* Copyright (2007-2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -87,6 +87,7 @@
void removeResults();
/** Sorts the results according to the order induced by the specified
comparator.
+ * @param comparator
*/
void sortResults(final Comparator comparator);
Modified: trunk/war/src/main/webapp/WEB-INF/SearchPortal.tld
===================================================================
--- trunk/war/src/main/webapp/WEB-INF/SearchPortal.tld 2008-03-25 11:11:57 UTC
(rev 6272)
+++ trunk/war/src/main/webapp/WEB-INF/SearchPortal.tld 2008-03-25 22:40:05 UTC
(rev 6273)
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (2008) Schibsted Søk AS
+ * This file is part of SESAT.
+ *
+ * SESAT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SESAT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
+ *
+ Author : mick
+ Version : $Id$
+-->
<taglib version="2.0" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd">
<tlib-version>1.0</tlib-version>
<short-name>searchportal</short-name>
@@ -92,4 +112,15 @@
<type>int</type>
</attribute>
</tag>
+ <tag>
+ <name>findResource</name>
+ <tag-class>no.sesat.search.view.taglib.FindResourceTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>url</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>java.lang.String</type>
+ </attribute>
+ </tag>
</taglib>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
