fix menu bugs, fix some styles, add urls

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 9f81a816789c4d7d6bdeaa9eaffb03b31819cd6c..f4bda641e7fc41e9f51dbe0cd05030ee78ff9ea9 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -102,7 +102,7 @@ a img { border: none; }
 #logo a, #logo a:hover { border: none; background: transparent; }
 
 #header {
-    padding: 0.2em 0;
+    padding: 0em;
 /*     background: url("../images/waves.png") 100% 0% no-repeat; */
 }
 
@@ -470,6 +470,7 @@ form.login .submit {
 #menu .black { border-bottom-color:  #000000; }
 #menu .red { border-bottom-color:  #DD0000; }
 #menu .violet { border-bottom-color:  #A00020; }
+#menu .origin { border-bottom-color: #6a0307; }
 
 * html #menu :link, * html #menu :visited { background-position: 1px 0 }
 

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

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index ac719b6a38b656a9b3038ad3ee56a2de4a441bf7..aaf0490876ae26bf1d0c60947018bf8f5dcb035c 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -83,7 +83,7 @@
 
 <ul id="nav">
  {% if user.is_authenticated %}
-  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span>
+  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a>
    <ul>
     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
     <li><a href="{% url telemeta-desk-profile user.username %}">{% trans "Profile" %}</a></li>
@@ -94,7 +94,6 @@
   <li><a href="{% url telemeta-home %}" class="blue">{% trans "Home" %}</a></li>
  {% endif %}
 
- {% block archives %}
  <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
   <ul>
     <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
@@ -102,13 +101,9 @@
     <li><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
     <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
   </ul>
-  <div class="clear"></div>
  </li>
- {% endblock archives %}
- 
- {% block geonav %}
+
  <li><a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
- {% endblock geonav %}
 
  <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
  {% if user.is_authenticated %}
@@ -121,13 +116,11 @@
  <li><a href="{% url telemeta-admin-enumerations %}">{% trans "Enumerations" %}</a></li>
  <li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li>
  </ul>
- <div class="clear"></div>
  </li>
 {% endif %}
 </ul>
-<div class="clear"></div>
 
-{% endblock %}
+{% endblock menu %}
 </div>
 </div>
 {% endblock header %}
@@ -154,7 +147,7 @@
  <table width="100%">
   <tr>
    <td>
-    <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}" height="30" width="93"
+    <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}"
    alt="Telemeta Powered"/></a>
     <p class="left">
     {% trans "Powered by" %} <a href="{% telemeta_url %}" target="_blank"><strong>Telemeta {% telemeta_version %}</strong></a><br />

diff --git a/telemeta/urls.py b/telemeta/urls.py
index e4961c1d575629bbda8549d942c62b3c0dc90426..b2b9ec639277c3b1e329bfc8311c0356926d09c8 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -292,6 +292,8 @@ urlpatterns = patterns('',
     # Authentication
     url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
         name="telemeta-login"),
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
+        name="telemeta-login"),
     #url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'},
     #    name="telemeta-login"),
     url(r'^logout/$', general_view.logout, name="telemeta-logout"),