Merge lp:~andrea.corbellini/beeseek/homepage into lp:beeseek/1.0

[Andrea Corbellini]

[Andrea Corbellini (andrea.corbellini)]

This branch modifies the initial search page adding three short portlets: one that explain what is BeeSeek, the second how to try it and the last invites people to join the project.

A way to see the changes is to run BeeSeek with `./beeseek-server start --testing` and then look at http://localhost:8080 with the browser. Doing that you should see the new content. The old page layout can be seen on http://beta.beeseek.org.

[Andrea Colangelo (warp10)]

review: Approve (text-content)

[lp:~andrea.corbellini/beeseek/homepage]

377. By Andrea Corbellini on 2009-10-24

Fix link.

[Jacopo Moretto (jak-o)]

review: Approve (ui)

=== modified file 'beeseek/template/__init__.py'
--- beeseek/template/__init__.py	2009-10-21 15:39:48 +0000
+++ beeseek/template/__init__.py	2009-10-24 14:10:25 +0000
@@ -115,7 +115,7 @@
     def precalculate_object(template, tags, content):
         """Give a name to a piece of content so that it can be referenced."""
         template.objects[tags['id']] = content
-        show = tags['show']
+        show = tags.get('show', 'True')
         if show == 'True':
             return content
         elif show == 'False':

=== modified file 'beeseek/template/html.py'
--- beeseek/template/html.py	2009-08-28 19:33:37 +0000
+++ beeseek/template/html.py	2009-10-24 14:10:25 +0000
@@ -18,6 +18,6 @@
 from beeseek.template import Template
 
 #pylint: disable-msg=C0103
-start_page = Template('html/search.html', start_page=True)
-search_page = Template('html/search.html', start_page=False)
+start_page = Template('html/home.html')
+search_page = Template('html/search.html')
 configuration_page = Template('html/configuration.html')

=== modified file 'beeseek/ui/__init__.py'
--- beeseek/ui/__init__.py	2009-10-20 14:50:05 +0000
+++ beeseek/ui/__init__.py	2009-10-24 14:10:25 +0000
@@ -29,7 +29,7 @@
         headers = instance.http_response_headers.copy()
         if page == '/beeseek:tracker.js':
             template = javascript.tracker
-        elif page == '/beeseek:style_basic.css':
+        elif page == '/beeseek:style.css':
             template = css.style
         elif page == '/beeseek:logo.png':
             template = images.logo

=== modified file 'beeseek/ui/navigationinfo.py'
--- beeseek/ui/navigationinfo.py	2009-10-20 16:59:35 +0000
+++ beeseek/ui/navigationinfo.py	2009-10-24 14:10:25 +0000
@@ -445,6 +445,7 @@
 def save(data):
     """Save the data received from the JavaScript script to the database."""
     data = read_data(data)
+    url = data['location']
     history = generate_history(
         [int(i) for i in data['focus-history'].split(',')],
         scrollhistory = [int(i) for i in data['scroll-history'].split(',')],
@@ -454,11 +455,15 @@
     snippets_text, snippets_words = get_candidate_snippets(
         all_positions, data)
     if not snippets_text:
+        if __debug__:
+            if instance.debug:
+                log.debug(
+                    'Cannot index %r in the database: no snippets found'
+                    % url)
         return
     snippets_text, snippets_words = remove_short_snippets(
         snippets_text, snippets_words)
 
-    url = data['location']
     if not is_public_page(url, snippets_text):
         if __debug__:
             if instance.debug:

=== modified file 'templates/css/style.css'
--- templates/css/style.css	2009-10-23 18:41:08 +0000
+++ templates/css/style.css	2009-10-24 14:10:25 +0000
@@ -3,7 +3,7 @@
 body {
     background: #FFFFFF;
     color: #121212;
-    font-family: "Bitstream Vera Sans", Arial, Helvetica, sans-serif;
+    font-family: sans-serif;
     font-size: 9pt;
     margin: 0 1em 0 1em;
     padding: 0;
@@ -15,6 +15,12 @@
     margin-top: 0;
 }
 
+a {
+    color: #556D7A;
+    text-decoration: none;
+    font-weight: bold;
+}
+
 div#top {
     border-bottom: 1px dotted #CFCFCF;
     color: #000000;
@@ -27,6 +33,7 @@
 
 div#top a {
     color: #556D7A;
+    font-weight: normal;
 }
 
 div#top ul, div#top li {
