fixed minor stuff

-------------This line and the following will be ignored --------------

modified:
  telemeta/htdocs/js/locale.js
  telemeta/htdocs/timeside/src/divmarker.js
  telemeta/htdocs/timeside/src/markermap.js
  telemeta/htdocs/timeside/src/player.js
unknown:
  telemeta/htdocs/js/soundmanager2-jsmin.js
  telemeta/htdocs/js/soundmanager2-nodebug.js
  telemeta/htdocs/swf/soundmanager2_debug.swf
  telemeta/htdocs/timeside/skins/lab/img/empty.png

diff --git a/telemeta/htdocs/js/locale.js b/telemeta/htdocs/js/locale.js
index c2de5388074469355a0ad4139fa9dfe2c099b4b7..f68ed18924e20ee4d77a3eb8cec105abd2724f07 100644 (file)
--- a/telemeta/htdocs/js/locale.js
+++ b/telemeta/htdocs/js/locale.js
@@ -15,7 +15,9 @@ var localeStrings = {
     'delete the marker permanently?': gettext('delete the marker permanently?'),
     'marker added to the selected playlist': gettext('marker added to the selected playlist'),
     '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')
+    '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')
 };
 
 function gettrans(str){

diff --git a/telemeta/htdocs/timeside/src/divmarker.js b/telemeta/htdocs/timeside/src/divmarker.js
index 1245ad184440ddd4f5d52afd76f7ba7d682b2e32..514b5d4baf84e34b0d36c2056393a804f983b488 100644 (file)
--- a/telemeta/htdocs/timeside/src/divmarker.js
+++ b/telemeta/htdocs/timeside/src/divmarker.js
@@ -261,8 +261,9 @@ var MarkerMapDiv = TimesideArray.extend({
             return false;
         });
 
-
-
+        if(!this.getCurrentUserName()){
+            e_addplaylistButton.hide();
+        }
 
 
         if(!marker.isEditable){ //marker is editable means that author == getCurrentUserName(). addToPlaylist

diff --git a/telemeta/htdocs/timeside/src/markermap.js b/telemeta/htdocs/timeside/src/markermap.js
index 000d7cba305705dce568bb839adae7077fb95c44..bc3fe85e8b7387ef116b5886d5e7646594071a15 100644 (file)
--- a/telemeta/htdocs/timeside/src/markermap.js
+++ b/telemeta/htdocs/timeside/src/markermap.js
@@ -29,8 +29,8 @@ var MarkerMap = TimesideArray.extend({
             });
             consolelog(markerUnsaved);
             if(markerUnsaved>0){
-                return 'There ' + (markerUnsaved==1 ? 'is ' : 'are ') + markerUnsaved+ ' unsaved marker'+
-                    (markerUnsaved==1 ? '' : 's') + '. If you exit the page you will loose your changes';
+                return gettrans('there is at least one unsaved marker') +' ('+ markerUnsaved+ '). '+
+                    gettrans('If you exit the page you will loose your changes');
             }
                 
         };

diff --git a/telemeta/htdocs/timeside/src/player.js b/telemeta/htdocs/timeside/src/player.js
index 7e9470c038a42bcd808006fd883ffd4311af1ac7..c53033178bab3356ca58ffbe1cfee03a0ea8f3ec 100644 (file)
--- a/telemeta/htdocs/timeside/src/player.js
+++ b/telemeta/htdocs/timeside/src/player.js
@@ -6,7 +6,8 @@ var Player = TimesideClass.extend({
         this._super();
         var player = this;
 
-
+        //container is the div #player
+        
         if (!container){
             this.debug('ERROR: container is null in initializing the player')
         }