From: yomguy <yomguy@parisson.com>
Date: Tue, 10 May 2011 11:03:41 +0000 (+0200)
Subject: fix some titles, update some icons
X-Git-Tag: 1.1~225
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=828436111819767238e7d7c351dcaaaf30cf263c;p=telemeta.git

fix some titles, update some icons
---

diff --git a/telemeta/htdocs/css/admin.css b/telemeta/htdocs/css/admin.css
index 75a3afd8..4bd69808 100644
--- a/telemeta/htdocs/css/admin.css
+++ b/telemeta/htdocs/css/admin.css
@@ -3,7 +3,7 @@
 .tabs {
  border: 1px solid #6a0307;
  /* border-color: gray black black gray;*/
- margin: 1.8em 0;
+ margin: 0em 0;
  padding: .3em 0 0 .5em;
  float: left;
  width: 15em;
@@ -22,7 +22,7 @@
 .tabs :link:hover, .tabs :visited:hover { background: transparent }
 
 .tabcontents {
- padding: 0.4em 2em;
+ padding: 0em 2em;
  margin-left: 17em;
  min-height: 300px;
 }
diff --git a/telemeta/htdocs/images/collections_red.png b/telemeta/htdocs/images/collections_red.png
index 117e70b7..eb8a4de3 100644
Binary files a/telemeta/htdocs/images/collections_red.png and b/telemeta/htdocs/images/collections_red.png differ
diff --git a/telemeta/htdocs/images/user_red.png b/telemeta/htdocs/images/user_red.png
index 7fafb7a7..0ff3ac45 100644
Binary files a/telemeta/htdocs/images/user_red.png and b/telemeta/htdocs/images/user_red.png differ
diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html
index 7824274a..ff32173e 100644
--- a/telemeta/templates/telemeta_default/admin.html
+++ b/telemeta/templates/telemeta_default/admin.html
@@ -7,9 +7,12 @@
 <link rel="stylesheet" type="text/css" href="{% url telemeta-css "admin.css" %}" />
 {% endblock %}
 
-{% block content %}
+{% block title %}
 <h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %}</h1>
-<br />
+{% endblock %}
+
+{% block content %}
+
 {% block tab %}
 <div class="tabs">
 <ul>
diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html
index d4903b61..ef557d5d 100644
--- a/telemeta/templates/telemeta_default/geo_continents.html
+++ b/telemeta/templates/telemeta_default/geo_continents.html
@@ -17,14 +17,16 @@ var resourceMap = new ResourceMap('.continents', {
 {% endblock %}
 
 {% block title %}
-    <h1><img src="{% url telemeta-images "world_red.png" %}" style="vertical-align:middle" /> {% 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 %}
         <a href="#" onclick="resourceMap.toggle('map'); return false;" class="component button">{% trans "Map" %}</a> |
         <a href="#" onclick="resourceMap.toggle('list'); return false;" class="component button">{% trans "List" %}</a>
         {% endif %}
 {% endblock %}
+
 {% block content %}
 {% if continents %}
 <ul class="continents">
diff --git a/telemeta/templates/telemeta_default/geo_countries.html b/telemeta/templates/telemeta_default/geo_countries.html
index 66ef1804..30bee517 100644
--- a/telemeta/templates/telemeta_default/geo_countries.html
+++ b/telemeta/templates/telemeta_default/geo_countries.html
@@ -4,9 +4,12 @@
 
 {% block head_title %}{{ continent }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
 
-{% block content %}
+{% block title %}
 <h1><img src="{% url telemeta-images "world_red.png" %}" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
   {{ continent }}</h1>
+{% endblock title %}
+
+{% block content %}
 <table class="listing">
 <tr>
     <th>{% trans "Country" %}</th>
diff --git a/telemeta/templates/telemeta_default/login.html b/telemeta/templates/telemeta_default/login.html
index f9d3f7e0..db020262 100644
--- a/telemeta/templates/telemeta_default/login.html
+++ b/telemeta/templates/telemeta_default/login.html
@@ -1,9 +1,12 @@
 {% extends "telemeta/base.html" %}
 {% load i18n %}
 
+{% block title %}
+<h1><img src="{% url telemeta-images "user_red.png" %}" style="vertical-align:middle" /> {% trans "User authentication" %}</h1>
+{% endblock %}
+
 {% block content %}
-<h1>{% trans "User authentication" %}</h1>
-<br />
+
 {% if form.errors %}
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
 {% endif %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index 0a0afcb1..6a0fef67 100644
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -5,15 +5,16 @@
   {% block title %}
     <img src="images/item.png" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
+  
   {% block title_buttons %}
    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
   {% endblock %}
 
   {% block infos %}    
     <div class="infos">
-     <form enctype="multipart/form-data" id="_editItemForm" method="POST" action="">{% csrf_token %}
-     <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
+     <form enctype="multipart/form-data" id="_editItemForm" method="POST" action="">{% csrf_token %}   
       <table>
+       <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
        {% for field in form %}
         {% if not field.html_name == "copied_from_item" %}
         <tr>
diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index f7e639d3..da523e32 100644
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -51,9 +51,11 @@ $(document).ready(function () {
 </script>
 {% endblock %}
 
-{% block content %}
+{% block title %}
 <h1><img src="{% url telemeta-images "adv_search_red.png" %}" style="vertical-align:middle" /> {% trans "Advanced Search" %}</h1>
+{% endblock %}
 
+{% block content %}
 <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 1d97564e..a6ab0d62 100644
--- a/telemeta/templates/telemeta_default/search_results.html
+++ b/telemeta/templates/telemeta_default/search_results.html
@@ -4,9 +4,11 @@
 
 {% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %}
 
-{% block content %}
+{% block title %}
 <h1><img src="{% url telemeta-images "search_red.png" %}" style="vertical-align:middle" /> {% trans "Search Results" %}</h1>
+{% endblock %}
 
+{% block content %}
 {% if criteria %}
 <ul>
   {% if criteria.pattern %}