@@ -38,7 +45,7 @@
 }
 
 div#top div#links {
-  float:right;
+    float: right;
 }
 
 div#top div#users {
@@ -54,6 +61,7 @@
 
 div#footer a {
     color: #556D7A;
+    font-weight: normal;
 }
 
 div#footer ul, div#footer li {
@@ -203,6 +211,48 @@
     margin: 1em 0;
 }
 
+
+/* Portlets for the home page. */
+
+div#portlets {
+    clear: both;
+    left: 4%;
+    position: relative;
+    width: 96%;
+}
+
+div.portlet {
+    display: block;
+    float: left;
+    height: 200px;
+    margin: 0 1em 0 0;
+    padding: 0.5em;
+    position: relative;
+    width: 30%;
+}
+
+div.portlet h2 {
+    color: #FF6600;
+    margin: 0;
+    padding: 0.2em;
+    text-align: center;
+}
+
+div.portlet p {
+    margin: 0;
+    padding: 0.2em;
+}
+
+div.portlet a {
+    font-weight: bold;
+}
+
+div.portlet ul {
+    margin: 0;
+    padding-left: 1.5em;
+}
+
+
 /* Configuration page. */
 
 form#options {

=== added file 'templates/html/common.xml'
--- templates/html/common.xml	1970-01-01 00:00:00 +0000
+++ templates/html/common.xml	2009-10-24 14:10:25 +0000
@@ -0,0 +1,77 @@
+<beeseek:template content-type="text/html">
+  <beeseek:object id="top">
+    <div id="top">
+      <div id="users">
+        <ul>
+          <li><a href="http://www.beeseek.org/user/login">Login</a> | </li>
+          <li><a href="http://www.beeseek.org/user/register">Register</a></li>
+        </ul>
+      </div>
+      <div id="links">
+        <ul>
+          <li><a href="http://blog.beeseek.org">Blog</a> | </li>
+          <li><a href="http://planet.beeseek.org">Planet</a> | </li>
+          <li><a href="http://forum.beeseek.org">Forum</a> | </li>
+          <li><a href="http://wiki.beeseek.org">Wiki</a> | </li>
+          <li><a href="http://gallery.beeseek.org">Gallery</a> | </li>
+          <li><a href="http://beeseek.org/noticeboard">Noticeboard</a> | </li>
+          <li><a href="http://wiki.beeseek.org">Wiki</a> | </li>
+          <li><a href="https://launchpad.net/beeseek-project">Launchpad</a></li>
+        </ul>
+      </div>
+    </div>
+  </beeseek:object>
+
+  <beeseek:object id="logo">
+    <div id="logo">
+      <span id="motto">motto goes here</span>
+      <beeseek:if condition="version_info.releasestatus != 'final'">
+        <span id="devstatus">.<beeseek:insert type="variable" name="version_info.releasestatus" /></span>
+      </beeseek:if>
+    </div>
+  </beeseek:object>
+
+  <beeseek:object id="search-form-empty">
+    <div class="form">
+      <form action="/search" method="post">
+        <div>
+          <input id="focus" class="textarea" type="text" name="keyword" value="" />
+          <button class="find" type="submit">Find</button>
+        </div>
+      </form>
+    </div>
+  </beeseek:object>
+
+  <beeseek:object id="search-form-keywords">
+    <div class="form">
+      <form action="/search" method="post">
+        <div>
+          <input id="focus" class="textarea" type="text" name="keyword"
+            value="<beeseek:insert type="variable" name="keywords.replace(chr(34), '&quot;')" />" />
+          <button class="find" type="submit">Find</button>
+        </div>
+      </form>
+    </div>
+  </beeseek:object>
+
+  <beeseek:object id="footer">
+    <div id="footer">
+      <div id="version">
+        <ul>
+          <li>Version <beeseek:insert type="variable" name="str(version_info)" /></li>
+          <beeseek:if condition="version_info.revision">
+            <li>revision <beeseek:insert type="variable" name="str(version_info.revision)" /></li>
+          </beeseek:if>
+        </ul>
+      </div>
+
+      <div id="infos">
+        <ul>
+          <li><a href="http://wiki.beeseek.org/BeeSeek">About</a> | </li>
+          <li><a href="http://wiki.beeseek.org/FAQ">FAQ</a> | </li>
+          <li><a href="http://wiki.beeseek.org/TermsOfUse">Terms of use</a></li>
+        </ul>
+      </div>
+    </div>
+  </beeseek:object>
+</beeseek:template>

