From 62f1156a56a671cb593c0531922976914b1d4fa9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Wed, 9 May 2018 15:52:41 +0200
Subject: allow to specify a link to a legal notice

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 apps/theming/js/settings-admin.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'apps/theming/js')

diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index 25ac092a964..028d08c151a 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -175,7 +175,7 @@ $(document).ready(function () {
 		var el = $(this);
 	});
 
-	$('#theming input[type=text]').change(function(e) {
+	function onChange(e) {
 		var el = $(this);
 		var setting = el.parent().find('div[data-setting]').data('setting');
 		var value = $(this).val();
@@ -186,14 +186,14 @@ $(document).ready(function () {
 			}
 		}
 		if(setting === 'name') {
-      if(checkName()){
-        $.when(el.focusout()).then(function() {
-          setThemingValue('name', value);
-        });
-        if (e.keyCode == 13) {
-          setThemingValue('name', value);
-        } 
-      }
+			if(checkName()){
+				$.when(el.focusout()).then(function() {
+					setThemingValue('name', value);
+				});
+				if (e.keyCode == 13) {
+					setThemingValue('name', value);
+				}
+			}
 		}
 
 		$.when(el.focusout()).then(function() {
@@ -202,7 +202,10 @@ $(document).ready(function () {
 		if (e.keyCode == 13) {
 			setThemingValue(setting, value);
 		}
-	});
+	};
+
+	$('#theming input[type="text"]').change(onChange);
+	$('#theming input[type="url"]').change(onChange);
 
 	$('.theme-undo').click(function (e) {
 		var setting = $(this).data('setting');
-- 
cgit v1.2.3


From 84ab102146f4a9443ef1b6382f049eac99b85c6b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 11 May 2018 15:57:32 +0200
Subject: fix undo for url-typed inputs

and minor adjustments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 apps/theming/css/settings-admin.scss      | 6 +++++-
 apps/theming/js/settings-admin.js         | 3 ++-
 apps/theming/templates/settings-admin.php | 4 ++--
 core/css/guest.css                        | 1 -
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'apps/theming/js')

diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss
index 00d1cb96fc6..7753540ccd2 100644
--- a/apps/theming/css/settings-admin.scss
+++ b/apps/theming/css/settings-admin.scss
@@ -46,7 +46,11 @@
     input[type='text']:hover + .theme-undo,
     input[type='text'] + .theme-undo:hover,
     input[type='text']:focus + .theme-undo,
-    input[type='text']:active + .theme-undo {
+    input[type='text']:active + .theme-undo,
+    input[type='url']:hover + .theme-undo,
+    input[type='url'] + .theme-undo:hover,
+    input[type='url']:focus + .theme-undo,
+    input[type='url']:active + .theme-undo{
         visibility: visible;
     }
 
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index 028d08c151a..76d9fb965ca 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -83,7 +83,8 @@ function hideUndoButton(setting, value) {
 		url: 'https://nextcloud.com',
 		color: '#0082c9',
 		logoMime: '',
-		backgroundMime: ''
+		backgroundMime: '',
+		imprintUrl: ''
 	};
 
 	if (value === themingDefaults[setting] || value === '') {
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index 9fccd2f1e0e..7df92c335c2 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -48,7 +48,7 @@ style('theming', 'settings-admin');
 	<div>
 		<label>
 			<span><?php p($l->t('Web address')) ?></span>
-			<input id="theming-url" type="url" placeholder="<?php p($l->t('Web address https://…')); ?>" value="<?php p($_['url']) ?>" maxlength="500" />
+			<input id="theming-url" type="url" placeholder="<?php p($l->t('https://…')); ?>" value="<?php p($_['url']) ?>" maxlength="500" />
 			<div data-setting="url" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div>
 		</label>
 	</div>
@@ -97,7 +97,7 @@ style('theming', 'settings-admin');
 		<div>
 			<label>
 				<span><?php p($l->t('Legal notice address')) ?></span>
-				<input id="theming-imprintUrl" type="url" placeholder="<?php p($l->t('Legal notice address https://…')); ?>" value="<?php p($_['imprintUrl']) ?>" maxlength="500" />
+				<input id="theming-imprintUrl" type="url" placeholder="<?php p($l->t('https://…')); ?>" value="<?php p($_['imprintUrl']) ?>" maxlength="500" />
 				<div data-setting="imprintUrl" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div>
 			</label>
 		</div>
diff --git a/core/css/guest.css b/core/css/guest.css
index 04d19bccf08..88341fb903a 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -746,7 +746,6 @@ footer .info a {
 
 a.legal {
 	font-size: smaller;
-	text-decoration: underline;
 }
 
 /* for low-res screens, use Regular font-weight instead of Light */
-- 
cgit v1.2.3