From c2350f237ecf35e716c827ae92066059ecc43f2e Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 11 May 2017 19:49:32 -0500 Subject: [PATCH 1/2] Clicking on theming preview triggers fileupload dialog Signed-off-by: Morris Jobke --- apps/theming/css/settings-admin.css | 5 +++++ apps/theming/js/settings-admin.js | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css index e401d77e4b..ef3c9f68b2 100644 --- a/apps/theming/css/settings-admin.css +++ b/apps/theming/css/settings-admin.css @@ -89,6 +89,10 @@ div#theming_settings_msg { display: inline-block; } +#theming-preview-logo { + cursor: pointer; +} + #theming-preview { width: 230px; height: 140px; @@ -97,6 +101,7 @@ div#theming_settings_msg { text-align: center; margin-left: 123px; margin-top: 10px; + cursor: pointer; } #theming-preview img { diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 5d91892c00..d4ecba5a14 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -160,6 +160,13 @@ $(document).ready(function () { $('#uploadlogo').fileupload(uploadParamsLogo); $('#upload-login-background').fileupload(uploadParamsLogin); + // clicking preview should also trigger file upload dialog + $('#theming-preview-logo').on('click', function() { + $('#uploadlogo').click(); + }); + $('#theming-preview').on('click', function() { + $('#upload-login-background').click(); + }); $('#theming-name').change(function(e) { var el = $(this); From 37d333c3b55c6e2ed7c3e399c0c9d24b06bb2684 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 12 May 2017 09:48:51 +0200 Subject: [PATCH 2/2] Don't open the dialog for logo and background Signed-off-by: Joas Schilling --- apps/theming/js/settings-admin.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index d4ecba5a14..48c479cc9c 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -161,7 +161,8 @@ $(document).ready(function () { $('#uploadlogo').fileupload(uploadParamsLogo); $('#upload-login-background').fileupload(uploadParamsLogin); // clicking preview should also trigger file upload dialog - $('#theming-preview-logo').on('click', function() { + $('#theming-preview-logo').on('click', function(e) { + e.stopPropagation(); $('#uploadlogo').click(); }); $('#theming-preview').on('click', function() {