=== modified file 'templates/html/configuration.html'
--- templates/html/configuration.html	2009-08-15 15:45:46 +0000
+++ templates/html/configuration.html	2009-10-24 14:10:25 +0000
@@ -7,7 +7,7 @@
     <title>BeeSeek results page</title>
     <meta name="description" content="Results from BeeSeek" />
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-    <link rel="stylesheet" type="text/css" media="screen" href="/beeseek:style_basic.css" />
+    <link rel="stylesheet" type="text/css" media="screen" href="/beeseek:style.css" />
   </head>
 
   <body onload="document.getElementById('focus').focus()">

=== added file 'templates/html/home.html'
--- templates/html/home.html	1970-01-01 00:00:00 +0000
+++ templates/html/home.html	2009-10-24 14:10:25 +0000
@@ -0,0 +1,55 @@
+<beeseek:template content-type="text/html"><?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+  <head>
+    <title>BeeSeek Search</title>
+    <link rel="stylesheet" type="text/css" media="screen" href="/beeseek:style.css" />
+  </head>
+
+  <body onload="document.getElementById('focus').focus()">
+    <beeseek:insert type="object" file="html/common.xml" id="top" />
+    <beeseek:insert type="object" file="html/common.xml" id="logo" />
+
+    <div id="portlets">
+      <div class="portlet">
+        <h2>What is?</h2>
+        <p>BeeSeek is a project to build a free, open-source search engine
+        based on a peer to peer technology. The idea that move BeeSeek is to
+        develop a search engine:</p>
+        <ul>
+          <li>whose source code is freely accessible to everyone;</li>
+          <li>that gives warranties about individual's privacy;</li>
+          <li>whose revenues are used for ethical projects;</li>
+          <li>who share the processing work among the clients (peers) of the
+          network;</li>
+          <li>that doesn't store personal user data for long times and no
+          more than needed.</li>
+        </ul>
+        <p style="text-align: right"><a href="http://wiki.beeseek.org/BeeSeek">Read more</a></p>
+      </div>
+      <div class="portlet">
+        <h2>Try it</h2>
+        <p>BeeSeek is currently in <a href="http://en.wikipedia.org/wiki/Software_release_life_cycle#Beta">
+        beta version</a> and you are free to test it using it just for
+        searching but also sharing a piece of your computer. Note that however
+        it may contain some errors or miss some features, so we encourage you
+        to <a href="http://launchpad.net/beeseek/+filebug">report bugs</a>
+        whenever you find one.</p>
+        <p style="text-align: right"><a href="http://wiki.beeseek.org/Testing">Read more</a></p>
+      </div>
+      <div class="portlet">
+        <h2>Join the community!</h2>
+        <p>If you like this project, and if you share the ideas that move
+        BeeSeek, why don't you help us in developing our search engine? We are
+        always looking for good people willing to help us in writing code,
+        testing, updating wiki, blogging, drawing wonderful artworks,
+        promoting our projects and writing good documentation.</p>
+        <p style="text-align: right"><a href="http://wiki.beeseek.org/GettingInvolved">Read more</a></p>
+      </div>
+    </div>
+
+    <beeseek:insert type="object" file="html/common.xml" id="search-form-empty" />
+    <beeseek:insert type="object" file="html/common.xml" id="footer" />
+  </body>
+</html>
+</beeseek:template>

