From 95f405c47aba5c8c4cda958660cce4d5941995b4 Mon Sep 17 00:00:00 2001
From: riccardo <riccardo@parisson.com>
Date: Wed, 11 May 2011 19:17:21 +0200
Subject: [PATCH] minor fixes 2

---
 telemeta/htdocs/css/telemeta.css          |  2 +-
 telemeta/htdocs/js/locale.js              |  3 ++-
 telemeta/htdocs/timeside/src/divmarker.js | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index e3350b1e..55c98e28 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -963,7 +963,7 @@ a.image-link {
 }
 
 .markerdiv div{
-    padding:1ex;
+    padding:0.7ex 1ex;
 }
 .markerdiv div[zero_top_padding]{ /*mathces any div with the attribute zero_top_padding set (whatever the value)*/
     padding-top:0px;
diff --git a/telemeta/htdocs/js/locale.js b/telemeta/htdocs/js/locale.js
index f68ed189..f655e59d 100644
--- a/telemeta/htdocs/js/locale.js
+++ b/telemeta/htdocs/js/locale.js
@@ -17,7 +17,8 @@ var localeStrings = {
     'item added to the selected playlist': gettext('item added to the selected playlist'),
     'collection added to the selected playlist': gettext('collection added to the selected playlist'),
     'there is at least one unsaved marker': gettext('there is at least one unsaved marker'),
-    'If you exit the page you will loose your changes' : gettext('If you exit the page you will loose your changes')
+    'If you exit the page you will loose your changes' : gettext('If you exit the page you will loose your changes'),
+    'author' : gettext('author')
 };
 
 function gettrans(str){
diff --git a/telemeta/htdocs/timeside/src/divmarker.js b/telemeta/htdocs/timeside/src/divmarker.js
index 514b5d4b..319a489a 100644
--- a/telemeta/htdocs/timeside/src/divmarker.js
+++ b/telemeta/htdocs/timeside/src/divmarker.js
@@ -122,14 +122,15 @@ var MarkerMapDiv = TimesideArray.extend({
             div.css('backgroundColor','#E65911');
             e_descriptionText.removeAttr('readonly').removeClass('markersdivUneditable');
             e_titleText.removeAttr('readonly').removeClass('markersdivUneditable');
-            e_okButton.show();
+            e_okButton.add(e_okButton.parent()).show(); //hiding also the parent div saves space (padding bottom hidden)
             e_titleText.select(); //TODO: this does NOT set the focus on the div. Why?
             editButton.hide();
         //e_titleText.focus();
         }else{
             e_descriptionText.attr('readonly','readonly').addClass('markersdivUneditable');
             e_titleText.attr('readonly','readonly').addClass('markersdivUneditable');
-            e_okButton.hide();
+            consolelog(e_okButton.parent());
+            e_okButton.add(e_okButton.parent()).hide(); //hiding also the parent div saves space (padding bottom hidden)
             editButton.show();
             div.css('backgroundColor','');
         }
@@ -204,7 +205,8 @@ var MarkerMapDiv = TimesideArray.extend({
             '<a class="markersdivDelete" title="delete"></a>'+
             '</div>'+
             '<div zero_top_padding><textarea class="markersdivDescription"></textarea></div>'+
-            '<div zero_top_padding><a class="markersdivSave">OK</a></div>'); //TODO: avoid text nodes
+            '<div zero_top_padding><a class="markersdivSave">OK</a></div>'+
+        '<div zero_top_padding><span style="font-size:75%;color:#999">'+gettrans('author')+': '+marker.author+'</span></div>'); //TODO: avoid text nodes
         div.find('a').attr('href','#');
         //todo: remove markerlabel from css!!!!!!!
         //new RulerMarker(div.find('.markerlbl'),div.find('.markercanvas'),'marker',false);
@@ -234,7 +236,7 @@ var MarkerMapDiv = TimesideArray.extend({
         e_titleText.val(marker.title ? marker.title : "");
         //}
 
-        e_okButton.hide();
+        e_okButton.add(e_okButton.parent()).hide(); //hiding also the parent div saves space (padding bottom hidden)
         e_editButton.show();
         e_deleteButton.show();
         e_addplaylistButton.show();
-- 
2.39.5