icon button fixed. Still error on add marker if different admin

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 15445b25a8e1de942741729568ea554befd13302..deafdc1312299f8d2351e3e4057b4c09d9c5fbc3 100644 (file)
--- 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 (file)
Binary files a/telemeta/htdocs/images/logout.png and b/telemeta/htdocs/images/logout.png differ

diff --git a/telemeta/htdocs/images/save.png b/telemeta/htdocs/images/save.png
index 8072aea3268164eb2028a0cebfe44da82b4f4aca..afc8725c820349e547fb3a146f12458561d17a6c 100644 (file)
Binary files a/telemeta/htdocs/images/save.png and b/telemeta/htdocs/images/save.png differ

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 15934e982457de6115ca5a6d405db3323b9f3c88..7b5d286d687d3b96d98cca4fb5aa6a4ee9d1580a 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -41,7 +41,7 @@ Welcome,
 {% endif %}
 Account | Help | 
 <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
-<img src="images/close.png" style="vertical-align:middle" /></a>
+<img src="images/logout.png" style="vertical-align:middle" /></a>
 {% else %}
 Help |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 5abd52f047ec74f5cc9b55ea69c2e23aba9ce5b9..d939e3045a6c48848f71464853bc09c96a6d5729 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -12,13 +12,19 @@
 
 {% block submenu %}
     <div>
-    <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
-    
+<!--    <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>-->
+    <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
+
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
      {% block tools %}
-     <a href="{% url telemeta-collection-edit collection.public_id %}">
+     <!--<a href="{% url telemeta-collection-edit collection.public_id %}">
       <img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
       <button><a href="{% url telemeta-collection-copy collection.public_id %}">Copy</a></button>
+      -->
+
+       <a href="{% url telemeta-collection-edit collection.public_id %}" class="mediaitem_button mediaitem_button_edit">Edit</a>
+    <a href="{% url telemeta-collection-copy collection.public_id %}" class="mediaitem_button mediaitem_button_copy">Copy</a>
+
      {% endblock tools %}
     {% endif %}
     

diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index 7cf243b62733584a4e0c107ceda97a745ae496c1..1528c0491fd5d0d6ae3d5c28178b9a65f18cd059 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -8,7 +8,7 @@
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
 <!--     <button><a href="{% url telemeta-collection-add %}">Add</a></button>-->
-      <a href="{% url telemeta-collection-add %}" class="roundBorder6 mediaitem_button mediaitem_button_add">Add</a>
+      <a href="{% url telemeta-collection-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
 
     {% endif %}
     </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index 3b7eafc5c0ecfaa06e8617ec13d4c5a5b4a1223c..9f817cfffb59ee201495a2650ec1436516c57709 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -13,7 +13,7 @@
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" /></a>-->
  <a href="{% url telemeta-item-detail item.public_id %}"
-           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
+           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
     {% endblock tools %}
     
     {% endif %}
@@ -41,8 +41,8 @@
          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
         <a href="{% url telemeta-item-detail item.public_id %}"
-           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
-<a href="#" class="roundBorder6 mediaitem_button mediaitem_button_save"
+           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+<a href="#" class="mediaitem_button mediaitem_button_save"
    onclick="document.getElementById('_addItemForm').submit(); return false;">Save</a>
        </div>
      </form>

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index e39d9b05d747cd061f300b3a1e2a6b6fa7728ee5..20deac60859e63ded73e9c75a9c5b6ec4b0fe796 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -42,25 +42,20 @@
 <div>
     {% block tools %}
     <!--<a href="{% url telemeta-item-dublincore item.public_id %}">Dublin Core</a>-->
-    <a href="{% url telemeta-item-dublincore item.public_id %}" class="roundBorder6 mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
+    <a href="{% url telemeta-item-dublincore item.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
     {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
-<<<<<<< TREE
-    
+
     <!--<a href="{% url telemeta-item-edit item.public_id %}"><img src="images/edit_page.png" style="vertical-align:middle" alt="EDIT" /></a>
     <button><a href="{% url telemeta-item-copy item.public_id %}">Copy</a></button>-->
-    <a href="{% url telemeta-item-edit item.public_id %}" class="roundBorder6 mediaitem_button mediaitem_button_edit">Edit</a>
-    <a href="{% url telemeta-item-copy item.public_id %}" class="roundBorder6 mediaitem_button mediaitem_button_copy">Copy</a>
+    <a href="{% url telemeta-item-edit item.public_id %}" class="mediaitem_button mediaitem_button_edit">Edit</a>
+    <a href="{% url telemeta-item-copy item.public_id %}" class="mediaitem_button mediaitem_button_copy">Copy</a>
+
 
-    
-=======
-    <a href="{% url telemeta-item-edit item.public_id %}"><img src="images/edit_page.png" style="vertical-align:middle" alt="EDIT" /></a>
-    <button><a href="{% url telemeta-item-copy item.public_id %}">Copy</a></button>
->>>>>>> MERGE-SOURCE
     {% endif %}
     <!--<a href="{% url telemeta-item-detail previous %}"><img src="images/previous.png" style="vertical-align:middle" alt="PREVIOUS" /></a>
     <a href="{% url telemeta-item-detail next %}"><img src="images/next.png" style="vertical-align:middle" alt="NEXT" /></a>-->
-     <a href="{% url telemeta-item-detail previous %}" class="roundBorder6 mediaitem_button mediaitem_button_previous">Previous</a>
-    <a href="{% url telemeta-item-detail next %}" class="roundBorder6 mediaitem_button mediaitem_button_next">Next</a>
+     <a href="{% url telemeta-item-detail previous %}" class="mediaitem_button mediaitem_button_previous">Previous</a>
+    <a href="{% url telemeta-item-detail next %}" class="mediaitem_button mediaitem_button_next">Next</a>
     {% endblock tools %}
 </div>
 {% endblock %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index 8abed4ce9958b7459ce3b8a084e4966bc9ba3b18..e3b80b222c8632f97e3330c65ebf644c0af441af 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -3,7 +3,7 @@
     {% block tools %}
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" /></a>-->
- <a href="{% url telemeta-item-detail item.public_id %}"  class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
+ <a href="{% url telemeta-item-detail item.public_id %}"  class="mediaitem_button mediaitem_button_cancel">Cancel</a>
     {% endblock tools %}
 
   {% block infos %}    
@@ -23,8 +23,8 @@
 <!--        <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
         <a href="{% url telemeta-item-detail item.public_id %}"
-           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
-<a href="#" class="roundBorder6 mediaitem_button mediaitem_button_save"
+           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+<a href="#" class="mediaitem_button mediaitem_button_save"
    onclick="document.getElementById('_editItemForm').submit(); return false;">Save</a>
 <!--           <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
        </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index b53f4f72a8473547b8dfdc062797518eab95fbbb..e05327630bc4a50fcd61178122c879ded84f24f5 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -9,7 +9,7 @@
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
     <!-- <button><a href="{% url telemeta-item-add %}">Add</a></button>-->
-     <a href="{% url telemeta-item-add %}" class="roundBorder6 mediaitem_button mediaitem_button_add">Add</a>
+     <a href="{% url telemeta-item-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
     {% endif %}
     </div>
 {% endblock %}