tracify menu bar, add footer, homepage links and fix items list in collection detail

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 8c46e471dadc6740c30056958793615228d5176f..c33a77f381f56e3a42946d418815030b2f6a70bd 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -17,6 +17,7 @@ a img { border: none; }
 #logo { padding-top: 1ex; }
 #logo a, #logo a:hover { border: none; background: transparent; }
 
+/*
 #menu a, #menu a:hover { border: none;}
 #menu { 
     text-align: right; 
@@ -25,6 +26,7 @@ a img { border: none; }
     padding: 1px;
     border-bottom: solid 1px black;
 }
+*/
 #submenu { clear: right; float: right; padding-top: 1em; }
 #submenu a { color: #000066; }
 
@@ -82,8 +84,8 @@ table.listing th.asc a, table.listing th.desc a {
  background-position: 100% 50%;
  background-repeat: no-repeat;
 }
-table.listing th.asc a { background-image: url(../asc.png) }
-table.listing th.desc a { background-image: url(../desc.png) }
+table.listing th.asc a { background-image: url(../images/asc.png) }
+table.listing th.desc a { background-image: url(../images/desc.png) }
 table.listing tbody td, table.listing tbody th {
  border: 1px dotted #ddd;
  padding: .33em .5em;
@@ -147,3 +149,78 @@ label.disabled { color: #d7d7d7 }
 /* HTML dublin core display */
 
 table.dublincore { width: auto; }
+
+/* Navigation (borrowed from Trac) */
+.nav h2, .nav hr { display: none }
+.nav ul { font-size: 10px; list-style: none; margin: 0; text-align: right }
+.nav li {
+ border-right: 1px solid #d7d7d7;
+ display: inline;
+ padding: 0 .75em;
+ white-space: nowrap;
+}
+.nav li.last { border-right: none }
+
+/* Main navigation bar  (borrowed from Trac) */
+#menu {
+ background: #f7f7f7 url(../images/topbar_gradient.png) 0 0;
+ border: 1px solid #000;
+ font: normal 10px verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif;
+ margin: .66em 0 .33em;
+ padding: .2em 0;
+}
+#menu li { border-right: none; padding: .25em 0 }
+#menu :link, #menu :visited {
+ background: url(../images/dots.gif) 0 0 no-repeat;
+ border-right: 1px solid #fff;
+ border-bottom: none;
+ border-left: 1px solid #555;
+ color: #000;
+ padding: .2em 20px;
+}
+* html #menu :link, * html #menu :visited { background-position: 1px 0 }
+#menu :link:hover, #menu :visited:hover {
+ background-color: #ccc;
+ border-right: 1px solid #ddd;
+}
+#menu .active :link, #menu .active :visited {
+ background: #333 url(../images/topbar_gradient2.png) 0 0 repeat-x;
+ border-top: none;
+ border-right: 1px solid #000;
+ color: #eee;
+ font-weight: bold;
+}
+#menu .active :link:hover, #menu .active :visited:hover {
+ border-right: 1px solid #000;
+}
+
+/* Footer (borrowed from Trac) */
+#footer {
+  clear: both;
+  color: #bbb;
+  font-size: 10px;
+  border-top: 1px solid;
+  height: 31px;
+  padding: .25em 0;
+  margin-top: 3em;
+}
+#footer :link, #footer :visited { color: #bbb; }
+#footer hr { display: none }
+#footer #telemeta_powered { border: 0; float: left }
+#footer #telemeta_powered:hover { background: transparent }
+#footer p { margin: 0 }
+#footer p.left {
+  float: left;
+  margin-left: 1em;
+  padding: 0 1em;
+  border-left: 1px solid #d7d7d7;
+  border-right: 1px solid #d7d7d7;
+}
+#footer p.right {
+  float: right;
+  text-align: right;
+}
+
+/* Homepage */
+
+.homelinks a { font-size: 140%;}

diff --git a/telemeta/htdocs/images/asc.png b/telemeta/htdocs/images/asc.png
new file mode 100644 (file)
index 0000000..486b731
Binary files /dev/null and b/telemeta/htdocs/images/asc.png differ

diff --git a/telemeta/htdocs/images/desc.png b/telemeta/htdocs/images/desc.png
new file mode 100644 (file)
index 0000000..2070185
Binary files /dev/null and b/telemeta/htdocs/images/desc.png differ

diff --git a/telemeta/htdocs/images/dots.gif b/telemeta/htdocs/images/dots.gif
new file mode 100644 (file)
index 0000000..c6ae052
Binary files /dev/null and b/telemeta/htdocs/images/dots.gif differ

diff --git a/telemeta/htdocs/images/logo_mini.png b/telemeta/htdocs/images/logo_mini.png
new file mode 100644 (file)
index 0000000..ba4b082
Binary files /dev/null and b/telemeta/htdocs/images/logo_mini.png differ

diff --git a/telemeta/htdocs/images/topbar_gradient.png b/telemeta/htdocs/images/topbar_gradient.png
new file mode 100644 (file)
index 0000000..d0605a3
Binary files /dev/null and b/telemeta/htdocs/images/topbar_gradient.png differ

