Update the empty page to reflect the fact that the user can now uploa…

…d directly
owncloud · Feb 13, 2016 · 28c5fab · 28c5fab
1 parent 1f84050
commit 28c5fab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 27 deletions.
diff --git a/js/gallery.js b/js/gallery.js
@@ -260,31 +260,16 @@
 			$('form.searchbox').hide();
 		},
 
-		/**
-		 * Shows an empty gallery message
-		 */
-		showEmpty: function () {
-			var emptyContentElement = $('#emptycontent');
-			var message = '<div class="icon-gallery"></div>';
-			message += '<h2>' + t('gallery',
-				'No pictures found') + '</h2>';
-			message += '<p>' + t('gallery',
-				'Upload pictures in the files app to display them here') + '</p>';
-			emptyContentElement.html(message);
-			emptyContentElement.removeClass('hidden');
-			$('#controls').addClass('hidden');
-		},
-
 		/**
 		 * Shows an empty gallery message
 		 */
 		showEmptyFolder: function () {
 			var emptyContentElement = $('#emptycontent');
 			var message = '<div class="icon-gallery"></div>';
 			message += '<h2>' + t('gallery',
-				'Nothing in here') + '</h2>';
+				'No media files found') + '</h2>';
 			message += '<p>' + t('gallery',
-				'No media files found in this folder') + '</p>';
+				'Upload new files via drag and drop or by using the [+] button above') + '</p>';
 			emptyContentElement.html(message);
 			emptyContentElement.removeClass('hidden');
 		},

diff --git a/js/galleryview.js b/js/galleryview.js
@@ -42,16 +42,12 @@
 			}
 			if ($.isEmptyObject(Gallery.imageMap)) {
 				this.clear();
-				if (albumPath === '') {
-					Gallery.showEmpty();
-				} else {
-					Gallery.showEmptyFolder();
-					this.hideButtons();
-					Gallery.currentAlbum = albumPath;
-					var availableWidth = $(window).width() - Gallery.buttonsWidth;
-					this.breadcrumb.init(albumPath, availableWidth);
-					Gallery.config.albumDesign = null;
-				}
+				Gallery.showEmptyFolder();
+				this.hideButtons();
+				Gallery.currentAlbum = albumPath;
+				var availableWidth = $(window).width() - Gallery.buttonsWidth;
+				this.breadcrumb.init(albumPath, availableWidth);
+				Gallery.config.albumDesign = null;
 			} else {
 				this.viewAlbum(albumPath);
 			}