From 7220f72e276dfa0195c99f5f35d133a048bece52 Mon Sep 17 00:00:00 2001 From: riccardo Date: Mon, 14 Mar 2011 20:06:14 +0100 Subject: [PATCH] icon button fixed. Still error on add marker if different admin --- telemeta/htdocs/css/telemeta.css | 15 ++++++++++---- telemeta/htdocs/images/logout.png | Bin 1032 -> 674 bytes telemeta/htdocs/images/save.png | Bin 563 -> 695 bytes telemeta/templates/telemeta_default/base.html | 2 +- .../telemeta_default/collection_detail.html | 12 ++++++++--- .../telemeta_default/collection_list.html | 2 +- .../telemeta_default/mediaitem_add.html | 6 +++--- .../telemeta_default/mediaitem_detail.html | 19 +++++++----------- .../telemeta_default/mediaitem_edit.html | 6 +++--- .../telemeta_default/mediaitem_list.html | 2 +- 10 files changed, 36 insertions(+), 28 deletions(-) diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index 15445b25..deafdc13 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -953,8 +953,8 @@ a.image-link { } -.mediaitem_button, .mediaitem_button:hover, .mediaitem_button:visited, -.mediaitem_button:link, .mediaitem_button:link:hover, .mediaitem_button:visited:hover{ +.mediaitem_button, .mediaitem_button:visited, +.mediaitem_button:link{ padding:0.7ex 1ex 0.7ex 4ex; /*top right bottom left*/ border-top: 1px solid #DDD; border-left: 1px solid #DDD; @@ -965,8 +965,14 @@ a.image-link { font-weight: bold; background-repeat: no-repeat; background-position: 1ex .5ex; - - + -moz-border-radius: 1ex 1ex 1ex 1ex; + -webkit-border-radius: 1ex 1ex 1ex 1ex; + border-radius: 1ex 1ex 1ex 1ex; +} +.mediaitem_button:hover,.mediaitem_button:link:hover, .mediaitem_button:visited:hover{ + background-color: #e9e9d9; + color:#6A0307; + text-decoration: none; } .mediaitem_button_edit{ background-image: url('/images/edit_page.png'); @@ -988,6 +994,7 @@ a.image-link { background-image: url('/images/cancel.png'); } .mediaitem_button_save{ + color:#6A0307 !important; background-image: url('/images/save.png'); } .mediaitem_button_add{ diff --git a/telemeta/htdocs/images/logout.png b/telemeta/htdocs/images/logout.png index b18ffcd5d7c07efc88fbe0d8d692577c319890b4..51ed2dcfbe319f22c4057de920e962ef428df889 100644 GIT binary patch delta 619 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 b@B9n<(h?r_7f?@J00000NkvXXu0mjf50vq5 diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index 15934e98..7b5d286d 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -41,7 +41,7 @@ Welcome, {% endif %} Account | Help | {% trans "Sign out" %} - + {% else %} Help | {% trans "Sign in" %} diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index 5abd52f0..d939e304 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -12,13 +12,19 @@ {% block submenu %}
- Dublin Core - + + Dublin Core + {% if user.is_authenticated and perms.telemeta.change_mediacollection %} {% block tools %} - + + + Edit + Copy + {% endblock tools %} {% endif %} diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html index 7cf243b6..1528c049 100644 --- a/telemeta/templates/telemeta_default/collection_list.html +++ b/telemeta/templates/telemeta_default/collection_list.html @@ -8,7 +8,7 @@
{% if user.is_authenticated and perms.telemeta.add_mediacollection %} - Add + Add {% endif %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html index 3b7eafc5..9f817cff 100644 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ b/telemeta/templates/telemeta_default/mediaitem_add.html @@ -13,7 +13,7 @@ Cancel + class="mediaitem_button mediaitem_button_cancel">Cancel {% endblock tools %} {% endif %} @@ -41,8 +41,8 @@ --> Cancel -Cancel +Save
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html index e39d9b05..20deac60 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -42,25 +42,20 @@
{% block tools %} - Dublin Core + Dublin Core {% if user.is_authenticated and perms.telemeta.change_mediaitem %} -<<<<<<< TREE - + - Edit - Copy + Edit + Copy + - -======= - EDIT - ->>>>>>> MERGE-SOURCE {% endif %} - Previous - Next + Previous + Next {% endblock tools %}
{% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html index 8abed4ce..e3b80b22 100644 --- a/telemeta/templates/telemeta_default/mediaitem_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_edit.html @@ -3,7 +3,7 @@ {% block tools %} - Cancel + Cancel {% endblock tools %} {% block infos %} @@ -23,8 +23,8 @@ Cancel -Cancel +Save diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html index b53f4f72..e0532763 100644 --- a/telemeta/templates/telemeta_default/mediaitem_list.html +++ b/telemeta/templates/telemeta_default/mediaitem_list.html @@ -9,7 +9,7 @@
{% if user.is_authenticated and perms.telemeta.add_mediaitem %} - Add + Add {% endif %}
{% endblock %} -- 2.39.5