Author: ssmiweve Date: 2008-03-26 18:28:34 +0100 (Wed, 26 Mar 2008) New Revision: 6275
Modified: trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css 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/pages/sesam.com/index.jsp trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/main.jsp trunk/war/src/main/webapp/WEB-INF/jsp/decorators/webDecorator.jsp trunk/war/src/main/webapp/index.jsp 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-26 14:06:15 UTC (rev 6274) +++ trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties 2008-03-26 17:28:34 UTC (rev 6275) @@ -12,7 +12,7 @@ noHitsPossibleReasons= builtWithSesat=Built with <a href="http://sesat.no";>Sesat</a> poweredByYahoo=Results from Yahoo index -previous=previous +prev=previous next=next # different file formats detected by FindFileFormatResultHandler Modified: 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 2008-03-26 14:06:15 UTC (rev 6274) +++ trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css 2008-03-26 17:28:34 UTC (rev 6275) @@ -20,18 +20,19 @@ Default styles for sesam.com skin. */ -#frame { - width: 100%; +body { /* overridden from default.css */ + font-family: arial, sans-serif; + font-size: 1.3em; + background-color: #fff; + padding-right: 15px; + text-align: center; } -#header { - width: 100%; +#frame { + margin: 10px auto; + text-align: left; } -#footer { - width: 100%; -} - /* =Header */ #logo { @@ -40,7 +41,7 @@ /* =Search boxes */ #sf { - min-width: 800px; + /*min-width: 800px;*/ background: url(/images/searchbar/bg.png) repeat-x; margin-left: 15px; padding-right: 15px; @@ -98,6 +99,7 @@ #resultHits { font-size: 1.1em; padding: 20px 0px 10px 0px; + margin-left: 15px; } #resultHits span { 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/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp 2008-03-26 14:06:15 UTC (rev 6274) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/searchbar-bottom.jsp 2008-03-26 17:28:34 UTC (rev 6275) @@ -23,6 +23,7 @@ Author : mick Version : $Id$ --> +<div class="clearEl"><jsp:text><![CDATA[ ]]></jsp:text></div> <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/search_button.png"/></c:set> Modified: 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 2008-03-26 14:06:15 UTC (rev 6274) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp 2008-03-26 17:28:34 UTC (rev 6275) @@ -31,13 +31,8 @@ <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> 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/WEB-INF/classes/pages/sesam.com/main.jsp 2008-03-26 14:06:15 UTC (rev 6274) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/main.jsp 2008-03-26 17:28:34 UTC (rev 6275) @@ -28,7 +28,7 @@ <search:include include="head-element"/> </head> <body> - <div id="frame"> + <table id="frame"><tr><td><!-- use a table instead of a div here to get automatic width plus centering. --> <div id="header"> <search:include include="top-col-one" /> <search:include include="top-col-two" /> @@ -46,8 +46,8 @@ <search:include include="bottom-col-two" /> <search:include include="bottom-col-three" /> <search:include include="bottom-col-four" /> - </div> - </div> + </div> + </td></tr></table> </body> </html> Modified: trunk/war/src/main/webapp/WEB-INF/jsp/decorators/webDecorator.jsp =================================================================== --- trunk/war/src/main/webapp/WEB-INF/jsp/decorators/webDecorator.jsp 2008-03-26 14:06:15 UTC (rev 6274) +++ trunk/war/src/main/webapp/WEB-INF/jsp/decorators/webDecorator.jsp 2008-03-26 17:28:34 UTC (rev 6275) @@ -18,6 +18,4 @@ -- -- @author <a href="mailto:[EMAIL PROTECTED]">Michael Semb Wever</a> -- @version $Id$ - --%> -<%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %> -<search:main/> \ No newline at end of file + --%><%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %><search:main/> \ No newline at end of file Modified: trunk/war/src/main/webapp/index.jsp =================================================================== --- trunk/war/src/main/webapp/index.jsp 2008-03-26 14:06:15 UTC (rev 6274) +++ trunk/war/src/main/webapp/index.jsp 2008-03-26 17:28:34 UTC (rev 6275) @@ -1,4 +1,4 @@ -<%-- Copyright (2006-2007) Schibsted Søk AS +<%-- Copyright (2006-2007) Schibsted S�k AS * This file is part of SESAT. * * SESAT is free software: you can redistribute it and/or modify @@ -13,168 +13,4 @@ * * You should have received a copy of the GNU Affero General Public License * along with SESAT. If not, see <http://www.gnu.org/licenses/>. ---%> -<%@ page - language="java" - errorPage="/internal-error.jsp" - contentType="text/html; charset=utf-8" - pageEncoding="UTF-8" - %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> -<%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %> -<%@ page import="no.sesat.search.site.Site"%> - -<% - final Site site = (Site)request.getAttribute(Site.NAME_KEY); - String locale = site.getLocale().toString(); - String openSearchUrlStandard = "/search/?q=*&c=d&output=opensearch"; -%> - -<search:velocity template="/pages/index"/> - -<c:if test="${!empty Missing_pagesindex_Template}"> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml";> - <head> - <title>Sesam</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link href="/css/front.css" rel="stylesheet" type="text/css" /> - <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="<%= openSearchUrlStandard %>%>" /> - <script type="text/javascript" language="JavaScript" src="/javascript/external/prototype.js"></script> - <script type="text/javascript" language="JavaScript" src="/javascript/index.js"></script> - <script type="text/javascript" language="JavaScript" src="/javascript/callAtIntervals.js"></script> - <script type="text/javascript" language="JavaScript" src="/javascript/openSearch.js"></script> - </head> - <body> - <img src="images/index/logo.png" id="logoIndex" width="215" height="61" alt="Sesamlogo" /> - <img src="images/index/menu_top.png" id="menuTop" width="151" height="23" alt="Sesamsøk" /> - <form name="sf" action="<search:boomerang url="/search/" param="category:front_search"/>" onsubmit='return check();'> - <div id="searchbar"> - <div id="menuMiddle"> - <img src="images/index/nettsok_30_30.gif" width="30" height="30" alt="Nettsøk logo" /> - Nettsøk - </div> - <input type="text" name="q" id="searchInput" onfocus="this.form.q.select();" /> - <script type="text/javascript"><!-- - var focusControl = document.forms["sf"].elements["q"]; - if (focusControl.type != "hidden" && !focusControl.disabled) { - focusControl.focus(); - } // --> - </script> - <input type="image" id="formSubmit" src="images/searchbar/nett.png" alt="" /> - <img src="images/searchbar/dropdown.png" id="dropdownImg" width="19" height="24" alt="Pil ned" /> - <a id="searchtip" href='<search:boomerang url="/search/?q=&page=1&parent=37&catid=82" param="category:static;subcategory=header"/>'>Søketips</a> - <div id="searchRadio"> - <input type="radio" name="c" value="d" checked="checked" /> På nettet - <input type="radio" name="c" value="g" onclick="globalsearch()" /> <span id="radioG">På norsk</span> - </div> - <div id="front_button_layer"> - <div id="cn" class="nb">Nyhetssøk</div> - <div id="cy" class="nb">Bedriftssøk</div> - <div id="cw" class="nb">Personsøk</div> - <div id="cp" class="nb">Bildesøk</div> - <div id="cb" class="nb">Bloggsøk</div> - <div id="ct" class="nb">TV-guide</div> - <div id="cwt" class="nb">NettTV-søk</div> - <div id="csw" class="nb">Værsøk</div> - <div id="cmap" class="nb">Kartsøk</div> - <div id="closeDD"> - <img src="../images/index/skjul_meny.png" width="21" height="20" alt="Skjul meny" /> - <span>Lukk</span> - </div> - </div> - </div> - </form> - <div id="nav"> - <% String hide = ""; String open = ""; %> - <script type="text/javascript" language="JavaScript"> - var menuCookie = getCookie("sesam_menu"); - if (menuCookie == "closed") { - <% hide = "style='display:none;"; %> - <% open = ""; %> - } else { - <% hide = ""; %> - <% open = "style='display:none;'"; %> - } - </script> - <div id="menutable" <%=hide %>> - <div class="navMain"> - <div> - <img src="images/menu/icons/nyheter.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/nyheter/siste/" param="category:front_service"/>' onclick="return strepNews(this);">Nyhetssøk</a> - </div> - <div> - <img src="images/menu/icons/bedrift.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/katalog/" param="category:front_service"/>' onclick="return strepKatalog(this);">Bedriftssøk</a> - </div> - <div> - <img src="images/menu/icons/person.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/person/" param="category:front_service"/>' onclick="return strepKatalog(this);">Personsøk</a> - </div> - <div> - <img src="images/menu/icons/bilde.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/search/?c=p" param="category:front_service"/>' onclick="return strep(this);">Bildesøk</a> - </div> - <div> - <img src="images/menu/icons/blogg.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/search/?c=b" param="category:front_service"/>' onclick="return strep(this);">Bloggsøk</a> - </div> - <div> - <img src="images/menu/icons/tv.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/search/?c=t" param="category:front_service"/>' onclick="return strep(this);">TV-guide</a> - </div> - <div> - <img src="images/menu/icons/webtv.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/search/?c=wt" param="category:front_service"/>' onclick="return strep(this);">NettTV-søk</a> - </div> - <div> - <img src="images/menu/icons/ver.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/search/?c=sw" param="category:front_service"/>' onclick="return strep(this);">Værsøk</a> - </div> - <div> - <img src="images/menu/icons/kart.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="http://kart.sesam.no/search/?c=map"; param="category:front_service"/>' onclick="return strep(this);">Kartsøk</a><span class="betaNavbar">beta</span> - </div> - </div> - <div id="navToggleHide"> - <img src="images/index/skjul_meny.png" width="21" height="20" alt="" /> - <span>Skjul meny</span> - </div> - </div> - <div id="menuopen" <%=open %> > - <div id="navToggleOpen"> - <img src="images/index/vis_meny.png" width="21" height="20" alt="" /> - <span>Vis meny</span> - </div> - </div> - </div> - <div id="articles"> - <search:velocity template="/fragments/layout/publish/index"/> - </div> - </div> - <div style="clear: both;"></div> - <div id="footer_space_index"> - <search:velocity template="/fragments/layout/publish/footer"/> - </div> - - <!-- start gallup --> - <% if ( "no".equals(locale) ) { %> - <script type='text/javascript' language='JavaScript' src='/javascript/tmv11.js'></script> - <script type="text/javascript" language="JavaScript"><!-- - var tmsec = new Array(3); - tmsec[0]="tmsec=sesam"; - tmsec[1]="tmsec=sesamforside"; - tmsec[2]="tmsec=sesamforside"; - getTMqs('','', 'sesam_no', 'no', 'iso-8859-15', tmsec); - //--> - </script> - <noscript><img src="http://statistik-gallup.net/V11***sesam_no/no/iso-8859-15/tmsec=sesam&tmsec=sesamforside&tmsec=sesamforside"; alt="" /></noscript> - <% } %> - <!-- end gallup --> - - </body> -</html> -</c:if> +--%><%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %><search:main/> \ No newline at end of file
_______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
