Author: ssmiweve
Date: 2008-03-24 13:51:46 +0100 (Mon, 24 Mar 2008)
New Revision: 6269

Added:
   trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/
   trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/
   trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/footer.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/globalSearch.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/head.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/no-hits.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPager.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-bottom.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-top.jsp
   trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/
   trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com/
   trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com/main.jsp
Removed:
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/footer.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/head.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/no-hits.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPager.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-bottom.jsp
   
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-top.jsp
   trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp
Log:
SEARCH-4302 - Building Sesam.com tutorial


Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/footer.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/footer.jsp
  2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/footer.jsp
  2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,32 +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$
--->
-<div id="footer_help">
-    <span>&copy;2008</span>
-    <jsp:text><![CDATA[&nbsp;&nbsp;]]></jsp:text>
-    <search:boomerang key="poweredBySesat"/>
-</div>
-</jsp:root>
\ No newline at end of file

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp
    2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp
    2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,104 +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 this 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   : globalSearch
-    Created on : 7/03/2008, 10:27:24
-    Author     : mick
-    Version    : $Id$
--->
-    <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>                        
-                        <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}" 
-                            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}"/>               
-
-                    <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>                        
-                        <br/>
-
-                        <c:if test="${not empty item.fields.fileformat}">
-                            <span class="timestamp"><search:text 
key="fileformat_${item.fields.fileformat}"/></span>
-                        </c:if>
-                        <c:if test="${not empty item.fields.body}">
-                            <span 
class="search_summary">${item.fields.body}</span>
-                        </c:if>
-
-                        <span class="search_small_url">
-                            ${item.fields.body}
-
-                            <!-- More hits from -->
-                            <c:if test="${not empty 
$DataModel.parameters.values.domain and 
$DataModel.parameters.values.domain.xmlEscaped eq $item.fields.site}">
-                              -
-                                <jsp:element name="a">
-                                    <jsp:attribute 
name="href"><search:boomerang 
url="/search/?c=${tab.key}&amp;q=${DataModel.searches[$commandName].query.utf8UrlEncoded}&amp;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: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:if>
-                        </span>
-                    </p>
-
-                </c:forEach>
-            </div>
-
-        </c:when>
-        <c:otherwise>
-            <search:include include="no-hits" />
-        </c:otherwise>
-    </c:choose>
-
-</jsp:root>

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/head.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/head.jsp
    2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/head.jsp
    2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,62 +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 this 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/>.
- *
-    Author     : mick
-    Version    : $Id$
--->
-<title><c:if test="${not empty 
DataModel.query.utf8UrlEncoded}">${DataModel.query.xmlEscaped} - </c:if> 
Sesam</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<!-- Rss -->
-<c:set var="msg_rss_link"><search:text key="rss_link"/></c:set>
-<link rel="alternate" type="application/rss+xml" title="${msg_rss_link}" 
href=""/>
-
-<!-- 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: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:forEach>
-<c:set var="w_link"><search:findResource url="/css/print-style.css"/></c:set>
-<link rel="stylesheet" type="text/css" href="${w_link}" media="print"/>
-
-<!-- Page Icons -->
-<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=*&#38;c=${tab.key}&#38;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>
-
-<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:forEach>
-
-</jsp:root>

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/no-hits.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/no-hits.jsp
 2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/no-hits.jsp
 2008-03-24 12:51:46 UTC (rev 6269)
@@ -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 this 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/>.
- *
-    Author     : mick
-    Version    : $Id$
--->
-<div id="nohits">
-    <p><search:text key="noHits" arg0="${DataModel.query.xmlEscaped}"/></p>
-    <p><search:text key="noHitsPossibleReasons"/></p>
-</div>
-</jsp:root>
\ No newline at end of file

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPager.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPager.jsp
     2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPager.jsp
     2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,47 +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="pages" 
value="${DataModel.navigation.navigations['offset'].results}"/>
-<c:if test="${pages.size gt 1}">
-<!-- #if ($pages.size() > 1) -->
-    <div id="offset">
-        <search:text 
key="result_pages"/><jsp:text><![CDATA[&nbsp;]]></jsp:text>
-        <ul id="offsetList">
-        <c:forEach var="page" items="${pages}">
-            <c:choose>
-                <c:when test="${page.selected}">
-                    <li class="active">${page.title}</li>
-                </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>
-                </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/templates/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
    2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
    2008-03-24 12:51:46 UTC (rev 6269)
@@ -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

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-bottom.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-bottom.jsp
        2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-bottom.jsp
        2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,33 +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 this 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/>.
- *
-    Author     : mick
-    Version    : $Id$
--->
-<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>
-    <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[&nbsp;]]></jsp:text></div>
-</form>
-</jsp:root>
\ No newline at end of file

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-top.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-top.jsp
   2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-top.jsp
   2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,37 +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 this 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/>.
- *
-    Author     : mick
-    Version    : $Id$
--->
-<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>
-    <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[&nbsp;]]></jsp:text></div>
-</form>
-</jsp:root>
\ No newline at end of file

Deleted: 
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp   
    2008-03-22 22:46:20 UTC (rev 6268)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp   
    2008-03-24 12:51:46 UTC (rev 6269)