=== modified file 'templates/html/search.html'
--- templates/html/search.html	2009-10-20 16:30:00 +0000
+++ templates/html/search.html	2009-10-24 14:10:25 +0000
@@ -1,119 +1,53 @@
-<beeseek:template content-type="text/html">
-<?xml version="1.0" encoding="UTF-8"?>
+<beeseek:template content-type="text/html"><?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
   <head>
-    <title>BeeSeek results page</title>
-    <meta name="description" content="Results from BeeSeek" />
-    <meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-    <link rel="stylesheet" type="text/css" media="screen" href="/beeseek:style_basic.css" />
+    <title>BeeSeek Search</title>
+    <link rel="stylesheet" type="text/css" media="screen" href="/beeseek:style.css" />
   </head>
 
   <body onload="document.getElementById('focus').focus()">
-    <div id="top">
-      <div id="links">
-        <ul>
-          <li><a href="http://blog.beeseek.org">Blog</a> | </li>
-          <li><a href="http://planet.beeseek.org">Planet</a> | </li>
-          <li><a href="http://forum.beeseek.org">Forum</a> | </li>
-          <li><a href="http://wiki.beeseek.org">Wiki</a> | </li>
-          <li><a href="http://gallery.beeseek.org">Gallery</a> | </li>
-          <li><a href="http://beeseek.org/noticeboard">Noticeboard</a> | </li>
-          <li><a href="http://wiki.beeseek.org">Wiki</a> | </li>
-          <li><a href="https://launchpad.net/beeseek-project">Launchpad</a></li>
-        </ul>
-      </div>
-      <div id="users">
-        <ul>
-          <li><a href="http://www.beeseek.org/user/login">Login</a> | </li>
-          <li><a href="http://www.beeseek.org/user/register">Register</a></li>
-        </ul>
-      </div>
-    </div>
-
-    <div id="logo">
-      <span id="motto">motto goes here</span>
-      <beeseek:if condition="version_info.releasestatus != 'final'">
-        <span id="development">.<beeseek:insert type="variable" name="version_info.releasestatus" /></span>
-      </beeseek:if>
-    </div>
-
-
-    <beeseek:object id="search-form" show="True">
-      <div class="form">
-        <form action="/search" method="post">
-          <div>
-            <beeseek:if condition="start_page == True">
-              <input id="focus" class="textarea" type="text" name="keyword" value="" />
-            </beeseek:if>
-            <beeseek:if condition="start_page == False">
-              <input id="focus" class="textarea" type="text" name="keyword"
-                     value="<beeseek:insert type="variable" name="keywords.replace(chr(34), '&quot;')" />" />
-            </beeseek:if>
-            <button class="find" type="submit">Find</button>
-          </div>
-        </form>
-      </div>
-    </beeseek:object>
-
-    <beeseek:if condition="start_page == False">
-      <beeseek:if condition="len(resultset) == 0">
-        <li style="list-style: none;">
-          <p>Sorry, no results were found.</p>
-          <p>BeeSeek is a young project and some pages are not indexed in our
-          database already. You may help the search engine hosting a part of
-          the database. Learn <a href="http://wiki.beeseek.org/BeeSeek">why
-          BeeSeek is different from other search engines</a> and how to
-          fully <a href="http://wiki.beeseek.org/Testing">test it</a>.</p>
-        </li>
-      </beeseek:if>
-      <beeseek:if condition="len(resultset) != 0">
-        <div id="results-block"><ol>
-          <beeseek:for variable="result" iterator="resultset">
-            <li>
-              <div class="result-single">
-                <h3><a href="<beeseek:insert type="variable" name="result.address" />">
-                  <beeseek:insert type="variable" name="result.title" /></a>
-                </h3>
-                <p><beeseek:insert type="variable" name="result.snippet" /> <strong>...</strong></p>
-                <beeseek:debug>
-                  <div id="debug">
-                    <h4><small>Debugging information</small></h4>
-                    <p><small>Score: <beeseek:insert type="variable" name="result.karma" /></small></p>
-                    <p><small>Origin: <beeseek:insert type="variable" name="result.origin" /></small></p>
-                    <p><small>Tags: <beeseek:insert type="variable" name="result.tags" /></small></p>
-                  </div>
-                </beeseek:debug>
-                <span><beeseek:insert type="variable" name="result.address" /></span>
-              </div>
-            </li>
-          </beeseek:for>
-        </ol></div>
-        <beeseek:insert type="object" file="." id="search-form" />
-      </beeseek:if>
-    </beeseek:if>
-
-
-    <div id="footer">
-      <div id="version">
-        <ul>
-          <li>Version <beeseek:insert type="variable" name="str(version_info)" /></li>
-          <beeseek:if condition="version_info.revision">
-            <li>&nbsp;</li>
-            <li>Revision <beeseek:insert type="variable" name="str(version_info.revision)" /></li>
-          </beeseek:if>
-        </ul>
-      </div>
-
-      <div id="infos">
-        <ul>
-          <li><a href="http://wiki.beeseek.org/BeeSeek">About</a> | </li>
-          <li><a href="http://wiki.beeseek.org/FAQ">FAQ</a> | </li>
-          <li><a href="http://wiki.beeseek.org/TermsOfUse">Terms of use</a></li>
-        </ul>
-      </div>
-    </div>
+    <beeseek:insert type="object" file="html/common.xml" id="top" />
+    <beeseek:insert type="object" file="html/common.xml" id="logo" />
+
+    <beeseek:insert type="object" file="html/common.xml" id="search-form-keywords" />
+
+    <beeseek:if condition="len(resultset) == 0">
+      <div id="results-block"><ol style="list-style: none"><li>
+        <p>Sorry, no results were found.</p>
+        <p>BeeSeek is a young project and some pages are not indexed in our
+        database already. You may help the search engine hosting a part of
+        the database. Learn <a href="http://wiki.beeseek.org/BeeSeek">why
+        BeeSeek is different from other search engines</a> and how to
+        fully <a href="http://wiki.beeseek.org/Testing">test it</a>.</p>
+      </li></ol></div>
+    </beeseek:if>
+    <beeseek:if condition="len(resultset) > 0">
+      <div id="results-block"><ol>
+        <beeseek:for variable="result" iterator="resultset">
+          <li>
+            <div class="result-single">
+              <h3><a href="<beeseek:insert type="variable" name="result.address" />">
+                <beeseek:insert type="variable" name="result.title" /></a>
+              </h3>
+              <p><beeseek:insert type="variable" name="result.snippet" /> <strong>...</strong></p>
+              <beeseek:debug>
+                <div id="debug">
+                <h4><small>Debugging information</small></h4>
+                  <p><small>Score: <beeseek:insert type="variable" name="result.karma" /></small></p>
+                  <p><small>Origin: <beeseek:insert type="variable" name="result.origin" /></small></p>
+                  <p><small>Tags: <beeseek:insert type="variable" name="result.tags" /></small></p>
+                </div>
+              </beeseek:debug>
+              <span><beeseek:insert type="variable" name="result.address" /></span>
+            </div>
+          </li>
+        </beeseek:for>
+      </ol></div>
+      <beeseek:insert type="object" file="html/common.xml" id="search-form-keywords" />
+    </beeseek:if>
+
+    <beeseek:insert type="object" file="html/common.xml" id="footer" />
   </body>
 </html>
 </beeseek:template>