From 1e0cc8628896bb90786b0fa28dc315d007c89afb Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Thu, 27 Nov 2014 21:41:10 +0100 Subject: [PATCH 1/4] Removed unneeded header image Signed-off-by: Roman Schmerold (BNoiZe) --- templates/Sparkle/assets/img/header_g_froxlor.png | Bin 281 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 templates/Sparkle/assets/img/header_g_froxlor.png diff --git a/templates/Sparkle/assets/img/header_g_froxlor.png b/templates/Sparkle/assets/img/header_g_froxlor.png deleted file mode 100644 index a38612154db2a6c71f24953d9cb479496fbb1a82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|XRP)FLqY z(bUw`>+9?2=;+eY($CM&=H}+(gwv(*VoR@&g|^$?d|Q&&CSfr%oXrj zc>n+a8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?07gkfK~xA^Ey0Bm zz%T# Date: Thu, 27 Nov 2014 21:45:42 +0100 Subject: [PATCH 2/4] Removed another unused image... doh Signed-off-by: Roman Schmerold (BNoiZe) --- templates/Sparkle/assets/img/default.png | Bin 3541 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 templates/Sparkle/assets/img/default.png diff --git a/templates/Sparkle/assets/img/default.png b/templates/Sparkle/assets/img/default.png deleted file mode 100644 index a6848e09f0e79f9f1766698e3d4e77ff280cba59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3541 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 P00000NkvXXu0mjfo(D;X From b6bc38607224d825890189fc92eaac0bfd4e9b3d Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Thu, 27 Nov 2014 22:04:21 +0100 Subject: [PATCH 3/4] Allow inline styles/scripts, otherwise template functions will break Signed-off-by: Roman Schmerold (BNoiZe) --- lib/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/init.php b/lib/init.php index bee4fb3a..4ce16229 100644 --- a/lib/init.php +++ b/lib/init.php @@ -29,7 +29,7 @@ header('Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time())); // Inline-JS is no longer allowed and used // See: http://people.mozilla.org/~bsterne/content-security-policy/index.html // New stuff see: https://www.owasp.org/index.php/List_of_useful_HTTP_headers and https://www.owasp.org/index.php/Content_Security_Policy -$csp_content = "default-src 'none'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self'; reflected-xss block;"; +$csp_content = "default-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; img-src 'self'; style-src 'self' 'unsafe-inline'; reflected-xss block;"; header("Content-Security-Policy: ".$csp_content); header("X-Content-Security-Policy: ".$csp_content); header("X-WebKit-CSP: ".$csp_content); From b1a9c2bf49d299e8f8327063af3a137bf54f9ec8 Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Fri, 28 Nov 2014 09:12:14 +0100 Subject: [PATCH 4/4] Disabling unsafe-inline for security again Signed-off-by: Roman Schmerold (BNoiZe) --- lib/init.php | 2 +- .../Sparkle/admin/admins/admins_admin.tpl | 12 +- .../admin/customers/customers_customer.tpl | 12 +- templates/Sparkle/assets/css/main.css | 305 ++++++++++++++++++ 4 files changed, 318 insertions(+), 13 deletions(-) diff --git a/lib/init.php b/lib/init.php index 4ce16229..4b333157 100644 --- a/lib/init.php +++ b/lib/init.php @@ -29,7 +29,7 @@ header('Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time())); // Inline-JS is no longer allowed and used // See: http://people.mozilla.org/~bsterne/content-security-policy/index.html // New stuff see: https://www.owasp.org/index.php/List_of_useful_HTTP_headers and https://www.owasp.org/index.php/Content_Security_Policy -$csp_content = "default-src 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self'; img-src 'self'; style-src 'self' 'unsafe-inline'; reflected-xss block;"; +$csp_content = "default-src 'self'; script-src 'self'; connect-src 'self'; img-src 'self' data:; style-src 'self'; reflected-xss block;"; header("Content-Security-Policy: ".$csp_content); header("X-Content-Security-Policy: ".$csp_content); header("X-WebKit-CSP: ".$csp_content); diff --git a/templates/Sparkle/admin/admins/admins_admin.tpl b/templates/Sparkle/admin/admins/admins_admin.tpl index 19775762..4dd5b0ab 100644 --- a/templates/Sparkle/admin/admins/admins_admin.tpl +++ b/templates/Sparkle/admin/admins/admins_admin.tpl @@ -20,16 +20,16 @@
-
+
-
+
∞ -
+
@@ -38,16 +38,16 @@
-
+
-
+
∞ -
+
diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl index b99a454f..7847d947 100644 --- a/templates/Sparkle/admin/customers/customers_customer.tpl +++ b/templates/Sparkle/admin/customers/customers_customer.tpl @@ -27,16 +27,16 @@
-
+
-
+
∞ -
+
@@ -45,16 +45,16 @@
-
+
-
+
∞ -
+
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 6108b59f..6d8021f5 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -1043,3 +1043,308 @@ div.right { .grid-offset-1-2 { margin-left: 50%; } + +/* PROGRESS */ +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="0"] { + width: 0%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="1"] { + width: 1%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="2"] { + width: 2%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="3"] { + width: 3%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="4"] { + width: 4%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="5"] { + width: 5%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="6"] { + width: 6%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="7"] { + width: 7%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="8"] { + width: 8%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="9"] { + width: 9%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="10"] { + width: 10%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="11"] { + width: 11%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="12"] { + width: 12%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="13"] { + width: 13%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="14"] { + width: 14%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="15"] { + width: 15%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="16"] { + width: 16%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="17"] { + width: 17%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="18"] { + width: 18%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="19"] { + width: 19%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="20"] { + width: 20%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="21"] { + width: 21%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="22"] { + width: 22%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="23"] { + width: 23%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="24"] { + width: 24%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="25"] { + width: 25%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="26"] { + width: 26%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="27"] { + width: 27%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="28"] { + width: 28%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="29"] { + width: 29%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="30"] { + width: 30%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="31"] { + width: 31%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="32"] { + width: 32%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="33"] { + width: 33%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="34"] { + width: 34%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="35"] { + width: 35%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="36"] { + width: 36%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="37"] { + width: 37%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="38"] { + width: 38%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="39"] { + width: 39%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="40"] { + width: 40%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="41"] { + width: 41%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="42"] { + width: 42%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="43"] { + width: 43%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="44"] { + width: 44%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="45"] { + width: 45%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="46"] { + width: 46%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="47"] { + width: 47%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="48"] { + width: 48%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="49"] { + width: 49%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="50"] { + width: 50%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="51"] { + width: 51%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="52"] { + width: 52%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="53"] { + width: 53%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="54"] { + width: 54%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="55"] { + width: 55%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="56"] { + width: 56%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="57"] { + width: 57%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="58"] { + width: 58%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="59"] { + width: 59%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="60"] { + width: 60%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="61"] { + width: 61%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="62"] { + width: 62%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="63"] { + width: 63%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="64"] { + width: 64%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="65"] { + width: 65%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="66"] { + width: 66%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="67"] { + width: 67%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="68"] { + width: 68%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="69"] { + width: 69%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="70"] { + width: 70%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="71"] { + width: 71%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="72"] { + width: 72%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="73"] { + width: 73%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="74"] { + width: 74%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="75"] { + width: 75%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="76"] { + width: 76%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="77"] { + width: 77%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="78"] { + width: 78%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="79"] { + width: 79%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="80"] { + width: 80%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="81"] { + width: 81%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="82"] { + width: 82%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="83"] { + width: 83%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="84"] { + width: 84%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="85"] { + width: 85%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="86"] { + width: 86%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="87"] { + width: 87%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="88"] { + width: 88%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="89"] { + width: 89%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="90"] { + width: 90%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="91"] { + width: 91%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="92"] { + width: 92%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="93"] { + width: 93%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="94"] { + width: 94%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="95"] { + width: 95%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="96"] { + width: 96%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="97"] { + width: 97%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="98"] { + width: 98%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="99"] { + width: 99%; +} +.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="100"] { + width: 100%; +} \ No newline at end of file