Author: ssmiweve
Date: 2008-03-11 22:24:37 +0100 (Tue, 11 Mar 2008)
New Revision: 6242
Added:
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp
Modified:
trunk/generic.sesam/sesam.com/
trunk/generic.sesam/sesam.com/war/
trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
trunk/generic.sesam/sesam.com/war/src/main/conf/modes.xml
trunk/generic.sesam/sesam.com/war/src/main/conf/views.xml
Log:
SEARCH-4302
Property changes on: trunk/generic.sesam/sesam.com
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: trunk/generic.sesam/sesam.com/war
___________________________________________________________________
Name: svn:ignore
+ target
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-11 13:22:00 UTC (rev 6241)
+++ trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
2008-03-11 21:24:37 UTC (rev 6242)
@@ -0,0 +1,27 @@
+
+international_icon_alt=International search results
+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
+
+# different file formats detected by FindFileFormatResultHandler
+fileformat_text/html=
+fileformat_text/asp=
+fileformat_text/x-server-parsed-html=
+fileformat_text/plain=[txt]
+fileformat_application/pdf=[pdf]
+fileformat_application/msword=[word]
+fileformat_application/vnd.ms-powerpoint=[power point]
+fileformat_application/vnd.ms-excel=[excel]
+# TODO see SEARCH-2112
+fileformat_application/vnd.ms-project=
+fileformat_application/vnd.ms-works=
+fileformat_application/wordperfect5.1=
+fileformat_multipart/alternative=
+fileformat_multipart/mixed=
+fileformat_text/richtext=
+fileformat_text/rtf=
+fileformat_message/rfc822=
+fileformat_application/xml=[xml]
\ No newline at end of file
Modified: trunk/generic.sesam/sesam.com/war/src/main/conf/modes.xml
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/conf/modes.xml 2008-03-11
13:22:00 UTC (rev 6241)
+++ trunk/generic.sesam/sesam.com/war/src/main/conf/modes.xml 2008-03-11
21:24:37 UTC (rev 6242)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (2006-2007) 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
@@ -15,7 +14,7 @@
*
* 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 : modes.xml
Created on : 4 April 2006, 16:09
Author : mick
@@ -25,244 +24,31 @@
<modes template-prefix="default-">
+ <mode id="default-mode" analysis="false" inherit="default-magic">
+ <!-- mode inheritence is a restricted one child to one parent
relationship
+ so we inherit default-magic -->
- <!-- defaults -->
- <mode id="default-empty-mode" executor="parallel" analysis="false"></mode>
-
- <mode id="default-mode" executor="parallel" analysis="false">
-
- <command id="default-command"
- field-filters="site,size"
- paging="false"
- query-parameter=""
- result-fields=""
- results-to-return="1"/>
-
- <fast-command id="default-fast-command" inherit="default-command"
- clustering="false"
- collapsing="false"
- collections=""
- filter=""
- keyword-clustering="false"
- ignore-navigation="false"
- lemmatize="false"
- offensive-score-limit="0"
- qt-pipeline=""
- query-server-url=""
- sort-by=""
- spam-score-limit="0"
- spellcheck="false"
- synonyms="false"/>
-
- <static-command id="default-static-command" inherit="default-command"/>
-
- <esp-fast-command id="default-esp-fast-command"
inherit="default-command"/>
-
- <math-command id="default-math-command" inherit="default-command"/>
-
-
- <!-- when overriding this command, remember to adjust partnerid
according to this:
-
https://dev.schibstedsok.no/confluence/display/TECHDEV/Technology+Documentation+-+Overture+PPC
- This must also be done with new sitesearches.
- -->
- <overture-ppc-command id="default-overture-ppc-command"
inherit="default-command"
- encoding="iso-8859-1"
- host="overtureHost"
- partner-id="overturePartnerId"
- port="overturePort"
- results-to-return="6"
-
url="/d/search/p/schibstedsok/xml/no/?mkt=no&adultFilter=clean"
- statistical-name="overture_ads"/>
-
- <platefood-ppc-command id="default-platefood-ppc-command"
inherit="default-command"
- encoding="UTF-8"
- host="platefoodHost"
- host-header="pfp.sesam.no"
- port="platefoodPort"
- results-to-return="4"
- url="/publisher/search?"
- statistical-name="platefood_ads"/>
-
-
- <yahoo-idp-command id="default-yahoo-command" inherit="default-command"
- encoding="utf-8"
- field-filters="site AS domain"
- filter="-porn"
- port="yahooIdpPort"
- region-mix=""
- language-mix=""
+ <yahoo-idp-command id="default-yahoo-i18n-command"
inherit="default-yahoo-i18n-command"
+ database="www-no"
+ host="yahooIdpHost"
language=""
+ language-mix=""
+ partner-id="yahooIdpPartnerId"
region=""
- result-fields="title.html.hl AS title,dispURL AS
url,redirecturl AS clickurl,abstract.best.html.hl AS body"
- results-to-return="10"
- spell-state="disabled"
- unique="doc,host%202">
-
+ region-mix=""
+ results-to-return="10">
<result-handlers>
+ <find-file-format url-field="clickurl"/>
<field-chooser target="title" fields="title,url"/>
+ <regexp field="clickurl" target="site"
regexp="http://([^/]*)/?"/>
</result-handlers>
</yahoo-idp-command>
- <yahoo-idp-command id="default-yahoo-i18n-command"
inherit="default-yahoo-command"
- port="yahooIdpPort"/>
-
- <yahoo-idp-command id="defaultno-yahoo-i18n-command"
inherit="default-yahoo-i18n-command"
- database="www-no"
- host="yahooIdpHost"
-
language="albanian,arabic,bulgarian,catalan,chinese-simplified,chinese-traditional,croatian,czech,danish,dutch,english,estonian,finnish,french,german,greek,hebrew,hungarian,icelandic,italian,japanese,korean,latvian,lithuanian,persian,polish,portuguese,romanian,russian,slovak,slovenian,spanish,swedish,thai,turkish,unknown"
- partner-id="yahooIdpPartnerId"
-
region="centralafrica,northafrica,ar,latinamerica,au,at,be,br,ca,cz,cn,ee,dk,fi,fr,gr,de,hk,hu,is,in,ie,it,jp,kr,lu,my,mx,nl,nz,pl,pt,sg,sv,za,formersovietunion,es,ch,tw,tr,uk,us,yu,nonregional"/>
-
- <yahoo-media-command
- id="default-yahoo-image-command"
- partner-id="yahooMediaPartnerId"
- statistical-name="yahoo-image"
- result-fields="turl AS thumb_url, rcur AS page_url, tgeo AS
thumb_geometry, geo AS geometry, fsz AS filesize,thumb_width,thumb_height"
- host="yahooImageServer"
- port="yahooImageServerPort"/>
-
- <yahoo-media-command
- id="default-yahoo-image-count-command"
- inherit="default-yahoo-image-command"
- results-to-return="1"/>
-
- <yahoo-media-command
- id="default-yahoo-image-enrichment-command"
- field-filters="PICTURE_TRIGGER AS +"
- inherit="default-yahoo-image-command"
- results-to-return="3">
- <query-transformers>
- <token-mask mask="exclude" position="any"
predicates="PICTURE_TRIGGER"/>
- <token-mask mask="exclude" position="prefix"
predicates="PICTURE_MAGIC"/>
- </query-transformers>
- </yahoo-media-command>
-
- <picture-command id="default-picture-command"
- query-server-host="picsearch.host"
- query-server-port="picsearch.port"
- inherit="default-command"/>
-
- <picture-command id="default-picture-count-command"
results-to-return="1" inherit="default-picture-command"/>
-
- <news-command
- id="default-news-command"
- collapsing="true"
- field-filters="size,nyhetskilde AS newssource,NEWS_TRIGGER AS
"
- inherit="default-fast-command">
- <query-transformers>
- <token-mask position="prefix"
-
predicates="WIKIPEDIA_MAGIC,CATALOGUE_MAGIC,YELLOW_MAGIC,WHITE_MAGIC,PICTURE_MAGIC,NEWS_MAGIC"/>
- </query-transformers>
- </news-command>
-
- <news-command id="default-news-count-command"
- collections="retriever"
- filtertype="adv"
- query-server-url="queryServerURL.1"
- lemmatise="false"
- result-fields=""
- statistical-name="news-counter"
- results-to-return="1"
- inherit="default-news-command"/>
-
- <sensis-command id="default-sensis-command"
- collapsing="true"
- field-filters="STOCK_MAGIC AS +"
- query-server-url="queryServerURL.3"
- result-fields="title,url,body"
- spam-score-limit="10"
- statistical-name="sensis_globalweb"
- inherit="default-fast-command"/>
-
- <stock-command id="default-stock-command" inherit="default-command">
- <query-transformers>
- <token-mask mask="exclude" position="prefix"
predicate="STOCK_MAGIC"/>
- </query-transformers>
- </stock-command>
-
- <!-- TODO rename to more appropriate. still specific to norway and
sweden -->
- <yahoo-idp-command id="default-web-command"
inherit="default-yahoo-command">
-
- <query-transformers>
- <token-mask position="prefix"
-
predicates="WIKIPEDIA_MAGIC,CATALOGUE_MAGIC,YELLOW_MAGIC,WHITE_MAGIC,PICTURE_MAGIC,NEWS_MAGIC"/>
- <simple-site-search parameter="ssr"/>
- </query-transformers>
- </yahoo-idp-command>
-
- <!-- TODO rename to more appropriate. still specific to norway and
sweden -->
- <yahoo-idp-command id="default-web-counter-only" results-to-return="0"
inherit="default-web-command"/>
-
</mode>
-
- <!-- Magic search mode template -->
- <mode id="default-magic" analysis="true" inherit="default-mode">
-
- <sensis-command id="default-globalSearchEnrichment"
- always-run="false"
- results-to-return="3"
- statistical-name="sensis_globalweb"
- inherit="default-sensis-command">
-
- <result-handlers>
- <field-chooser target="title" fields="title,url"/>
- </result-handlers>
- </sensis-command>
-
-
- <fast-command id="default-relevantQueries"
- query-server-url="relevantqueries.url"
- qt-pipeline="lookupword"
- relevant-queries="true"
- results-to-return="1"
- synonyms="true"
- inherit="default-fast-command"/>
-
- <fast-command id="default-wikipedia"
- always-run="false"
- collections="nowikipedia"
- field-filters="WIKIPEDIA_TRIGGER AS +"
- query-server-url="queryServerURL.4"
- result-fields="title,url,description"
- sort-by="standard"
- statistical-name="fast_wikipedia"
- inherit="default-fast-command">
-
- <query-transformers>
- <token-mask mask="exclude" position="any"
predicates="WIKIPEDIA_TRIGGER"/>
- <token-mask mask="exclude" position="prefix"
predicates="WIKIPEDIA_MAGIC"/>
- <exact-match field="titles"/>
- </query-transformers>
- <result-handlers>
- <field-chooser target="wikibody"
fields="wikibody,wikibodyteaser"/>
- </result-handlers>
- </fast-command>
-
- <math-command id="default-mathExpression"
- always-run="false"
- statistical-name="mathExpression"
- inherit="default-math-command"/>
-
- <picture-command id="default-picSearchEnrichment"
- always-run="false"
- field-filters="PICTURE_TRIGGER AS +"
-
result-fields="thumb_url,page_url,thumb_width,thumb_height,height,width,filesize"
- results-to-return="3"
- statistical-name="picsearch_picsearch"
- inherit="default-picture-command">
-
- <query-transformers>
- <token-mask mask="exclude" position="any"
predicates="PICTURE_TRIGGER"/>
- <token-mask mask="exclude" position="prefix"
predicates="PICTURE_MAGIC"/>
- </query-transformers>
- </picture-command>
-
- <stock-command id="default-stockEnrichment"
- always-run="false"
- inherit="default-stock-command">
- </stock-command>
-
+
+ <mode id="international" inherit="default-mode">
+ <yahoo-idp-command id="globalSearch"
inherit="default-yahoo-i18n-command"/>
</mode>
-
+
</modes>
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-11
13:22:00 UTC (rev 6241)
+++ trunk/generic.sesam/sesam.com/war/src/main/conf/views.xml 2008-03-11
21:24:37 UTC (rev 6242)
@@ -1,46 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE rules SYSTEM "http://sesam.no/dtds/views.dtd";>
-<!-- Copyright (2006) Schibsted Søk AS
+<!DOCTYPE views SYSTEM "http://sesam.no/dtds/views.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 : views.xml
Created on : 4 April 2006, 16:25
Author : mick
Description:
Purpose of the document follows.
-->
-
<views>
- <!-- DEFAULTS -->
-
- <!-- "absolute-ordering" means that the navigator sources should be sorted
according to the
-prority attribute of the navigation hints -->
-
- <tab id="default" display-css="true">
- <layout>
- <include key="head-element" template="head/head"/>
- <include key="header"/>
- <include key="left-col-one"/>
- <include key="left-col-two"/>
- <include key="left-col-three"/>
-
- <include key="error-msg"/>
- <include key="middle-col-one"/>
- <include key="middle-col-two"/>
- <include key="middle-col-three"/>
- <include key="middle-col-four"/>
-
- <include key="right-col-one"/>
-
- <include key="publishing-page"/>
- <include key="no-hits"/>
-
- <include key="bottom-one"/>
- <include key="bottom-two"/>
- <include key="bottom-three"/>
- <include key="bottom-four"/>
- <include key="bottom-five"/>
- <include key="bottom-six"/>
- <include key="bottom-seven"/>
- <include key="bottom-eight"/>
+ <tab id="international" inherit="default-internet"
+ key="g"
+ mode="international"
+ page-size="10"
+ rss-result-name="globalSearch">
+ <navigation>
+ <navigation id="offset">
+ <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"/>
+ <include key="top-col-one" template="sesam.com/searchbar-top.jsp"/>
+ <include key="main-col-three"
template="sesam.com/globalSearch.jsp"/>
+ <include key="bottom-col-one"
template="sesam.com/offsetPager.jsp"/>
+ <include key="bottom-col-three" template="sesam.com/footer.jsp"/>
+ <include key="bottom-col-two"
template="sesam.com/searchbar-bottom.jsp"/>
+ <include key="offsetPagerLogo"
template="sesam.com/offsetPagerYahooLogo.jsp"/>
+ <include key="no-hits" template="sesam.com/no-hits.jsp"/>
</layout>
</tab>
</views>
Added:
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
(rev 0)
+++
trunk/generic.sesam/sesam.com/war/src/main/templates/fragments/layout/sesam.com/globalSearch.jsp
2008-03-11 21:24:37 UTC (rev 6242)
@@ -0,0 +1,104 @@
+<?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/>.
+ *
+ Document : globalSearch
+ Created on : 7/03/2008, 10:27:24
+ Author : mick
+ Version : $Id$
+--%>
+<jsp:root version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:c="http://java.sun.com/jsp/jstl/core_rt";
+ xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><%-- XXX a little
awkward since this never exists in the skin --%>
+
+ <c:test>
+ <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}&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: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:test>
+
+</jsp:root>
Added:
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
(rev 0)
+++
trunk/generic.sesam/sesam.com/war/src/main/templates/pages/sesam.com/main.jsp
2008-03-11 21:24:37 UTC (rev 6242)
@@ -0,0 +1,70 @@
+<?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/>.
+ *
+ Document : main
+ Author : mick
+ Version : $Id$
+--%>
+<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 this 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"; />
+<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"> </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
