From a8f904dc42f7d46e76557a533f9566e5fd6fc93f Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sat, 31 Aug 2019 21:42:40 +0300 Subject: [PATCH 1/8] change primary action for delete confirmation dialog --- src/components/deletehelper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/deletehelper.js b/src/components/deletehelper.js index ae0fdbdf5..baea61804 100644 --- a/src/components/deletehelper.js +++ b/src/components/deletehelper.js @@ -27,7 +27,7 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con title: title, text: msg, confirmText: globalize.translate('Delete'), - primary: 'cancel' + primary: 'ok' }).then(function () { @@ -54,4 +54,4 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con return { deleteItem: deleteItem }; -}); \ No newline at end of file +}); From d53a0957289fa395503894fa3a15221c43c96915 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 1 Sep 2019 18:24:56 +0300 Subject: [PATCH 2/8] change class name --- src/components/confirm/confirm.js | 4 ++-- src/components/themes/appletv/theme.css | 5 +++++ src/components/themes/blueradiance/theme.css | 5 +++++ src/components/themes/dark/theme.css | 5 +++++ src/components/themes/emby/theme.css | 5 +++++ src/components/themes/light/theme.css | 5 +++++ src/components/themes/purple-haze/theme.css | 5 +++++ src/components/themes/wmc/theme.css | 5 +++++ 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js index 730ca3cd7..a09adcbcf 100644 --- a/src/components/confirm/confirm.js +++ b/src/components/confirm/confirm.js @@ -24,7 +24,7 @@ define(['dialog', 'globalize'], function (dialog, globalize) { items.push({ name: options.confirmText || globalize.translate('ButtonOk'), id: 'ok', - type: options.primary === 'cancel' ? 'cancel' : 'submit' + type: options.primary === 'cancel' ? 'cancel' : 'delete' }); options.buttons = items; @@ -37,4 +37,4 @@ define(['dialog', 'globalize'], function (dialog, globalize) { return Promise.reject(); }); }; -}); \ No newline at end of file +}); diff --git a/src/components/themes/appletv/theme.css b/src/components/themes/appletv/theme.css index 43f1034ad..bdb8229eb 100644 --- a/src/components/themes/appletv/theme.css +++ b/src/components/themes/appletv/theme.css @@ -102,6 +102,11 @@ html { background: #0cb0e8 } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + .checkboxLabel { color: inherit } diff --git a/src/components/themes/blueradiance/theme.css b/src/components/themes/blueradiance/theme.css index 840c0e23e..9299dcdf8 100644 --- a/src/components/themes/blueradiance/theme.css +++ b/src/components/themes/blueradiance/theme.css @@ -89,6 +89,11 @@ html { color: #fff } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + .checkboxLabel { color: inherit } diff --git a/src/components/themes/dark/theme.css b/src/components/themes/dark/theme.css index da4c05602..1b9370be5 100644 --- a/src/components/themes/dark/theme.css +++ b/src/components/themes/dark/theme.css @@ -70,6 +70,11 @@ html { color: #fff } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + .checkboxLabel { color: inherit } diff --git a/src/components/themes/emby/theme.css b/src/components/themes/emby/theme.css index d948c3ae6..88c098acf 100644 --- a/src/components/themes/emby/theme.css +++ b/src/components/themes/emby/theme.css @@ -70,6 +70,11 @@ html { color: #fff } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + .checkboxLabel { color: inherit } diff --git a/src/components/themes/light/theme.css b/src/components/themes/light/theme.css index 65ceefb52..7dac5dbc0 100644 --- a/src/components/themes/light/theme.css +++ b/src/components/themes/light/theme.css @@ -85,6 +85,11 @@ html { background: #0cb0e8 } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + .checkboxLabel { color: inherit } diff --git a/src/components/themes/purple-haze/theme.css b/src/components/themes/purple-haze/theme.css index 843b57305..2754e8db2 100644 --- a/src/components/themes/purple-haze/theme.css +++ b/src/components/themes/purple-haze/theme.css @@ -144,6 +144,11 @@ a[data-role=button] { background: #ff77f1 } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + #btnResetPassword, .btnForgotPassword, .btnCancel, diff --git a/src/components/themes/wmc/theme.css b/src/components/themes/wmc/theme.css index 081345c77..9c4845079 100644 --- a/src/components/themes/wmc/theme.css +++ b/src/components/themes/wmc/theme.css @@ -95,6 +95,11 @@ html { color: #fff } +.button-delete { + background: rgb(247, 0, 0); + color: rgba(255, 255, 255, .87) +} + .checkboxLabel { color: inherit } From babb4f1028966d8899d46ab0f8a4dc6b22fca5f4 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 1 Sep 2019 18:38:23 +0300 Subject: [PATCH 3/8] some for devices --- src/controllers/devices.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/devices.js b/src/controllers/devices.js index ef24f1917..7b0896d57 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -12,7 +12,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu text: msg, title: globalize.translate("HeaderDeleteDevice"), confirmText: globalize.translate("ButtonDelete"), - primary: "cancel" + primary: "ok" }).then(function() { loading.show(), ApiClient.ajax({ type: "DELETE", @@ -112,4 +112,4 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu loadData(this) }) } -}); \ No newline at end of file +}); From 6d3c617c28f8754180d882762bb36304b17543cb Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 1 Sep 2019 18:52:36 +0300 Subject: [PATCH 4/8] change primary id that have delete, uninstall --- src/components/imageeditor/imageeditor.js | 6 +++--- src/components/medialibraryeditor/medialibraryeditor.js | 4 ++-- src/components/subtitleeditor/subtitleeditor.js | 4 ++-- src/controllers/installedplugins.js | 2 +- src/controllers/userprofilespage.js | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index a0dfcd849..8cd01b8db 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -203,7 +203,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', text: globalize.translate('ConfirmDeleteImage'), confirmText: globalize.translate('Delete'), - primary: 'cancel' + primary: 'ok' }).then(afterConfirm); }); @@ -471,7 +471,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', initEditor(dlg, options); - // Has to be assigned a z-index after the call to .open() + // Has to be assigned a z-index after the call to .open() dlg.addEventListener('close', function () { if (layoutManager.tv) { @@ -510,4 +510,4 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', }); } }; -}); \ No newline at end of file +}); diff --git a/src/components/medialibraryeditor/medialibraryeditor.js b/src/components/medialibraryeditor/medialibraryeditor.js index ef3a3d5b1..be5c83f83 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.js +++ b/src/components/medialibraryeditor/medialibraryeditor.js @@ -59,7 +59,7 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra title: Globalize.translate("HeaderRemoveMediaLocation"), text: Globalize.translate("MessageConfirmRemoveMediaLocation"), confirmText: Globalize.translate("ButtonDelete"), - primary: "cancel" + primary: "ok" }).then(function() { var refreshAfterChange = currentOptions.refresh; ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function() { @@ -212,4 +212,4 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra var isCreating = false; return editor; -}); \ No newline at end of file +}); diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index e4742a894..3ff7ac14c 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -74,7 +74,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', title: globalize.translate('ConfirmDeletion'), text: msg, confirmText: globalize.translate('Delete'), - primary: 'cancel' + primary: 'ok' }).then(function () { @@ -523,4 +523,4 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', return { show: showEditor }; -}); \ No newline at end of file +}); diff --git a/src/controllers/installedplugins.js b/src/controllers/installedplugins.js index 40de0cc19..d02fdc0e5 100644 --- a/src/controllers/installedplugins.js +++ b/src/controllers/installedplugins.js @@ -7,7 +7,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button" confirm({ title: globalize.translate("UninstallPluginHeader"), text: msg, - primary: "cancel", + primary: "ok", confirmText: globalize.translate("UninstallPluginHeader") }).then(function() { loading.show(); diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index c0d1d0d87..850558090 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -9,7 +9,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light", title: globalize.translate("DeleteUser"), text: msg, confirmText: globalize.translate("ButtonDelete"), - primary: "cancel" + primary: "ok" }).then(function () { loading.show(); ApiClient.deleteUser(id).then(function () { @@ -207,7 +207,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light", page.querySelector(".pending").innerHTML = users.map(getPendingUserHtml).join(""); } - + // TODO cvium: maybe reuse for invitation system function cancelAuthorization(page, id) { loading.show(); @@ -230,7 +230,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light", // TODO cvium renderPendingGuests(page, []); // ApiClient.getJSON(ApiClient.getUrl("Connect/Pending")).then(function (pending) { - // + // // }); } From f8628384582028c2ca1408944b2c12d8147fa519 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 5 Sep 2019 12:41:39 -0700 Subject: [PATCH 5/8] always keep confirm in the same location --- src/components/confirm/confirm.js | 4 ++-- src/components/deletehelper.js | 2 +- src/components/imageeditor/imageeditor.js | 2 +- src/components/medialibraryeditor/medialibraryeditor.js | 2 +- src/components/subtitleeditor/subtitleeditor.js | 2 +- src/controllers/devices.js | 2 +- src/controllers/installedplugins.js | 2 +- src/controllers/userprofilespage.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js index a09adcbcf..f104350c8 100644 --- a/src/components/confirm/confirm.js +++ b/src/components/confirm/confirm.js @@ -18,13 +18,13 @@ define(['dialog', 'globalize'], function (dialog, globalize) { items.push({ name: options.cancelText || globalize.translate('ButtonCancel'), id: 'cancel', - type: options.primary === 'cancel' ? 'submit' : 'cancel' + type: 'cancel' }); items.push({ name: options.confirmText || globalize.translate('ButtonOk'), id: 'ok', - type: options.primary === 'cancel' ? 'cancel' : 'delete' + type: options.primary === 'delete' ? 'delete' : 'submit' }); options.buttons = items; diff --git a/src/components/deletehelper.js b/src/components/deletehelper.js index baea61804..2212fd443 100644 --- a/src/components/deletehelper.js +++ b/src/components/deletehelper.js @@ -27,7 +27,7 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con title: title, text: msg, confirmText: globalize.translate('Delete'), - primary: 'ok' + primary: 'delete' }).then(function () { diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index 8cd01b8db..15c58ad8d 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -203,7 +203,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', text: globalize.translate('ConfirmDeleteImage'), confirmText: globalize.translate('Delete'), - primary: 'ok' + primary: 'delete' }).then(afterConfirm); }); diff --git a/src/components/medialibraryeditor/medialibraryeditor.js b/src/components/medialibraryeditor/medialibraryeditor.js index be5c83f83..77a5f8f45 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.js +++ b/src/components/medialibraryeditor/medialibraryeditor.js @@ -59,7 +59,7 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra title: Globalize.translate("HeaderRemoveMediaLocation"), text: Globalize.translate("MessageConfirmRemoveMediaLocation"), confirmText: Globalize.translate("ButtonDelete"), - primary: "ok" + primary: "delete" }).then(function() { var refreshAfterChange = currentOptions.refresh; ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function() { diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index 3ff7ac14c..27055f597 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -74,7 +74,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', title: globalize.translate('ConfirmDeletion'), text: msg, confirmText: globalize.translate('Delete'), - primary: 'ok' + primary: 'delete' }).then(function () { diff --git a/src/controllers/devices.js b/src/controllers/devices.js index 7b0896d57..d50f9ce7e 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -12,7 +12,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu text: msg, title: globalize.translate("HeaderDeleteDevice"), confirmText: globalize.translate("ButtonDelete"), - primary: "ok" + primary: "delete" }).then(function() { loading.show(), ApiClient.ajax({ type: "DELETE", diff --git a/src/controllers/installedplugins.js b/src/controllers/installedplugins.js index d02fdc0e5..f9653fe26 100644 --- a/src/controllers/installedplugins.js +++ b/src/controllers/installedplugins.js @@ -7,7 +7,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button" confirm({ title: globalize.translate("UninstallPluginHeader"), text: msg, - primary: "ok", + primary: "delete", confirmText: globalize.translate("UninstallPluginHeader") }).then(function() { loading.show(); diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index 850558090..f76bb35e6 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -9,7 +9,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light", title: globalize.translate("DeleteUser"), text: msg, confirmText: globalize.translate("ButtonDelete"), - primary: "ok" + primary: "delete" }).then(function () { loading.show(); ApiClient.deleteUser(id).then(function () { From e8ae9b3605af515145369c7adb454145f2843b15 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 6 Sep 2019 02:02:58 -0700 Subject: [PATCH 6/8] use new style for all warning dialogs --- src/components/recordingcreator/recordinghelper.js | 4 ++-- src/controllers/dashboardpage.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js index a8359b4d4..8c56b578c 100644 --- a/src/components/recordingcreator/recordinghelper.js +++ b/src/components/recordingcreator/recordinghelper.js @@ -37,7 +37,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi confirm({ text: globalize.translate('MessageConfirmRecordingCancellation'), - primary: 'cancel', + primary: 'delete', confirmText: globalize.translate('HeaderCancelRecording'), cancelText: globalize.translate('HeaderKeepRecording') @@ -62,7 +62,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi confirm({ text: globalize.translate('MessageConfirmRecordingCancellation'), - primary: 'cancel', + primary: 'delete', confirmText: globalize.translate('HeaderCancelSeries'), cancelText: globalize.translate('HeaderKeepSeries') diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js index 7c443e308..28d384f13 100644 --- a/src/controllers/dashboardpage.js +++ b/src/controllers/dashboardpage.js @@ -707,7 +707,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa title: globalize.translate("HeaderRestart"), text: globalize.translate("MessageConfirmRestart"), confirmText: globalize.translate("ButtonRestart"), - primary: "cancel" + primary: "delete" }).then(function () { var page = dom.parentWithClass(btn, "page"); buttonEnabled(page.querySelector("#btnRestartServer"), false); @@ -722,7 +722,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa title: globalize.translate("HeaderShutdown"), text: globalize.translate("MessageConfirmShutdown"), confirmText: globalize.translate("ButtonShutdown"), - primary: "cancel" + primary: "delete" }).then(function () { var page = dom.parentWithClass(btn, "page"); buttonEnabled(page.querySelector("#btnRestartServer"), false); From e9d2c73c5e1350cce3c5590b9d10fe0f1f65b0ca Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 8 Sep 2019 01:11:27 +0300 Subject: [PATCH 7/8] degligy medialibrarypage --- src/controllers/medialibrarypage.js | 149 ++++++++++++++++++---------- 1 file changed, 97 insertions(+), 52 deletions(-) diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index 405d38bfa..d8be30972 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -1,48 +1,54 @@ -define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "globalize", "dom", "indicators", "scripts/imagehelper", "cardStyle", "emby-itemrefreshindicator"], function($, appHost, taskButton, loading, libraryMenu, globalize, dom, indicators, imageHelper) { +define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "globalize", "dom", "indicators", "scripts/imagehelper", "cardStyle", "emby-itemrefreshindicator"], function ($, appHost, taskButton, loading, libraryMenu, globalize, dom, indicators, imageHelper) { "use strict"; function addVirtualFolder(page) { - require(["medialibrarycreator"], function(medialibrarycreator) { - (new medialibrarycreator).show({ - collectionTypeOptions: getCollectionTypeOptions().filter(function(f) { + require(["medialibrarycreator"], function (medialibrarycreator) { + new medialibrarycreator().show({ + collectionTypeOptions: getCollectionTypeOptions().filter(function (f) { return !f.hidden; }), refresh: shouldRefreshLibraryAfterChanges(page) - }).then(function(hasChanges) { - hasChanges && reloadLibrary(page); - }) - }) + }).then(function (hasChanges) { + if (hasChanges) { + reloadLibrary(page); + } + }); + }); } function editVirtualFolder(page, virtualFolder) { - require(["medialibraryeditor"], function(medialibraryeditor) { - (new medialibraryeditor).show({ + require(["medialibraryeditor"], function (medialibraryeditor) { + new medialibraryeditor().show({ refresh: shouldRefreshLibraryAfterChanges(page), library: virtualFolder - }).then(function(hasChanges) { - hasChanges && reloadLibrary(page); - }) - }) + }).then(function (hasChanges) { + if (hasChanges) { + reloadLibrary(page); + } + }); + }); } function deleteVirtualFolder(page, virtualFolder) { var msg = globalize.translate("MessageAreYouSureYouWishToRemoveMediaFolder"); + if (virtualFolder.Locations.length) { msg += "

" + globalize.translate("MessageTheFollowingLocationWillBeRemovedFromLibrary") + "

"; msg += virtualFolder.Locations.join("
"); } - require(["confirm"], function(confirm) { - confirm(msg, globalize.translate("HeaderRemoveMediaFolder")).then(function() { + + require(["confirm"], function (confirm) { + confirm(msg, globalize.translate("HeaderRemoveMediaFolder")).then(function () { var refreshAfterChange = shouldRefreshLibraryAfterChanges(page); - ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).then(function() { + ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).then(function () { reloadLibrary(page); - }) - }) - }) + }); + }); + }); } function refreshVirtualFolder(page, virtualFolder) { - require(["refreshDialog"], function(refreshDialog) { + require(["refreshDialog"], function (refreshDialog) { new refreshDialog({ itemIds: [virtualFolder.ItemId], serverId: ApiClient.serverId(), @@ -52,14 +58,14 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl } function renameVirtualFolder(page, virtualFolder) { - require(["prompt"], function(prompt) { + require(["prompt"], function (prompt) { prompt({ label: globalize.translate("LabelNewName"), confirmText: globalize.translate("ButtonRename") - }).then(function(newName) { + }).then(function (newName) { if (newName && newName != virtualFolder.Name) { var refreshAfterChange = shouldRefreshLibraryAfterChanges(page); - ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function() { + ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () { reloadLibrary(page); }); } @@ -97,24 +103,29 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl id: "refresh", ironIcon: "refresh" }); - require(["actionsheet"], function(actionsheet) { + + require(["actionsheet"], function (actionsheet) { actionsheet.show({ items: menuItems, positionTo: elem, - callback: function(resultId) { + callback: function (resultId) { switch (resultId) { case "edit": editVirtualFolder(page, virtualFolder); break; + case "editimages": editImages(page, virtualFolder); break; + case "rename": renameVirtualFolder(page, virtualFolder); break; + case "delete": deleteVirtualFolder(page, virtualFolder); break; + case "refresh": refreshVirtualFolder(page, virtualFolder); } @@ -125,7 +136,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl function reloadLibrary(page) { loading.show(); - ApiClient.getVirtualFolders().then(function(result) { + ApiClient.getVirtualFolders().then(function (result) { reloadVirtualFolders(page, result); }); } @@ -148,36 +159,40 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl for (var i = 0; i < virtualFolders.length; i++) { var virtualFolder = virtualFolders[i]; - html += getVirtualFolderHtml(page, virtualFolder, i) + html += getVirtualFolderHtml(page, virtualFolder, i); } + var divVirtualFolders = page.querySelector("#divVirtualFolders"); divVirtualFolders.innerHTML = html; divVirtualFolders.classList.add("itemsContainer"); divVirtualFolders.classList.add("vertical-wrap"); - $(".btnCardMenu", divVirtualFolders).on("click", function() { + $(".btnCardMenu", divVirtualFolders).on("click", function () { showCardMenu(page, this, virtualFolders); }); - divVirtualFolders.querySelector(".addLibrary").addEventListener("click", function() { + divVirtualFolders.querySelector(".addLibrary").addEventListener("click", function () { addVirtualFolder(page); }); - $(".editLibrary", divVirtualFolders).on("click", function() { + $(".editLibrary", divVirtualFolders).on("click", function () { var card = $(this).parents(".card")[0]; var index = parseInt(card.getAttribute("data-index")); var virtualFolder = virtualFolders[index]; - virtualFolder.ItemId && editVirtualFolder(page, virtualFolder); + + if (virtualFolder.ItemId) { + editVirtualFolder(page, virtualFolder); + } }); loading.hide(); } function editImages(page, virtualFolder) { - require(["imageEditor"], function(imageEditor) { + require(["imageEditor"], function (imageEditor) { imageEditor.show({ itemId: virtualFolder.ItemId, serverId: ApiClient.serverId() - }).then(function() { + }).then(function () { reloadLibrary(page); }); - }) + }); } function getLink(text, url) { @@ -214,25 +229,32 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl name: globalize.translate("FolderTypeUnset"), value: "mixed", message: globalize.translate("MessageUnsetContentHelp") - }] + }]; } function getVirtualFolderHtml(page, virtualFolder, index) { var html = ""; var style = ""; - page.classList.contains("wizardPage") && (style += "min-width:33.3%;"); + + if (page.classList.contains("wizardPage")) { + style += "min-width:33.3%;"; + } + html += '
'; html += '
'; html += '
'; html += '
'; html += '
'; var imgUrl = ""; + if (virtualFolder.PrimaryImageItemId) { imgUrl = ApiClient.getScaledImageUrl(virtualFolder.PrimaryImageItemId, { type: "Primary" }); } + var hasCardImageContainer; + if (imgUrl) { html += '
"; hasCardImageContainer = true; @@ -241,38 +263,60 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl html += '' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + ""; hasCardImageContainer = true; } + if (hasCardImageContainer) { html += '
'; html += '
'; html += "
"; html += "
"; } + if (!imgUrl && virtualFolder.showNameWithIcon) { html += '

'; html += '' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + ""; - virtualFolder.showNameWithIcon && (html += '
', html += virtualFolder.Name, html += "
"); + + if (virtualFolder.showNameWithIcon) { + html += '
'; + html += virtualFolder.Name; + html += "
"; + } + html += "

"; } - html += "
"; - html += "
"; - html += '
'; - // always show menu unless explicitly hidden + html += "
"; + html += "
"; + html += '
'; // always show menu unless explicitly hidden + if (virtualFolder.showMenu !== false) { html += '
'; html += ''; html += "
"; } + html += "
"; - virtualFolder.showNameWithIcon ? html += " " : html += virtualFolder.Name; + + if (virtualFolder.showNameWithIcon) { + html += " "; + } else { + html += virtualFolder.Name; + } + html += "
"; - var typeName = getCollectionTypeOptions().filter(function(t) { - return t.value == virtualFolder.CollectionType + var typeName = getCollectionTypeOptions().filter(function (t) { + return t.value == virtualFolder.CollectionType; })[0]; typeName = typeName ? typeName.name : globalize.translate("FolderTypeUnset"); html += "
"; - virtualFolder.showType === false ? html += " " : html += typeName; + + if (virtualFolder.showType === false) { + html += " "; + } else { + html += typeName; + } + html += "
"; + if (virtualFolder.showLocations === false) { html += "
"; html += " "; @@ -286,6 +330,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl html += globalize.translate("NumLocationsValue", virtualFolder.Locations.length); html += "
"; } + html += "
"; html += "
"; html += ""; @@ -305,18 +350,18 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl }, { href: "metadatanfo.html", name: globalize.translate("TabNfoSettings") - }] + }]; } window.WizardLibraryPage = { - next: function() { - Dashboard.navigate("wizardsettings.html") + next: function () { + Dashboard.navigate("wizardsettings.html"); } }; - pageClassOn("pageshow", "mediaLibraryPage", function() { + pageClassOn("pageshow", "mediaLibraryPage", function () { reloadLibrary(this); }); - pageIdOn("pageshow", "mediaLibraryPage", function() { + pageIdOn("pageshow", "mediaLibraryPage", function () { libraryMenu.setTabs("librarysetup", 0, getTabs); var page = this; taskButton({ @@ -326,7 +371,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl button: page.querySelector(".btnRefresh") }); }); - pageIdOn("pagebeforehide", "mediaLibraryPage", function() { + pageIdOn("pagebeforehide", "mediaLibraryPage", function () { var page = this; taskButton({ mode: "off", From 5f9a499c980e72c4e70958c7a376e95ca13d80e0 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 8 Sep 2019 01:13:53 +0300 Subject: [PATCH 8/8] use the new style for medialibrarypage --- src/controllers/medialibrarypage.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index d8be30972..6ce5f7fac 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -38,7 +38,14 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl } require(["confirm"], function (confirm) { - confirm(msg, globalize.translate("HeaderRemoveMediaFolder")).then(function () { + confirm({ + + text: msg, + title: globalize.translate('HeaderRemoveMediaFolder'), + confirmText: globalize.translate('Delete'), + primary: 'delete' + + }).then(function () { var refreshAfterChange = shouldRefreshLibraryAfterChanges(page); ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).then(function () { reloadLibrary(page);