diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-05-12 10:22:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 10:22:20 -0500 |
| commit | 2289ccd0ec72c54772c77f143886e84363099885 (patch) | |
| tree | 1868fd16219a29b0cb371cf30aac76da0b794504 | |
| parent | 4f752ed1fcb338d1f56037426c8eb77c73599cb7 (diff) | |
| parent | 37d333c3b55c6e2ed7c3e399c0c9d24b06bb2684 (diff) | |
| download | nextcloud-server-2289ccd0ec72c54772c77f143886e84363099885.tar.gz nextcloud-server-2289ccd0ec72c54772c77f143886e84363099885.zip | |
Merge pull request #4829 from nextcloud/theming-preview-click
Clicking on theming preview triggers fileupload dialog
| -rw-r--r-- | apps/theming/css/settings-admin.css | 5 | ||||
| -rw-r--r-- | apps/theming/js/settings-admin.js | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css index e401d77e4b6..ef3c9f68b27 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 5d91892c007..48c479cc9c3 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -160,6 +160,14 @@ $(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(e) { + e.stopPropagation(); + $('#uploadlogo').click(); + }); + $('#theming-preview').on('click', function() { + $('#upload-login-background').click(); + }); $('#theming-name').change(function(e) { var el = $(this); |