Notification for required rescans

README.md

@@ -20,7 +20,7 @@ A music player for FLAC, MP3, MP4, and more with playlist support and share play
 - Stream URLs
 
 ### Supported Formats
-FLAC, MP3, MP4, Ogg Vorbis, Opus, and Waveform Audio. Playing the formats supported by Audio Player depends on the browser. [Read more …](https://github.com/rello/audioplayer/wiki/audio-files-and-mime-types)
+FLAC, MP3, MP4, Ogg Vorbis, Opus, and Waveform Audio. Playing the formats supported by Audio Player depends on the browser. [More information…](https://github.com/rello/audioplayer/wiki/audio-files-and-mime-types)
 
 ### Supported Browsers
 Latest versions of Chrome, Firefox, and Safari. Mobile browsers may be restricted in functionality and handling.

appinfo/info.xml

@@ -35,7 +35,7 @@ See [README](https://github.com/rello/audioplayer/blob/master/README.md) file fo
 - **Stream-URLs**
 
 Siehe [README](https://github.com/rello/audioplayer/blob/master/README.md)-Datei für alle unterstützten MIME-Typen und Einschränkungen.]]></description>
-	<version>2.2.0-alpha.6</version>
+	<version>2.2.0-alpha.7</version>
 	<licence>AGPL</licence>
 	<author>Marcel Scherello</author>
 	<author>Thomas Marx</author>

js/app.js

@@ -32,7 +32,7 @@ Audios.prototype.init = function () {
 		var locHashTemp = searchresult.split('-');
 	}
 
-	myAudios.get_uservalue('category', function(someElement) {
+	myAudios.get_uservalue('category', function() {
 		// Category View
 		if ($this.category_selectors[0] && $this.category_selectors[0]!== 'Albums') {		
 			window.location.href='#';
@@ -166,16 +166,16 @@ Audios.prototype.AlbumSongs = function(){
 				}
 
 				var ClonePlaylist = myWrapper.find('li').clone();
-				$('#activePlaylist').html('');
-				$('#activePlaylist').append(ClonePlaylist);
+                $this.ActivePlaylist.html('');
+                $this.ActivePlaylist.append(ClonePlaylist);
 				$('#activePlaylist span.actionsSong').remove();
 				$('#activePlaylist span.number').remove();
 				$('#activePlaylist span.time').remove();
 				$('#activePlaylist span.edit').remove();
 				$('#activePlaylist li.noPlaylist').remove();
 
 				 var myCover=$('.album.is-active .albumcover');
-				 if(myCover.css('background-image') == 'none'){
+				 if(myCover.css('background-image') === 'none'){
 					$('.sm2-playlist-cover').text(myCover.text()).css({'background-color':myCover.css('background-color'),'color':myCover.css('color'),'background-image':'none'});
 				}else{
 					$('.sm2-playlist-cover').text('').css({'background-image':myCover.css('background-image')});
@@ -382,9 +382,8 @@ Audios.prototype.buildAlbumRows = function(aAlbums){
 };
 
 Audios.prototype.loadAlbums = function(){
-	 $this = this;
 	 $('.sm2-bar-ui').hide();
-	 this.AlbumContainer.hide();
+    $this.AlbumContainer.hide();
 	 $('#loading').show();
 	$.ajax({
 		type : 'GET',
@@ -448,8 +447,8 @@ Audios.prototype.loadAlbums = function(){
 							$('.albumSelect li i.ioc').hide();
 				 			myWrapper.addClass('isPlaylist');
 				 			var objCloneActivePlaylist= $(this).parent().parent().find('.albumSelect li').clone();
-				 			$('#activePlaylist').html('');
-							$('#activePlaylist').append(objCloneActivePlaylist);
+                            $this.ActivePlaylist.html('');
+                            $this.ActivePlaylist.append(objCloneActivePlaylist);
 							$('#activePlaylist span').remove();
 							$('#activePlaylist li.noPlaylist').remove();
 							 if($this.AudioPlayer === null){
@@ -578,7 +577,6 @@ Audios.prototype.loadSongsRow = function(elem){
 Audios.prototype.loadCategory = function(){	
 	var $this = this;
 	var category = $this.category_selectors[0];
-	$('.sm2-bar-ui').show();
 	$('#addPlaylist').addClass('ap_hidden');
 	$('#myCategory').html('');
 	$('.toolTip').tooltip('hide');
@@ -630,6 +628,13 @@ Audios.prototype.loadCategory = function(){
 					$("#app-navigation").scrollTop($("#app-navigation").scrollTop()+$('#myCategory li.active').first().position().top - 25);
 					$this.loadIndividualCategory();
 				}
+            }else{
+                $('.sm2-bar-ui').hide();
+                $this.PlaylistContainer.hide();
+                $this.AlbumContainer.show();
+                $this.AlbumContainer.html('<span class="no-songs-found">'+t('audioplayer','Welcome to')+' '+t('audioplayer','Audio Player')+'</span>');
+                $this.AlbumContainer.append('<span class="no-songs-found-pl"><i class="ioc ioc-refresh" title="'+t('audioplayer','Scan for new audio files')+'" id="scanAudiosFirst"></i> '+t('audioplayer','Add new tracks to library')+'</span>');
+                $this.AlbumContainer.append('<a class="no-songs-found-pl" href="https://github.com/rello/audioplayer/wiki" target="_blank">'+t('audioplayer','Help')+'</a>');
 			}
 		}
 	});
@@ -675,7 +680,8 @@ Audios.prototype.loadIndividualCategory = function(evt) {
 		success : function(jsondata) {
 			var albumcount = '';
 			if(jsondata.status === 'success'){
-				$(jsondata.data).each(function(i,el){			
+                $('.sm2-bar-ui').show();
+				$(jsondata.data).each(function(i,el){
 
 					var li = $('<li/>').attr({
 						'data-trackid' : el.id,
@@ -841,7 +847,12 @@ Audios.prototype.loadIndividualCategory = function(evt) {
 				}
 
 			}else{
-				$('#individual-playlist').html('<span class="no-songs-found-pl">'+t('audioplayer','Add new tracks to playlist by drag and drop')+'</span>');
+                $('.sm2-bar-ui').hide();
+                $this.PlaylistContainer.hide();
+                $this.AlbumContainer.show();
+                $this.AlbumContainer.html('<span class="no-songs-found">'+t('audioplayer','Welcome to')+' '+t('audioplayer','Audio Player')+'</span>');
+                $this.AlbumContainer.append('<span class="no-songs-found-pl"><i class="ioc ioc-refresh" title="'+t('audioplayer','Scan for new audio files')+'" id="scanAudiosFirst"></i> '+t('audioplayer','Add new tracks to library')+'</span>');
+                $this.AlbumContainer.append('<a class="no-songs-found-pl" href="https://github.com/rello/audioplayer/wiki" target="_blank">'+t('audioplayer','Help')+'</a>');
 			}
 
 			if (category !== "Title") {
@@ -1092,7 +1103,7 @@ Audios.prototype.editSong = function(evt){
 													$this.PlaylistContainer.hide();
 													$('#individual-playlist').html('');
 													$('.albumwrapper').removeClass('isPlaylist');
-													$('#activePlaylist').html('');
+                                                	$this.ActivePlaylist.html('');
 													$('.sm2-playlist-target').html('');
 													$('.sm2-playlist-cover').css('background-color','#ffffff').html('');
 													 $this.loadAlbums();
@@ -1514,7 +1525,7 @@ Audios.prototype.savePhoto = function() {
 		form.submit();
 
 		target.load(function() {
-            $('#noimage').text(t('audioplayer', 'Picture generating, please wait ...')).addClass('icon-loading');
+            $('#noimage').text(t('audioplayer', 'Picture generating, please wait…')).addClass('icon-loading');
 			var response = jQuery.parseJSON(target.contents().text());
 			if (response !== undefined) {
 				$('#isphoto').val('1');
@@ -1747,7 +1758,7 @@ Audios.prototype.sort_playlist = function(evt) {
 	$('#individual-playlist').append(elems);
 
 	if ($this.PlaylistContainer.data('playlist') === $this.ActivePlaylist.data('playlist')) {
-		elems = $('#activePlaylist').children('li').get();
+		elems = $this.ActivePlaylist.children('li').get();
 		elems.sort(function(a,b){
 			a = $(a).data(column).toString();
 			b = $(b).data(column).toString();
@@ -1760,7 +1771,7 @@ Audios.prototype.sort_playlist = function(evt) {
 			}
 			return ((a < b) ? -1*factor : ((a > b) ? 1*factor : 0));
 		});
-		$('#activePlaylist').append(elems);
+        $this.ActivePlaylist.append(elems);
 	}
 
 	if($this.AudioPlayer){
@@ -1822,10 +1833,8 @@ Audios.prototype.checkNewTracks = function() {
 			type : 'POST',
 			url : OC.generateUrl('apps/audioplayer/checknewtracks'),
 			success : function(data) {
-					if(data === 'true'){
-						$('#notification').text(t('audioplayer','New audio files available'));
-						$('#notification').slideDown();
-						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
+					if (data === 'true'){
+                        OC.Notification.showTemporary(t('audioplayer','New audio files available'));
 					}
 			}
 		});
@@ -1917,15 +1926,24 @@ $(document).ready(function() {
 		myAudios = new Audios();
 		myAudios.init();
 		myAudios.checkNewTracks();
-
-		//if($(window).width()>768){
+
+    	var notify = $('#audioplayer_notification').val();
+		if( notify !== ''){
+			OC.Notification.showHtml(
+                notify,
+				{
+					type: 'error',
+					isHTML: true
+				}
+			);
+		}
+
+    //if($(window).width()>768){
 			$('.sm2-bar-ui').width(myAudios.AlbumContainer.width());
 		//}else{
 		//	$('.sm2-bar-ui.fixed').width(myAudios.AlbumContainer.width()-45);
 		//}
-
-
-
+
 	$('#edit_photo_dialog').dialog({
 		autoOpen : false,
 		modal : true,

js/settings.js

@@ -116,7 +116,7 @@ $(document).ready(function() {
 					$('#activePlaylist').html('');
 					$('.sm2-playlist-target').html('');
 					$('.sm2-playlist-cover').css('background-color','#ffffff').html('');
-					$('#notification').text(t('audioplayer','Start resetting library ...'));
+					$('#notification').text(t('audioplayer','Start resetting library…'));
 					$('#notification').slideDown();
 
 					$.ajax({

l10n/de.js

@@ -14,7 +14,7 @@ OC.L10N.register(
 	"No playlist selected!" : "Keine Wiedergabeliste ausgewählt!",
 	"Sort modus active" : "Sortiermodus aktiv",
 	"Playlist successfully deleted!" : "Wiedergabeliste erfolgreich gelöscht!",
-	"Start scanning ..." : "Scannen starten ...",
+	"Start scanning…" : "Scannen starten…",
 	"Scanning finished! New Audios found!" : "Scannen beendet! Neue Audiodateien gefunden!",
 	"Yes" : "Ja",
 	"No" : "Nein",
@@ -52,14 +52,14 @@ OC.L10N.register(
 	"Upload" : "Hochladen",
 	"Drop picture" : "Bild fallen lassen",
 	"Select picture" : "Bild auswählen",
-	"Picture generating, please wait ..." : "Bilderzeugung, bitte warten ...",
+	"Picture generating, please wait…" : "Bilderzeugung, bitte warten…",
 	"Drag picture here!" : "Bild hierher ziehen",
 	"Settings" : "Einstellungen",
 	"Select a single folder with audio files" : "Einzelnen Ordner mit Audiodateien auswählen",
 	"Invalid path!" : "Ungültiger Pfad!",
 	"saved" : "gespeichert",
 	"Reset library" : "Bibliothek zurücksetzen",
-	"Start resetting library ..." : "Bibliothek wird zurückgesetzt ...",
+	"Start resetting library…" : "Bibliothek wird zurückgesetzt…",
 	"Resetting finished!" : "Zurücksetzen beendet!",
 	"All library entries will be deleted!" : "Alle Bibliothekseinträge werden gelöscht!",
 	"Close" : "Schließen",

l10n/de.json

@@ -9,7 +9,7 @@
 "Titles" : "Titel",
 "Album" : "Album",
 "Scan for audio files" : "Nach Audiodateien scannen",
-"Start scanning ..." : "Scannen starten ...",
+"Start scanning…" : "Scannen starten…",
 "Scanning finished!" : "Scannen beendet!",
 "Audios found: " : " Audiodateien gefunden: ",
 "Albums found: " : " Alben gefunden: ",
@@ -40,7 +40,7 @@
 "- choose -" : "- auswählen -",
 "Errors: " : "Fehler: ",
 "Edit picture" : "Bild bearbeiten",
-"If rescan does not solve this problem the files are broken" : "Wenn erneutes Scannen das Problem nicht behebt,<br>sind die Dateien defekt",
+"If rescan does not solve this problem the files are broken" : "Wenn erneutes scannen das Problem nicht behebt,<br>sind die Dateien defekt",
 "Disc" : "Disc",
 "Discs" : "Discs",
 "Track" : "Stück",
@@ -58,8 +58,9 @@
 "Genres" : "Genres",
 "Settings" : "Einstellungen",
 "Cyrillic support" : " Kyrillisch-Unterstützung",
-"Read more" : "Weitere Informationen",
+"More information…" : "Mehr Informationen…",
 "Search for audio files in" : "Suche nach Audiodateien in",
 "Formats supported by the browser" : "Vom Browser unterstützte Formate",
-"Formats not supported by the browser" : "Vom Browser nicht unterstützte Formate"
+"Formats not supported by the browser" : "Vom Browser nicht unterstützte Formate",
+"Please reset and rescan library to make use of new features." : "Bitte Bibliothek zurücksetzen und erneut scannen, um neue Funktionen nutzen zu können."
 },"pluralForm":""}

l10n/de_DE.js

@@ -14,7 +14,7 @@ OC.L10N.register(
 	"No playlist selected!" : "Keine Wiedergabeliste ausgewählt!",
 	"Sort modus active" : "Sortiermodus aktiv",
 	"Playlist successfully deleted!" : "Wiedergabeliste erfolgreich gelöscht!",
-	"Start scanning ..." : "Scannen starten ...",
+	"Start scanning…" : "Scannen starten…",
 	"Scanning finished! New Audios found!" : "Scannen beendet! Neue Audiodateien gefunden!",
 	"Yes" : "Ja",
 	"No" : "Nein",
@@ -52,14 +52,14 @@ OC.L10N.register(
 	"Upload" : "Hochladen",
 	"Drop picture" : "Bild fallen lassen",
 	"Select picture" : "Bild auswählen",
-	"Picture generating, please wait ..." : "Bilderzeugung, bitte warten ...",
+	"Picture generating, please wait…" : "Bilderzeugung, bitte warten…",
 	"Drag picture here!" : "Bild hierher ziehen",
 	"Settings" : "Einstellungen",
 	"Select a single folder with audio files" : "Einzelnen Ordner mit Audiodateien auswählen",
 	"Invalid path!" : "Ungültiger Pfad!",
 	"saved" : "gespeichert",
 	"Reset library" : "Bibliothek zurücksetzen",
-	"Start resetting library ..." : "Bibliothek wird zurückgesetzt ...",
+	"Start resetting library…" : "Bibliothek wird zurückgesetzt…",
 	"Resetting finished!" : "Zurücksetzen beendet!",
 	"All library entries will be deleted!" : "Alle Bibliothekseinträge werden gelöscht!",
 	"Close" : "Schließen",

l10n/de_DE.json

@@ -9,7 +9,7 @@
 "Titles" : "Titel",
 "Album" : "Album",
 "Scan for audio files" : "Nach Audiodateien scannen",
-"Start scanning ..." : "Scannen starten ...",
+"Start scanning…" : "Scannen starten…",
 "Scanning finished!" : "Scannen beendet!",
 "Audios found: " : " Audiodateien gefunden: ",
 "Albums found: " : " Alben gefunden: ",
@@ -40,7 +40,7 @@
 "- choose -" : "- auswählen -",
 "Errors: " : "Fehler: ",
 "Edit picture" : "Bild bearbeiten",
-"If rescan does not solve this problem the files are broken" : "Wenn erneutes Scannen das Problem nicht behebt,<br>sind die Dateien defekt",
+"If rescan does not solve this problem the files are broken" : "Wenn erneutes scannen das Problem nicht behebt,<br>sind die Dateien defekt",
 "Disc" : "Disc",
 "Discs" : "Discs",
 "Track" : "Stück",
@@ -58,8 +58,9 @@
 "Genres" : "Genres",
 "Settings" : "Einstellungen",
 "Cyrillic support" : " Kyrillisch-Unterstützung",
-"Read more" : "Weitere Informationen",
+"More information…" : "Mehr Informationen…",
 "Search for audio files in" : "Suche nach Audiodateien in",
 "Formats supported by the browser" : "Vom Browser unterstützte Formate",
-"Formats not supported by the browser" : "Vom Browser nicht unterstützte Formate"
+"Formats not supported by the browser" : "Vom Browser nicht unterstützte Formate",
+"Please reset and rescan library to make use of new features." : "Bitte Bibliothek zurücksetzen und erneut scannen, um neue Funktionen nutzen zu können."
 },"pluralForm":""}

l10n/pl.js

@@ -14,7 +14,7 @@ OC.L10N.register(
 	"No playlist selected!" : "Nie wybrano Playlisty!",
 	"Sort modus active" : "Przetwarzanie włączone",
 	"Playlist successfully deleted!" : "Playlista została usunięta!",
-	"Start scanning ..." : "Rozpocznij skanowanie ...",
+	"Start scanning…" : "Rozpocznij skanowanie…",
 	"Scanning finished! New Audios found!" : "Skanowanie zakończone! Znalezione nowe pliki audio!",
 	"Yes" : "Tak",
 	"No" : "Nie",
@@ -48,14 +48,14 @@ OC.L10N.register(
 	"Upload" : "Wgraj",
 	"Drop picture" : "Upuść zdjęcie",
 	"Select picture" : "Wybierz zdjęcie",
-	"Picture generating, please wait ..." : "Generowanie zdjęcia, proszę czekać ...",
+	"Picture generating, please wait…" : "Generowanie zdjęcia, proszę czekać…",
 	"Drag picture here!" : "Przeciągnij tutaj zdjęcie!",
 	"Settings" : "Settings",
 	"Select a single folder with audio files" : "Select a single folder with audio files",
 	"Invalid path!" : "Invalid path!",
 	"saved" : "saved",
 	"Reset library" : "Reset library",
-	"Start resetting library ..." : "Start resetting library ...",
+	"Start resetting library…" : "Start resetting library…",
 	"Resetting finished!" : "Resetowanie zakończone!",
 	"All library entries will be deleted!" : "All library entries will be deleted!",
 	"Close" : "Zamknij",

l10n/pl.json

@@ -9,7 +9,7 @@
 "Titles" : "Tytuły",
 "Album" : "Album",
 "Scan for audio files" : "Skanowanie plików audio",
-"Start scanning ..." : "Rozpocznij skanowanie ...",
+"Start scanning…" : "Rozpocznij skanowanie…",
 "Scanning finished!" : "Skanowanie zakończone!",
 "Audios found: " : " Znaleziono nowe tytuły: ",
 "Albums found: " : " Znaleziono nowe albumy: ",
@@ -19,7 +19,7 @@
 "Volume" : "Głośność",
 "previous song" : "poprzedni utwór",
 "next song" : "następny utwór",
-"play/ pause" : "graj/pauza",
+"play/ pause" : "graj/ pauza",
 "Cancel" : "Anuluj",
 "Close" : "Zamknij",
 "Length" : "Długość",
@@ -58,8 +58,9 @@
 "Genres" : "Gatunki",
 "Settings" : "Settings",
 "Cyrillic support" : "Obsługa cyrylicy",
-"Read more" : "Czytaj więcej",
+"More information…" : "More information…",
 "Search for audio files in" : "Wyszukiwanie plików audio w",
 "Formats supported by the browser" : "Formats supported by the browser",
-"Formats not supported by the browser" : "Formats not supported by the browser"
+"Formats not supported by the browser" : "Formats not supported by the browser",
+"Please reset and rescan library to make use of new features." : "Please reset and rescan library to make use of new features."
 },"pluralForm":""}

l10n/ru.js

@@ -14,7 +14,7 @@ OC.L10N.register(
 	"No playlist selected!" : "Не выбран список воспроизведения!",
 	"Sort modus active" : "Включено упорядочивание",
 	"Playlist successfully deleted!" : "Список воспроизведения удалён!",
-	"Start scanning ..." : "Начать поиск ...",
+	"Start scanning…" : "Начать поиск…",
 	"Scanning finished! New Audios found!" : "Поиск окончен! Новые аудиофайлы обнаружены!",
 	"Yes" : "Да",
 	"No" : "Нет",
@@ -48,14 +48,14 @@ OC.L10N.register(
 	"Upload" : "Загрузить",
 	"Drop picture" : "Drop picture",
 	"Select picture" : "Select picture",
-	"Picture generating, please wait ..." : "Picture generating, please wait ...",
+	"Picture generating, please wait…" : "Picture generating, please wait…",
 	"Drag picture here!" : "Drag picture here!",
 	"Settings" : "Settings",
 	"Select a single folder with audio files" : "Select a single folder with audio files",
 	"Invalid path!" : "Invalid path!",
 	"saved" : "saved",
 	"Reset library" : "Reset library",
-	"Start resetting library ..." : "Start resetting library ...",
+	"Start resetting library…" : "Start resetting library…",
 	"Resetting finished!" : "Сброс выполнен!",
 	"All library entries will be deleted!" : "All library entries will be deleted!",
 	"Close" : "Закрыть",