@@ -1,69 +0,0 @@
-<?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   : main
-    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>
-        <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[&nbsp;]]></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="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

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/footer.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/footer.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/footer.jsp
                             (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/footer.jsp
     2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,32 @@
+<?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$
+-->
+<div id="footer_help">
+    <span>&copy;2008</span>
+    <jsp:text><![CDATA[&nbsp;&nbsp;]]></jsp:text>
+    <search:boomerang key="poweredBySesat"/>
+</div>
+</jsp:root>
\ No newline at end of file

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/globalSearch.jsp
 (from rev 6259, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/globalSearch.jsp
                               (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/globalSearch.jsp
       2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,104 @@
+<?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 this 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   : globalSearch
+    Created on : 7/03/2008, 10:27:24
+    Author     : mick
+    Version    : $Id$
+-->
+    <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>                        
+                        <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}" 
+                            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}"/>               
+
+                    <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>                        
+                        <br/>
+
+                        <c:if test="${not empty item.fields.fileformat}">
+                            <span class="timestamp"><search:text 
key="fileformat_${item.fields.fileformat}"/></span>
+                        </c:if>
+                        <c:if test="${not empty item.fields.body}">
+                            <span 
class="search_summary">${item.fields.body}</span>
+                        </c:if>
+
+                        <span class="search_small_url">
+                            ${item.fields.body}
+
+                            <!-- More hits from -->
+                            <c:if test="${not empty 
$DataModel.parameters.values.domain and 
$DataModel.parameters.values.domain.xmlEscaped eq $item.fields.site}">
+                              -
+                                <jsp:element name="a">
+                                    <jsp:attribute 
name="href"><search:boomerang 
url="/search/?c=${tab.key}&amp;q=${DataModel.searches[$commandName].query.utf8UrlEncoded}&amp;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: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:if>
+                        </span>
+                    </p>
+
+                </c:forEach>
+            </div>
+
+        </c:when>
+        <c:otherwise>
+            <search:include include="no-hits" />
+        </c:otherwise>
+    </c:choose>
+
+</jsp:root>

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/head.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/head.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/head.jsp
                               (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/head.jsp
       2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,62 @@
+<?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 this 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/>.
+ *
+    Author     : mick
+    Version    : $Id$
+-->
+<title><c:if test="${not empty 
DataModel.query.utf8UrlEncoded}">${DataModel.query.xmlEscaped} - </c:if> 
Sesam</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!-- Rss -->
+<c:set var="msg_rss_link"><search:text key="rss_link"/></c:set>
+<link rel="alternate" type="application/rss+xml" title="${msg_rss_link}" 
href=""/>
+
+<!-- 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: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:forEach>
+<c:set var="w_link"><search:findResource url="/css/print-style.css"/></c:set>
+<link rel="stylesheet" type="text/css" href="${w_link}" media="print"/>
+
+<!-- Page Icons -->
+<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=*&#38;c=${tab.key}&#38;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>
+
+<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:forEach>
+
+</jsp:root>

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/no-hits.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/no-hits.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/no-hits.jsp
                            (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/no-hits.jsp
    2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,30 @@
+<?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 this 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/>.
+ *
+    Author     : mick
+    Version    : $Id$
+-->
+<div id="nohits">
+    <p><search:text key="noHits" arg0="${DataModel.query.xmlEscaped}"/></p>
+    <p><search:text key="noHitsPossibleReasons"/></p>
+</div>
+</jsp:root>
\ No newline at end of file

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPager.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPager.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPager.jsp
                                (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPager.jsp
        2008-03-24 12:51:46 UTC (rev 6269)
@@ -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: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="pages" 
value="${DataModel.navigation.navigations['offset'].results}"/>
+<c:if test="${pages.size gt 1}">
+<!-- #if ($pages.size() > 1) -->
+    <div id="offset">
+        <search:text 
key="result_pages"/><jsp:text><![CDATA[&nbsp;]]></jsp:text>
+        <ul id="offsetList">
+        <c:forEach var="page" items="${pages}">
+            <c:choose>
+                <c:when test="${page.selected}">
+                    <li class="active">${page.title}</li>
+                </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>
+                </c:otherwise>
+            </c:choose>
+        </c:forEach>
+        </ul>
+        <search:include template="offsetPagerLogo"/>
+    </div>
+</c:if>
+</jsp:root>
\ No newline at end of file

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
                               (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/offsetPagerYahooLogo.jsp
       2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,30 @@
+<?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

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-bottom.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-bottom.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-bottom.jsp
                           (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-bottom.jsp
   2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,33 @@
+<?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 this 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/>.
+ *
+    Author     : mick
+    Version    : $Id$
+-->
+<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>
+    <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[&nbsp;]]></jsp:text></div>
+</form>
+</jsp:root>
\ No newline at end of file

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-top.jsp
 (from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/searchbar-top.jsp)
===================================================================
--- 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-top.jsp
                              (rev 0)
+++ 
trunk/generic.sesam/sesam.com/war/src/main/webapp/fragments/layout/sesam.com/searchbar-top.jsp
      2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,37 @@
+<?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 this 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/>.
+ *
+    Author     : mick
+    Version    : $Id$
+-->
+<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>
+    <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[&nbsp;]]></jsp:text></div>
+</form>
+</jsp:root>
\ No newline at end of file

Copied: 
trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com/main.jsp 
(from rev 6260, 
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp)
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com/main.jsp  
                        (rev 0)
+++ trunk/generic.sesam/sesam.com/war/src/main/webapp/pages/sesam.com/main.jsp  
2008-03-24 12:51:46 UTC (rev 6269)
@@ -0,0 +1,69 @@
+<?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   : main
+    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>
+        <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[&nbsp;]]></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="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

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to