From 8032e6f0d53e53e964e0934c5fb5249a22b894db Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Tue, 1 Oct 2013 16:22:19 +0200 Subject: [PATCH 1/5] if/else bugfix --- .../Sparkle/customer/email/emails_add.tpl | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/templates/Sparkle/customer/email/emails_add.tpl b/templates/Sparkle/customer/email/emails_add.tpl index 730ac912..13bea014 100644 --- a/templates/Sparkle/customer/email/emails_add.tpl +++ b/templates/Sparkle/customer/email/emails_add.tpl @@ -1,14 +1,6 @@ $header
- -
-
-
{$lng['admin']['warning']}
-

{$lng['emails']['noemaildomainaddedyet']}
-
-
- - +

{$title}  @@ -16,24 +8,33 @@ $header

-
+ +
+
+
{$lng['admin']['warning']}
+

{$lng['emails']['noemaildomainaddedyet']}
+
+
+ +
-
-
- Froxlor - {$title} + +
+ Froxlor - {$title} + + + {$email_add_form} +
- - {$email_add_form} -
- -

- - - - -

-
- -
+

+ + + + +

+ + +
+
$footer From d17983103380d415c3543983e1813063c4caaee8 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Tue, 1 Oct 2013 17:28:21 +0200 Subject: [PATCH 2/5] better readability of green buttons --- templates/Sparkle/assets/css/main.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 5b0cb71e..da4d0fee 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -694,17 +694,17 @@ input[type="button"]:hover,input[type="submit"]:hover,input[type="reset"]:hover } input[type="submit"],input[class="yesbutton"] { - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #77d42a), color-stop(1, #5cb811) ); - background:-moz-linear-gradient( center top, #77d42a 5%, #5cb811 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#77d42a', endColorstr='#5cb811'); - background-color:#77d42a; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) ); + background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b'); + background-color:#9dce2c; text-shadow:1px 1px 0px #aade7c; } input[type="submit"]:hover,input[class="yesbutton"]:hover { - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #5cb811), color-stop(1, #77d42a) ); - background:-moz-linear-gradient( center top, #5cb811 5%, #77d42a 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5cb811', endColorstr='#77d42a'); - background-color:#5cb811; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) ); + background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c'); + background-color:#8cb82b; } input[class="nobutton"],input[type="reset"] { From 180d711d9c7591803d195add5f5d11c8e6280bd8 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Tue, 1 Oct 2013 18:02:45 +0200 Subject: [PATCH 3/5] Fixed uppercase of options --- lng/english.lng.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lng/english.lng.php b/lng/english.lng.php index 0e7676ce..be471b70 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1318,7 +1318,7 @@ $lng['admin']['cronjob_edit'] = 'Edit cronjob'; $lng['cronjob']['cronjobsettings'] = 'Cronjob settings'; $lng['cronjob']['cronjobintervalv'] = 'Runtime interval value'; $lng['cronjob']['cronjobinterval'] = 'Runtime interval'; -$lng['panel']['options'] = 'options'; +$lng['panel']['options'] = 'Options'; $lng['admin']['warning'] = 'WARNING - Please note!'; $lng['cron']['changewarning'] = 'Changing these values can have a negative cause to the behavior of Froxlor and its automated tasks.

Please only change values here, if you are sure you know what you are doing.'; From c4713f3ebf898e7f365688ddc636604e1820b814 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Tue, 1 Oct 2013 18:03:04 +0200 Subject: [PATCH 4/5] Replaced static text with language var --- templates/Sparkle/header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl index 4ae31d28..78af3830 100644 --- a/templates/Sparkle/header.tpl +++ b/templates/Sparkle/header.tpl @@ -46,7 +46,7 @@
  • {$lng['admin']['overview']}
    • -
  • Options +
  • {$lng['panel']['options']}
    • {$lng['login']['password']}
    • {$lng['login']['language']}
      • @@ -58,7 +58,7 @@
    • {$lng['login']['logout']} {$userinfo['name']} ({$userinfo['loginname']})
    • {$lng['admin']['overview']}
      • -
    • Options +
    • {$lng['panel']['options']}
      • {$lng['login']['password']}
      • {$lng['login']['language']}
        • From 12bf2b779fd952aa65260f216f085b59329d9c5e Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Tue, 1 Oct 2013 18:30:02 +0200 Subject: [PATCH 5/5] Changed old CUST_NAME to new SALUTATION --- templates/Sparkle/admin/templates/templates_add_2.tpl | 8 ++++---- templates/Sparkle/admin/templates/templates_edit.tpl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl index f724999c..623ca6e9 100644 --- a/templates/Sparkle/admin/templates/templates_add_2.tpl +++ b/templates/Sparkle/admin/templates/templates_add_2.tpl @@ -191,8 +191,8 @@ $header - {CUST_NAME} - {$lng['admin']['templates']['CUST_NAME']} + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} {DB_NAME} @@ -220,8 +220,8 @@ $header - {CUST_NAME} - {$lng['admin']['templates']['CUST_NAME']} + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} {USR_NAME} diff --git a/templates/Sparkle/admin/templates/templates_edit.tpl b/templates/Sparkle/admin/templates/templates_edit.tpl index 1b356a15..258adeb1 100644 --- a/templates/Sparkle/admin/templates/templates_edit.tpl +++ b/templates/Sparkle/admin/templates/templates_edit.tpl @@ -191,8 +191,8 @@ $header - {CUST_NAME} - {$lng['admin']['templates']['CUST_NAME']} + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} {DB_NAME} @@ -220,8 +220,8 @@ $header - {CUST_NAME} - {$lng['admin']['templates']['CUST_NAME']} + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} {USR_NAME}