From 0695c8c7a86ca176cd0ed01b379ab419e68bf5cb Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 Jul 2020 21:44:49 +0100 Subject: [PATCH 1/4] bug fixes --- src/assets/css/dashboard.css | 8 ++++++++ src/controllers/dashboard/mediaLibrary.js | 9 +++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index 894d7332f4..3798428be5 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -235,6 +235,14 @@ div[data-role=controlgroup] a.ui-btn-active { width: 50%; } +.localUsers .cardText-secondary { + white-space: pre-wrap +} + +.customCssContainer textarea{ + resize: none; +} + @media all and (min-width: 70em) { .dashboardSections { -webkit-flex-wrap: wrap; diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js index 06eba37cbd..22746798fe 100644 --- a/src/controllers/dashboard/mediaLibrary.js +++ b/src/controllers/dashboard/mediaLibrary.js @@ -161,7 +161,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl showType: false, showLocations: false, showMenu: false, - showNameWithIcon: true + showNameWithIcon: false }); for (var i = 0; i < virtualFolders.length; i++) { @@ -176,7 +176,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl $('.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 () { @@ -247,7 +247,12 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl style += 'min-width:33.3%;'; } + if (virtualFolder.Locations.length == 0) { + html += '
'; + } else { html += '
'; + } + html += '
'; html += '
'; html += '
'; From 6d6e002bd4d816e116b76d58260eb70f6d211a9a Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 Jul 2020 22:19:00 +0100 Subject: [PATCH 2/4] fix lint --- src/assets/css/dashboard.css | 2 +- src/controllers/dashboard/mediaLibrary.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index 3798428be5..1053c5a318 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -239,7 +239,7 @@ div[data-role=controlgroup] a.ui-btn-active { white-space: pre-wrap } -.customCssContainer textarea{ +.customCssContainer textarea { resize: none; } diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js index 22746798fe..da345859d9 100644 --- a/src/controllers/dashboard/mediaLibrary.js +++ b/src/controllers/dashboard/mediaLibrary.js @@ -250,7 +250,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl if (virtualFolder.Locations.length == 0) { html += '
'; } else { - html += '
'; + html += '
'; } html += '
'; From 107e4c273e20f62d091d97e1b1547edbf65604a5 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 Jul 2020 22:19:00 +0100 Subject: [PATCH 3/4] fix lint --- src/assets/css/dashboard.css | 4 ++-- src/controllers/dashboard/mediaLibrary.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index 3798428be5..2cb5d73587 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -236,10 +236,10 @@ div[data-role=controlgroup] a.ui-btn-active { } .localUsers .cardText-secondary { - white-space: pre-wrap + white-space: pre-wrap; } -.customCssContainer textarea{ +.customCssContainer textarea { resize: none; } diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js index 22746798fe..da345859d9 100644 --- a/src/controllers/dashboard/mediaLibrary.js +++ b/src/controllers/dashboard/mediaLibrary.js @@ -250,7 +250,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl if (virtualFolder.Locations.length == 0) { html += '
'; } else { - html += '
'; + html += '
'; } html += '
'; From cc1634e9f94f377a43674aa63044906ea7049d69 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 11 Jul 2020 14:10:12 +0100 Subject: [PATCH 4/4] update --- src/assets/css/dashboard.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index 2cb5d73587..48e6fe807e 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -237,6 +237,7 @@ div[data-role=controlgroup] a.ui-btn-active { .localUsers .cardText-secondary { white-space: pre-wrap; + height: 3em; } .customCssContainer textarea {