From 3d38cb95709e735483a644e26bd8c444b07c3317 Mon Sep 17 00:00:00 2001
From: Julius Haertl
Date: Wed, 24 Aug 2016 11:34:45 +0200
Subject: [PATCH] Theming: Hide undo button on default values
---
apps/theming/js/settings-admin.js | 30 ++++++++++++++++++++++-
apps/theming/templates/settings-admin.php | 4 ++-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index a18874941e..77777d2dde 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -109,6 +109,25 @@ function preview(setting, value) {
} else {
previewImage.style.backgroundImage = "url('" + OC.getRootPath() + '/core/img/background.jpg?v' + timestamp + "')";
}
+
+ }
+ hideUndoButton(setting, value);
+}
+
+function hideUndoButton(setting, value) {
+ var themingDefaults = {
+ name: 'Nextcloud',
+ slogan: t('lib', 'a safe home for all your data'),
+ url: 'https://nextcloud.com',
+ color: '#0082c9',
+ logoMime: '',
+ backgroundMime: ''
+ };
+
+ if (value === themingDefaults[setting] || value === '') {
+ $('.theme-undo[data-setting=' + setting + ']').hide();
+ } else {
+ $('.theme-undo[data-setting=' + setting + ']').show();
}
}
@@ -117,6 +136,14 @@ $(document).ready(function () {
$('html > head').append($(''));
+ $('#theming .theme-undo').each(function() {
+ var setting = $(this).data('setting');
+ var value = $('#theming-'+setting).val();
+ if(setting === 'logoMime' || setting === 'backgroundMime') {
+ var value = $('#current-'+setting).val();
+ }
+ hideUndoButton(setting, value);
+ });
var uploadParamsLogo = {
pasteZone: null,
dropZone: null,
@@ -192,11 +219,12 @@ $(document).ready(function () {
if (setting === 'color') {
var colorPicker = document.getElementById('theming-color');
colorPicker.style.backgroundColor = response.data.value;
- colorPicker.value = response.data.value.slice(1);
+ colorPicker.value = response.data.value.slice(1).toUpperCase();
} else if (setting !== 'logoMime' && setting !== 'backgroundMime') {
var input = document.getElementById('theming-'+setting);
input.value = response.data.value;
}
+
preview(setting, response.data.value);
OC.msg.finishedSaving('#theming_settings_msg', response);
});
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index 66288d3765..b6c9704023 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -60,14 +60,16 @@ style('theming', 'settings-admin');