From 828436111819767238e7d7c351dcaaaf30cf263c Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Tue, 10 May 2011 13:03:41 +0200
Subject: [PATCH] fix some titles, update some icons

---
 telemeta/htdocs/css/admin.css                 |   4 ++--
 telemeta/htdocs/images/collections_red.png    | Bin 220 -> 325 bytes
 telemeta/htdocs/images/user_red.png           | Bin 1306 -> 1360 bytes
 .../templates/telemeta_default/admin.html     |   7 +++++--
 .../telemeta_default/geo_continents.html      |   4 +++-
 .../telemeta_default/geo_countries.html       |   5 ++++-
 .../templates/telemeta_default/login.html     |   7 +++++--
 .../telemeta_default/mediaitem_edit.html      |   5 +++--
 .../telemeta_default/search_criteria.html     |   4 +++-
 .../telemeta_default/search_results.html      |   4 +++-
 10 files changed, 28 insertions(+), 12 deletions(-)

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 117e70b745b6a799127c4643f0dd0e0b5fab3c1c..eb8a4de3f9666e34fb021dd8d8685ec31660000d 100644
GIT binary patch
delta 264
zcmV+j0r&pg0mTB4F%Je}OGiWi{{a60|De66laVeMf7nSxK~z}7?N>n#f-n#q=_VjP
zL0>2_oOuCW4ayIB0%{YBUNEV(mI!M~V&~MfWoCA_ECu*?EX;|mh?f9z041YN0pL(8
zd2t%(#m_$sI5ka>u_1pBPPZ$YYDS69zjtNeu8V6Aj)uY2)Jkq#8L+v2LnT}5{4QQu
zd9-Y<Zq0QX6ICPxTX|?=O(!Gr-3NjJ?*?e-{q<&m^Q60iAx^?ErssPGLL&+Wf`MRw
z>sw&(G((N308nO>ppxy!yWcnHl+y2t$JzZCyp*6{O#4i5qOgev%mNPrwn#&afirjj
O0000<MNUMnLSTaM26K1-

delta 161
zcmV;S0ABya0^9+RF_A+Re}PFvK~z}7V_+Bs0}L3^1+tjg|I^B{X@7rW*vEoR;nY7r
zsBU>S3kOzl7E(2k1Mqo>g&YGX|NM$oJeQrDWV6U}067-n0!#y)3q~C<>HrpU@-AH*
zFsKV6Tn3WkXtEqY&CnUm1)~lab-<_t25)7AtKCNz2T-%99R;I+7Z3mdc19V!pe%@*
P00000NkvXXu0mjf#kxKs

diff --git a/telemeta/htdocs/images/user_red.png b/telemeta/htdocs/images/user_red.png
index 7fafb7a75bf4690dc7aa5c0382de7a51d4eb19d3..0ff3ac45f62cda5f93dadbfd2ca4033bf163c23c 100644
GIT binary patch
delta 1308
zcmV+%1>^df3eXCWF%Je}OGiWi{{a60|De66laVeMf8$9+K~z}7y_ef_6IC3?KWBHF
z(xjK9NlJR9H(F?I1zNNPMVwI_L@ZB^GvEuOe}Vr1e~B~bt1mj}j5<CjgU<L+S}BEM
z!Im~)X_~Z2)7*B?@gWyddfDar%VcJg{hhO)-}jvJJ!i!Q44#Ny;0xeOUQT=qd<Far
zSj9g@e;G&}Fby>EY9b0817-lUGKkez2mw$J+%AkjNsj5=S|}6%5(^21Ut2>Iz8a$N
z(VPJN0W=r|qNd$JBmlL(Ac6LMH1_u5@p;j79S|rbF*6zN|9ykSshgxW;z$&RGmv`V
zlu?+NyDFhj=oqvP4lp!!mZ5WF1Uou5<>u09f39BsnyZ(;VR34Tjl^21y+GK(T+|2A
zezF@D9i6&Rh?AdR<oIXjsSAY=+U9C?!ywS!PGfHm(y~aeC0JjLqL66z%5)lb84^jg
zx1QG52k1OHOidv07*Z7~7Ws;60)Ae5|2@*{>!cD1q6>>;&9oC`_Sm2*ETAs5mjfqG
ze{6!-v4xa$kB-tkGJ?nNN5?3E>=w3~DZu0P($d#Qb$$INHG~idAy7({)X{VuUt@^9
zU0wKFTX4CnN|XJ$KqTODyYV$OQt5F&UaCTDx-J40quO6jZ9|ZX$~_MBumLG{plKS0
z%Z1SOr*bS!H?~abXI2D2Xd1f9W!vc%f0Z0UI0jKlVVNdKWt&%it)zT0AVtg0rc%V0
zmdK<wo@!_;({v1@IY~&x<1Ee2l3I&zTm5!JlUj?DjKwgsS$ki#2gz?+$!LuE$w?BC
zh;4_`vRIGCSe~CJwiqUxN;$E3XNn{u5oZ7Vi{*R&Zd-l1k65P3!`m}FxOIy}e<Xq_
zvyOIQ2Ov7B^g0h`X1G5&$)mgXuyVOALsA6GB$LdIj}xA{NhX~{6|CJ(6=%yAFf$o$
z{q{T8uUsLMOzxN)UtZ?UwQDTioJOFbIhrA0*jv2B1WZg~;V>%;i}|IzLu8X1MCRs+
ztt^!)&0GBLsu<<ly+CZ*pacR<e;5cQF^md4en0LyFGAbdVKqa?<?&GEawDZgS|+G`
z|4;V4=@>DHcB%ZPLSZ4vqEJYJEv<A84>Rz=DGr@JP0#UT_*+}h4Pys))u^hi!Qa+K
zO&~xnon~Wol?)aNg|@?-5f?C2`I%J5z~l2#6ATjA*G5Z!Kh6DpH1_tCe>!(n?b*@3
z&0LQ4l@+3kVIIxiWqx9U@bok*_ZNtU!z5RtSjsG!LlH=vM=$ARVNvIApl5WHLm!=?
z@7<Hs1OrsM-3VPrXj*A?lrP^cHeXoIQs&RHu?G*C8y{!lhaZ{x<yR8Rk1%Bp4ZQ?n
zC?pDnp;yu~a-4%F-=X*If46Aq@5k5NwCe+l_sU&X2mvDBy{79J6%~Z`cT-hcLw$2I
z?S~ID{@wS?U7sMCh~?)828KdW>2ee7=wSHV7(?gA*xTJ@`|u}sTDx3tD1<i@qIGZ}
z4_H~r!i^~skqDNVMem18tq1!U`ScTxe0-Ls1HF#7dRzb5CReYhf1shG9e-OJLep4}
ztPqbyFci?x*}>s6AJW*ff7^<l7oz--t?BtUg6@$wky7&Coqt%kcPH;7b)gXLLr0$Z
zp-!R7i>vng>3ZWR-o_AC(c+)xB=sVIN^a_M72XyLAiG)i%M3G{MOqdD_#ah%>IOza
S`Z53j002ovPDHLk0$_sA`EyhN

delta 1255
zcmV<D1Q`3!3YrR#F_A+Rf4@mYK~z}7#g|)8R96(oe|zu4ATwMBW(Ehj2!fzctO~YJ
zTWgbEVy(reriu2Y=?C$v*nWaGwl7T|T4S2@0imK+ixz~DA_F6HVJ@7rcOT~BAPjTx
zlCH@lCpqh^{a^pR_J6G{E@K(0m?7_?anL}e4@BWF5rv<`tyylIe+(Lc#^w;g?t`=q
z4B%__Bb5RK#%SzpmPdcyVsYj+>5VuVgY~L_6qzs>6c(Mwh8dZ-z{tf3LOnfOd^a;0
zu3!C@>sP;Hab|{%#Cqv_fv5^Z9YbEJ21cQ13WquS&DWg%>Jm-iFhXw4R#_Io?rz!!
z`q7R<W<5dj=^6%&e{{i2)veKJ>isQrzB$aHQ=>ElgU>*kLdGJWaYHb`8y|g0CYdCi
zNU*lBNY2i<Vn$Z04hLuo@8`&wGh0AZ{6cH`#>eR!8^ad}ps-3nb~9PMP{HT-(=j+m
zeM`$0HiQreAuz_2*pW)n+!khkZ!dw)4m{qvQn9}j5Dj>|e_omov{CExK0B&HY<VsM
zDq4M@g~rwpHMRR(@KFUwF@Tg3%i}>P#a>J*Yg<vjFe3m$N|eV_HRv{$q<bB4<!Ow;
zv2D<%s$coD(fZW@DN1%OohH7#Og6o-r>${p+cg;J#vvV#vphRXdOf~l_B(A&dOc1m
z7Q@cvT<B_5e<1m`m0F82KRrz%8m$^oI}XXU7%TJh#1<pu(rH%`?~0K`G|KGnf3WiK
zpB=L=*Ad6IS^Dc9kMG_k5shN&oU1PE0*E4=NwReB9*?G{dGg>P&gSN}Ehz%arc%sJ
zP7;~9O*WIl6r{ZxEAEajU}v-3{q;9)Ub{v%m8$3)e_vVQ{*4<f-oArCB3)I8i>7DL
z*no{qED~XLVKIM{D_AbIL3D1O*y?gA)4as*&Wcsu?ge5?gAxd&un<OLSvB|q0lZCq
zgsiNv(o%SQKI%MPwAN_H29uBfeC&$zND+vGCWpbG33YUGXmpg}Pd?`OxpVZNeuqG3
z2g<T4f2gaZuCakYR~HSzAe)&C8&98-#lc{Z6>3IY#xmtIslvk7+)P6#MDSo29YaI3
z4-L{b&|eDfsoPgkzU|FTlB=t%Ek<}U`+)hWDI$07u=;3$wMc~2>Kcx*OX5%jBrc&!
zd^tEY1zPDJALsaI=NbIqEDfO`wO%hmDTI`zf74NZe7DJb;W%rZpJii@mzbNJWa`JC
znECk^5-U%z^(GQk0%93727{$)=^s1I(X;O}@ZP(03=PrTeqh%Hi|@)+RtNziA6_bj
zRZ~Owa36Jz4Yahk(|zIuli&Zq+|4OciCDfqu&@k<T921dPY<IPCm6Xn!T!G9s*6A0
ze`%}v`om%T;V_-YhVuYxYgxE8Ln0c*v2&;)xYBuakg+en;N<5QIB;aZb*rzcKRfuU
zni^Vrx(Rf3A*3W3T_qli=5JT6hk7`1{!`le5AT@K%YrB$vZc!32>Qm}Mr+N#_y1<$
z;r+ahG=;--kDPqrMcslbPp&=?p!cm)UHIF=I7Nxy%Ov$G0F~6#<0;%03qW?0?AK{_
zE{ArU!hN}LOM8B%(9Y`zS7by0mfC?4xyNb!Wf`dfq{1STNd7NdQ)EP8@gHha@C+O*
Rf5-p;002ovPDHLkV1me5V|@Ss

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 %}
-- 
2.39.5