From 3040ab1d6243bcf57c875fbdb6e74de2a61210cd Mon Sep 17 00:00:00 2001
From: Nils Asmussen <nils@script-solution.de>
Date: Sat, 13 Aug 2016 16:50:05 +0200
Subject: [PATCH] Improved display of root album in move operation.

Root is now shown as the parent of all albums with parent=0.
---
 src/scripts/album.js       | 4 ++--
 src/scripts/contextMenu.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 31902c0..6fbe3d8 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -675,11 +675,11 @@ const getMessage = function(albumIDs, titles, operation) {
 		// Fallback for second album without a title
 		if (sTitle==='') sTitle = 'Untitled'
 
-		msg = lychee.html`<p>Are you sure you want to ${ operation } the album '$${ sTitle }' into the album '$${ title }'?</p>`
+		msg = lychee.html`<p>Are you sure you want to ${ operation } the album '$${ sTitle }' into '$${ title }'?</p>`
 
 	} else {
 
-		msg = lychee.html`<p>Are you sure you want to ${ operation } all selected albums into the album '$${ title }'?</p>`
+		msg = lychee.html`<p>Are you sure you want to ${ operation } all selected albums into '$${ title }'?</p>`
 
 	}
 
diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index 5f0ff92..ee8bd5b 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -242,7 +242,7 @@ contextMenu.moveAlbum = function(albumIDs, e) {
 					exclude.push(sub[s])
 			}
 
-			items = buildAlbumList(data.albums, exclude, (a) => album.move([ a.id ].concat(albumIDs), [ a.title, title ]))
+			items = buildAlbumList(data.albums, exclude, (a) => album.move([ a.id ].concat(albumIDs), [ a.title, title ]), 0, 1)
 
 			items.unshift({ title: 'Root', fn: () => album.move([ 0 ].concat(albumIDs), [ 'Root', title ]) })