diff --git a/telemeta/htdocs/images/topbar_gradient2.png b/telemeta/htdocs/images/topbar_gradient2.png
new file mode 100644 (file)
index 0000000..5f7ed4a
Binary files /dev/null and b/telemeta/htdocs/images/topbar_gradient2.png differ

diff --git a/telemeta/templates/base.html b/telemeta/templates/base.html
index 168a751f5f229a560f63d6c489306b8078d3af97..c72dd14e80d6fd4efcaefc88570190fed228bc31 100644 (file)
--- a/telemeta/templates/base.html
+++ b/telemeta/templates/base.html
@@ -7,6 +7,7 @@
 {% block extra_javascript %}{% endblock %}
 </head>
 {% load i18n %}
+{% load telemeta_utils %}
 <body>
 <!--
 {% if user.is_authenticated and user.is_staff %}
@@ -25,11 +26,10 @@
 </form>        
 </div>
 
-<div id="menu">
-<a href="{% url telemeta-geo-continents %}">Geo Navigator</a> |
-<a href="{% url telemeta-collections %}">All Collections</a> |
-<a href="{% url telemeta-items %}">All Items</a> |
-<a href="{% url telemeta-admin %}">Admin</a>
+<div id="menu" class="nav">
+<ul>
+{# spaces between li and a elements breaks layout #}
+<li class="first"><a href="{% url telemeta-geo-continents %}">Geo Navigator</a></li><li><a href="{% url telemeta-collections %}">All Collections</a></li><li><a href="{% url telemeta-items %}">All Items</a></li><li class="last"><a href="{% url telemeta-admin %}">Admin</a></li>
 </div>
 </div>
 <div id="submenu">
@@ -40,5 +40,19 @@
 {% block content %}{% endblock %}
 </div>
 
+<div id="footer">
+ <hr />
+ <a id="telemeta_powered" href="http://svn.parisson.org/telemeta"><img src="{% url telemeta-images "logo_mini.png" %}" height="30" width="93"
+   alt="Telemeta Powered"/></a>
+ <p class="left">
+  Powered by <a href="http://svn.parisson.org/telemeta"><strong>Telemeta {% telemeta_version %}</strong></a><br />
+  By <a href="http://www.parisson.com/">Parisson</a> &amp; <a href="http://www.samalyse.com/">Samalyse</a>.
+ </p>
+
+ <p class="right">
+  Visit the Telemeta open source project at<br /><a href="http://svn.parisson.org/telemeta">http://svn.parisson.org/telemeta</a>
+ </p>
+</div>
+
 </body>
 </html>

diff --git a/telemeta/templates/collection_detail.html b/telemeta/templates/collection_detail.html
index 55361774b2a44d0dd16c87fe296fc539fb8f37df..461049496620bd3742120cf23f4f130bd5106d6b 100644 (file)
--- a/telemeta/templates/collection_detail.html
+++ b/telemeta/templates/collection_detail.html
@@ -56,18 +56,7 @@
     <hr>
     <h4>Items</h4>
     {% with object.items.all as items %}
-    {% if items %}
-      <ul>
-      {% for item in items %}
-          <li><b>{{ item.creator }}</b> - {{ item.title }}
-              <a href="{% url telemeta-item-detail item.id|urlencode %}">View</a>
-              <a href="#">Edit</a>
-              </li>
-      {% endfor %}
-      </ul>
-    {% else %}
-      <p>No items</p>
-    {% endif %}
+        {% include "inc/mediaitem_list.html" %}
     {% endwith %}
 {% else %}
     <p>No such collection</p>

diff --git a/telemeta/templates/inc/mediaitem_list.html b/telemeta/templates/inc/mediaitem_list.html
index a74c85438c2fd2501d7ff6936a4129e53e0838ba..13e32a5dac20a3b97f50502387496789227e7f38 100644 (file)
--- a/telemeta/templates/inc/mediaitem_list.html
+++ b/telemeta/templates/inc/mediaitem_list.html
@@ -12,5 +12,5 @@
     {% endfor %}
     </ul>
 {% else %}
-    <p>No piece</p>
+    <p>No item</p>
 {% endif %}

diff --git a/telemeta/templates/index.html b/telemeta/templates/index.html
index e48212a8a2e8e2f12ea83cdc496fa6f883ee6f72..54620407b5be0ff5ee689f7874c74b3024797bf5 100644 (file)
--- a/telemeta/templates/index.html
+++ b/telemeta/templates/index.html
@@ -1,4 +1,13 @@
 {% extends "base.html" %}
-
 {% block content %}
+<div class="homelinks">
+<p><a href="{% url telemeta-geo-continents %}">Geographic Navigator</a><br />
+  Browse collections by continents and countries</p>
+<p><a href="{% url telemeta-collections %}">All collections</a><br />
+  Browse all collections</p>
+<p><a href="{% url telemeta-items %}">All items</a><br />
+  Browse all items</p>
+<p><a href="{% url telemeta-admin %}">Administration</a><br />
+  Configure Telemeta and manage users</p>
+</div>
 {% endblock %}