Added new icons. Deleted text menu.

9 files changed, 20 insertions, 9 deletions

diff --git a/css/img/check-news.png b/css/img/check-news.png
new file mode 100644
index 00000000..ba1faf3a
--- /dev/null
+++ b/css/img/check-news.png
diff --git a/css/img/email-follow.png b/css/img/email-follow.png
index dee8352f..9116363a 100644
--- a/css/img/email-follow.png
+++ b/css/img/email-follow.png
diff --git a/css/img/email-unread.png b/css/img/email-unread.png
index f2c0084b..db08c179 100644
--- a/css/img/email-unread.png
+++ b/css/img/email-unread.png
diff --git a/css/img/heart-22x22.png b/css/img/heart-22x22.png
new file mode 100644
index 00000000..a557c26e
--- /dev/null
+++ b/css/img/heart-22x22.png
diff --git a/css/img/history.png b/css/img/history.png
new file mode 100644
index 00000000..eb89266a
--- /dev/null
+++ b/css/img/history.png
diff --git a/css/img/management.png b/css/img/management.png
new file mode 100644
index 00000000..625e64b9
--- /dev/null
+++ b/css/img/management.png
diff --git a/css/img/mark-as-read.png b/css/img/mark-as-read.png
new file mode 100644
index 00000000..acdecd19
--- /dev/null
+++ b/css/img/mark-as-read.png
diff --git a/css/style.css b/css/style.css
index 5a649c39..295ea3c0 100755
--- a/css/style.css
+++ b/css/style.css
@@ -145,7 +145,7 @@ hr {
 }
 
 /* Navigation bars */
-.nav_container { position:fixed; top:220px; right:60px; margin:0px; padding:0px; white-space:nowrap; z-index:11; clear:both;}
+.nav_container { position:fixed; top:160px; right:60px; margin:0px; padding:0px; white-space:nowrap; z-index:11; clear:both;}
 .nav_container.horizontal { position:absolute; white-space:normal; z-index:25; width:670px; }
 .nav_container.horizontal div { float:right; padding-right:10px; }
 
diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 0069d81a..4e65cc16 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -70,10 +70,20 @@ path = {'/css/style.css': {'tools.staticfile.on': True, \
                 'tools.staticfile.filename':utils.path+'/css/img/heart_open.png'}, \
         '/css/img/email-unread.png': {'tools.staticfile.on': True, \
                 'tools.staticfile.filename':utils.path+'/css/img/email-unread.png'}, \
+        '/css/img/heart-22x22.png': {'tools.staticfile.on': True, \
+                'tools.staticfile.filename':utils.path+'/css/img/heart-22x22.png'}, \
         '/css/img/email-follow.png': {'tools.staticfile.on': True, \
                 'tools.staticfile.filename':utils.path+'/css/img/email-follow.png'}, \
         '/css/img/cross.png': {'tools.staticfile.on': True, \
                 'tools.staticfile.filename':utils.path+'/css/img/cross.png'}, \
+        '/css/img/management.png': {'tools.staticfile.on': True, \
+                'tools.staticfile.filename':utils.path+'/css/img/management.png'}, \
+        '/css/img/history.png': {'tools.staticfile.on': True, \
+                'tools.staticfile.filename':utils.path+'/css/img/history.png'}, \
+        '/css/img/mark-as-read.png': {'tools.staticfile.on': True, \
+                'tools.staticfile.filename':utils.path+'/css/img/mark-as-read.png'}, \
+        '/css/img/check-news.png': {'tools.staticfile.on': True, \
+                'tools.staticfile.filename':utils.path+'/css/img/check-news.png'}, \
         '/var/qrcode': {'tools.staticdir.on': True,
                 'tools.staticdir.dir': os.path.join(utils.path, './var/qrcode')}}
 
@@ -119,12 +129,18 @@ class Root:
         html += """<div class="left inner">\n"""
 
         if self.articles:
-            html += """<a href="/list_favorites/"><img src="/css/img/heart.png" title="Your favorites (%s)" /></a>\n""" % \
+            html += """<a href="/list_favorites/"><img src="/css/img/heart-22x22.png" title="Your favorites (%s)" /></a>\n""" % \
                 (self.nb_favorites,)
 
             html += """<a href="/list_notification"><img src="/css/img/email-follow.png" title="Active e-mail notifications (%s)" /></a>\n""" % \
                 (self.nb_mail_notifications,)
 
+
+            html += '<a href="/management/"><img src="/css/img/management.png" title="Management" /></a>\n'
+            html += '<a href="/history/"><img src="/css/img/history.png" title="History" /></a>\n'
+            html += '&nbsp;&#124;&nbsp;'
+            html += '<a href="/mark_as_read/All"><img src="/css/img/mark-as-read.png" title="Mark articles as read" /></a>\n'
+            html += '<a href="/fetch/"><img src="/css/img/check-news.png" title="Check for news" /></a>\n'
             if self.nb_unread_articles != 0:
                 html += """<a href="/unread/All"><img src="/css/img/email-unread.png" title="Unread article(s): %s" /></a>\n""" % \
                     (self.nb_unread_articles,)
@@ -192,10 +208,6 @@ class Root:
         Create the right menu.
         """
         html = """<div class="right inner">\n"""
-        html += """<a href="/management/">Management</a><br />\n"""
-        html += """<a href="/history/">History</a><br />\n"""
-        html += """<a href="/fetch/">Fetch all feeds</a><br />\n"""
-        html += """<a href="/mark_as_read/All:">Mark articles as read</a>\n"""
         html += """<form method=get action="/q/"><input type="search" name="querystring" value="Search" maxlength='1024' autofocus></form>\n"""
         html += "<hr />\n"
         # insert the list of feeds in the menu
@@ -266,8 +278,7 @@ class Root:
         html += """\t<option value="export_HTML" selected='selected'>HTML</option>\n"""
         html += """\t<option value="export_TXT">Text</option>\n"""
         html += """\t<option value="export_dokuwiki">DokuWiki</option>\n"""
-        html += """</select><input type="submit" value="Export"></form>\n"""
-
+        html += """</select>\n\t<input type="submit" value="Export">\n</form>\n"""
         html += "<hr />\n\n"
 
         # Some statistics
@@ -285,7 +296,7 @@ class Root:
             # Tags cloud
             html += 'Minimum size of a word:'
             html += '<form method=get action="/management/">'
-            html += '<input type="number" name="word_size" value="6" min="0" max="20">'
+            html += """<input type="number" name="word_size" value="%s" min="2" max="15">""" % (word_size)
             html += '<input type="submit" value="OK"></form>\n'
             html += '<br /><h3>Tag cloud</h3>\n'
             html += '<div style="width: 35%; overflow:hidden; text-align: justify">' + \