add icons

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

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

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

diff --git a/telemeta/htdocs/images/item.png b/telemeta/htdocs/images/item.png
index f40436b945e78e67469ee1d3bfd72cb17b0f2c0e..d1964f7cc83410ffb02b38d0b4714a8612cd570b 100644 (file)
Binary files a/telemeta/htdocs/images/item.png and b/telemeta/htdocs/images/item.png differ

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

diff --git a/telemeta/htdocs/images/user_red.png b/telemeta/htdocs/images/user_red.png
index eb166bd79c486fb106ed0ddf6534e0c65afc2a38..91ecf5bf2ad6edecbb6beebd6be6ef1e6d103f9b 100644 (file)
Binary files a/telemeta/htdocs/images/user_red.png and b/telemeta/htdocs/images/user_red.png differ

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

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

diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html
index 59cf2e63f74b92268aa6957ac448897021c5c99f..7824274ab5dc3c9e265e385aafdf6b29198585b2 100644 (file)
--- a/telemeta/templates/telemeta_default/admin.html
+++ b/telemeta/templates/telemeta_default/admin.html
@@ -8,8 +8,9 @@
 {% endblock %}
 
 {% block content %}
-<h1>{% trans "Administration" %}</h1>
+<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %}</h1>
 <br />
+{% block tab %}
 <div class="tabs">
 <ul>
 <li><a href="{% url telemeta-admin-general %}">{% trans "General administration" %}</a></li>
@@ -18,7 +19,6 @@
 <li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li>
 </ul>
 </div>
-{% block tab %}
 {% endblock tab %}
 
 <div class="tabcontents">

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 00e4396b5e5ca4eae82b51332587aba63beeb517..8c5f450f77147d6c85318e337c00c90c7c416918 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -42,7 +42,7 @@
 
 <div id="auth_info">
 {% if user.is_authenticated %}
-<img src="images/user_red.png" style="vertical-align:middle" />
+<img src="images/user.png" style="vertical-align:middle" />
 {% trans "Welcome" %}, 
 {% if user.first_name and user.last_name %}
 {{ user.first_name }} {{ user.last_name }}.

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index dda5b848af14c40d7ca9eb19efc6cb8d176ab6ab..de882e2cf423556db93de1b146a5bd63de49fd29 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -34,7 +34,7 @@
 {% if collection %}
 
 {% block title %}
-    <h1>Collection: {{ collection }}</h1>
+    <h1><img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> Collection: {{ collection }}</h1>
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html
index 7c585d3dbf068ceef8a58f2f7d664b867a6679d2..4548d7f31a9a379786a74cd62558b06a3a7df946 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_edit.html
+++ b/telemeta/templates/telemeta_default/collection_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-    <h1>Collection: {{ collection }}</h1>
+    <h1><img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> Collection: {{ collection }}</h1>
 {% endblock %}
 {% block title_buttons %}
     <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>

diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index f570a2d8c03adcbc303d0a2b4c9c19276888bf13..914f4be8011fdbf639ef84b1788c33e52dcc3f80 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Media Collections" %} - {{ block.super }}{% endblock %}
 
 {% block title%}
- <h1>{% trans "Media Collections" %}</h1>
+ <h1><img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> {% trans "Media Collections" %}</h1>
 {% endblock %}
 {% block title_buttons %}
      <a href="{% url telemeta-collections %}" class="component_icon button icon_filter">{% trans "All" %}</a>

diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html
index c9e460f982f445a7979fcdc077c99c15c3f439f5..d4903b61864fe7f1656df1a7a57ac7b8328b2597 100644 (file)
--- a/telemeta/templates/telemeta_default/geo_continents.html
+++ b/telemeta/templates/telemeta_default/geo_continents.html
@@ -17,7 +17,7 @@ var resourceMap = new ResourceMap('.continents', {
 {% endblock %}
 
 {% block title %}
-    <h1>{% trans "Geographic Navigator" %}</h1>
+    <h1><img src="{% url telemeta-images "world_red.png" %}" style="vertical-align:middle" /> {% trans "Geographic Navigator" %}</h1>
 {% endblock %}
 {% block title_buttons %}
         {% if continents %}

diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html
index f604a5c6376a22b3250ac5a43db4e915121181a5..0b01b019379fd9a1c72f3ba4f0a1f4be500cd1b6 100644 (file)
--- a/telemeta/templates/telemeta_default/profile_detail.html
+++ b/telemeta/templates/telemeta_default/profile_detail.html
@@ -23,7 +23,7 @@
   {% endblock %}
   </div>
 
-  <h1>{% trans "User profile" %} : {{ usr.username }}</h1>
+  <h1><img src="{% url telemeta-images "user_red.png" %}" style="vertical-align:middle" /> {% trans "User profile" %} : {{ usr.username }}</h1>
     <div class="infos" style="padding-top: 1em;">
      <dl class="listing">
       <dt>{% trans "First Name" %}</dt><dd>{{ usr.first_name }}</dd>

diff --git a/telemeta/templates/telemeta_default/profile_edit.html b/telemeta/templates/telemeta_default/profile_edit.html
index fa96be2c77d13418d05791c31666d1b0ae66721c..7bf81845164786ab792d7e72c58777ca48e1a9e2 100644 (file)
--- a/telemeta/templates/telemeta_default/profile_edit.html
+++ b/telemeta/templates/telemeta_default/profile_edit.html
@@ -5,7 +5,7 @@
 <a href="{% url telemeta-profile-detail usr.username %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
 
 {% block content %}
-       <h3>{% trans "User profile" %} : {{ usr.username }}</h3>
+       <h1><img src="{% url telemeta-images "user_red.png" %}" style="vertical-align:middle" /> {% trans "User profile" %} : {{ usr.username }}</h1>
        <div class="infos" style="padding-top: 1em;">
        
         <form method="POST" id="_editUserProfileForm" action="">{% csrf_token %}

diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index 6fbfa3a9000ee45965f990630aedb5563be24a17..f7e639d3927ee0acad37e11e1c1eab84a9987ef5 100644 (file)
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -52,7 +52,7 @@ $(document).ready(function () {
 {% endblock %}
 
 {% block content %}
-<h1>{% trans "Advanced Search" %}</h1>
+<h1><img src="{% url telemeta-images "adv_search_red.png" %}" style="vertical-align:middle" /> {% trans "Advanced Search" %}</h1>
 
 <form action="{% url telemeta-search %}" id="searchform">{% csrf_token %}
 <fieldset>

diff --git a/telemeta/templates/telemeta_default/search_results.html b/telemeta/templates/telemeta_default/search_results.html
index 7cf334673bb79c818f0edc9e7ede3fb41cd5381a..1d97564ebd6ca71e866cea4ecd3e0a1321dded43 100644 (file)
--- a/telemeta/templates/telemeta_default/search_results.html
+++ b/telemeta/templates/telemeta_default/search_results.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %}
 
 {% block content %}
-<h3>{% trans "Search Results" %}</h3>
+<h1><img src="{% url telemeta-images "search_red.png" %}" style="vertical-align:middle" /> {% trans "Search Results" %}</h1>
 
 {% if criteria %}
 <ul>