no header logo

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index a19323a597a8574fd031ff0feaeaa781caac35b0..3dd413d9aa4d396676abc7f226cee89b7b37e895 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -43,38 +43,7 @@
 <div id="layout">
 {% block header %}
 <div id="header">
-<div id="logo">
-{% block logo %}
-<a href="{% url telemeta-home %}"><img src="{% url telemeta-images "logo_telemeta_2.png" %}" alt="Telemeta" /></a>
-{% endblock %}
-</div>
 
-<div id="auth_info">
-{% if user.is_authenticated %}
-<img src="{% url telemeta-images "user.png" %}" alt="user" style="vertical-align:middle" />
-{% trans "Welcome" %},
-{% if user.first_name and user.last_name %}
-{{ user.first_name }} {{ user.last_name }} |
-{% else %}
-{{ user.username }} |
-{% endif %}
-<a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a> |
-<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
-<a href="{% url telemeta-logout %}">{% trans "Sign out" %}
-<img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a>
-{% else %}
-<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
-<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
-{% endif %}
-</div>
-
-<div id="quick_search">
-<form action="{% url telemeta-search %}" id="_quickSearchForm" method="get">
-<input type="text" id="quick_search_pattern" name="pattern" />
-<a href="#" class="component button"
-                onclick="document.getElementById('_quickSearchForm').submit(); return false;">{% trans "Search" %}</a>
-</form>
-</div>
 
 <div id="menu">
 {% block menu %}
@@ -82,6 +51,10 @@
 {# spaces between li and a elements breaks layout #}
 
 <ul id="nav">
+<div id="logo" style="padding-right:8em; float: left;">
+<img src="{% url telemeta-images "logo_mini_2.png" %}" style="vertical-align:middle"
+alt="Telemeta Powered"/>
+</div>
  {% if user.is_authenticated %}
  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a>
  <ul>
@@ -99,9 +72,10 @@
 
  <li><a href="{% url telemeta-users %}" class="yellow">{% trans "Users" %}</a></li>
   
+ <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
 
  {% if user.is_staff %}
- <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
+ 
  <li><a href="#archives#" class="red">{% trans "Archives" %}</a>
  <ul>
  <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
@@ -109,7 +83,7 @@
  <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>
  
  <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
@@ -118,14 +92,29 @@
  <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 %}
 
+ {% if user.is_authenticated %}
+ <li><a href="#profil#"  class="origin"><img src="{% url telemeta-images "user.png" %}" alt="user" style="vertical-align:middle" width="12px" />{% if user.first_name and user.last_name %}
+ {{ user.first_name }} {{ user.last_name }}
+ {% else %}
+ {{ user.username }}
+ {% endif %}</a>
+    <ul>
+    <li><a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a></li>
+    <li><a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a></li>
+    <li><a href="{% url telemeta-logout %}">{% trans "Sign out" %}</a></li>
+    </ul>
+ </li>
+
+ {% else %}
+ <li><a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a></li>
+ {% endif %}
+
 {% endif %}
 
 </ul>
-<div class="clear"></div>
 
 {% endblock menu %}
 </div>
@@ -154,7 +143,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 />