From acb6109b51b4517a9c1447604528366086c315dd Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:31:49 +0100 Subject: [PATCH 01/45] footer --- html/index.php | 1 + html/style.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/html/index.php b/html/index.php index b0d00fc..82b8d45 100644 --- a/html/index.php +++ b/html/index.php @@ -199,6 +199,7 @@ if (isset($_POST['xd_check'])){ ?> diff --git a/html/style.css b/html/style.css index 24e6d30..302c7fa 100644 --- a/html/style.css +++ b/html/style.css @@ -28,12 +28,12 @@ header h1{ float: right; } -#menus{ +#menus, footer{ margin-left: 50px; width:100%; display: table; } -#menus a{ +#menus a, footer{ color: #fff; display: table-cell; text-decoration: none; From bc4221389816968ec6049f82ff2e55bc64abcc28 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:34:48 +0100 Subject: [PATCH 02/45] footer --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 302c7fa..eaf3908 100644 --- a/html/style.css +++ b/html/style.css @@ -33,7 +33,7 @@ header h1{ width:100%; display: table; } -#menus a, footer{ +#menus a, footer a{ color: #fff; display: table-cell; text-decoration: none; From 8cbd6a6cdf2a5ea9f65e1cbbd47db2beaf6b5f4a Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:40:03 +0100 Subject: [PATCH 03/45] css --- html/style.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/html/style.css b/html/style.css index eaf3908..b6fc8ac 100644 --- a/html/style.css +++ b/html/style.css @@ -28,12 +28,12 @@ header h1{ float: right; } -#menus, footer{ +#menus{ margin-left: 50px; width:100%; display: table; } -#menus a, footer a{ +#menus a{ color: #fff; display: table-cell; text-decoration: none; @@ -44,6 +44,18 @@ header h1{ color:#202020; background-color:#fff; } +footer{ +margin-top: -70px; + height: 70px; + display: block; + background-color: #f5f5f5; + color: #343638; + font-size: 11pt; + line-height: 15pt; + margin: 0; + overflow-x: hidden; +} + #languages{ float: right; text-align: right; From d7a34e0a16e50f51b7e2508cd89c3b9b949b4306 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:42:14 +0100 Subject: [PATCH 04/45] css --- html/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index b6fc8ac..9bcddbc 100644 --- a/html/style.css +++ b/html/style.css @@ -48,12 +48,17 @@ footer{ margin-top: -70px; height: 70px; display: block; - background-color: #f5f5f5; color: #343638; font-size: 11pt; line-height: 15pt; margin: 0; overflow-x: hidden; + box-sizing: border-box; + background-image: -webkit-linear-gradient(top, #f5f5f5,#e9e9e9); + border-top: 1px solid #bebebe; + color: #999; + font-size: 12px; + line-height: 1.5em; } #languages{ From ee98af802b2e67edf0adea00b6d7efc581051e14 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:46:20 +0100 Subject: [PATCH 05/45] css --- html/style.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/html/style.css b/html/style.css index 9bcddbc..951b650 100644 --- a/html/style.css +++ b/html/style.css @@ -45,9 +45,9 @@ header h1{ background-color:#fff; } footer{ -margin-top: -70px; + margin-top: -70px; height: 70px; - display: block; + display: block; color: #343638; font-size: 11pt; line-height: 15pt; @@ -55,10 +55,14 @@ margin-top: -70px; overflow-x: hidden; box-sizing: border-box; background-image: -webkit-linear-gradient(top, #f5f5f5,#e9e9e9); - border-top: 1px solid #bebebe; - color: #999; + border-top: 1px solid #bebebe; + color: #999; font-size: 12px; line-height: 1.5em; + text-align: center; +} +footer a { + } #languages{ From 07bfb683585ed0eb6d36dd5c60bfc8ad9e1b6707 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:47:28 +0100 Subject: [PATCH 06/45] css --- html/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/html/style.css b/html/style.css index 951b650..3068986 100644 --- a/html/style.css +++ b/html/style.css @@ -52,6 +52,7 @@ footer{ font-size: 11pt; line-height: 15pt; margin: 0; + padding-top: 15pt; overflow-x: hidden; box-sizing: border-box; background-image: -webkit-linear-gradient(top, #f5f5f5,#e9e9e9); From 0ec3bc57a71b4649567a96fdb280b7dd7ef44889 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 20:49:05 +0100 Subject: [PATCH 07/45] css --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 3068986..d6240fc 100644 --- a/html/style.css +++ b/html/style.css @@ -63,7 +63,7 @@ footer{ text-align: center; } footer a { - + margin:0px 5px 0px 5px; } #languages{ From 997a83cf978e373347ed04c51d55792b301e6fb4 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:29:22 +0100 Subject: [PATCH 08/45] css --- html/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/style.css b/html/style.css index d6240fc..65af679 100644 --- a/html/style.css +++ b/html/style.css @@ -64,6 +64,9 @@ footer{ } footer a { margin:0px 5px 0px 5px; + color: #666; + text-decoration: none; + font-weight: normal; } #languages{ From f530a26dea4995c9120b51135ac22598303a4268 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:32:07 +0100 Subject: [PATCH 09/45] css --- html/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/style.css b/html/style.css index 65af679..f9e345e 100644 --- a/html/style.css +++ b/html/style.css @@ -61,6 +61,9 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; + position: absolute; + bottom: 0; + } footer a { margin:0px 5px 0px 5px; From 98f19b780a5fdbc40399e144c8caade2297a1cd7 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:32:28 +0100 Subject: [PATCH 10/45] css --- html/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/html/style.css b/html/style.css index f9e345e..f4f7ce1 100644 --- a/html/style.css +++ b/html/style.css @@ -61,7 +61,6 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - position: absolute; bottom: 0; } From 763d10fd2d8908ae0732a1d2daf022dc065e60e5 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:33:14 +0100 Subject: [PATCH 11/45] css --- html/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/html/style.css b/html/style.css index f4f7ce1..f9e345e 100644 --- a/html/style.css +++ b/html/style.css @@ -61,6 +61,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; + position: absolute; bottom: 0; } From ed29686d93a2a26c360e92cc475b430581fec4c5 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:35:20 +0100 Subject: [PATCH 12/45] css --- html/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/style.css b/html/style.css index f9e345e..b775926 100644 --- a/html/style.css +++ b/html/style.css @@ -61,8 +61,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - position: absolute; - bottom: 0; + } footer a { @@ -81,6 +80,7 @@ section{ margin: 0 auto; overflow: hidden; width: 90%; + min-height:100%; } article{ float: right; From 3a03d86eaec6ff9d8ef4803da7d9406291a9bbc8 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:37:47 +0100 Subject: [PATCH 13/45] css --- html/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/style.css b/html/style.css index b775926..06a665f 100644 --- a/html/style.css +++ b/html/style.css @@ -45,6 +45,8 @@ header h1{ background-color:#fff; } footer{ + clear: both; + position: relative; margin-top: -70px; height: 70px; display: block; @@ -76,6 +78,7 @@ footer a { text-align: right; } section{ + height: auto; border-bottom: 1px solid rgb(204, 204, 204); margin: 0 auto; overflow: hidden; From 039248c97779336025641b3c0b2bbbd512f18f6a Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:42:06 +0100 Subject: [PATCH 14/45] css --- html/style.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/html/style.css b/html/style.css index 06a665f..08e910d 100644 --- a/html/style.css +++ b/html/style.css @@ -45,8 +45,6 @@ header h1{ background-color:#fff; } footer{ - clear: both; - position: relative; margin-top: -70px; height: 70px; display: block; @@ -63,8 +61,8 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - - + position: relative; + clear: both; } footer a { margin:0px 5px 0px 5px; @@ -78,7 +76,6 @@ footer a { text-align: right; } section{ - height: auto; border-bottom: 1px solid rgb(204, 204, 204); margin: 0 auto; overflow: hidden; From 775affa9ef56fd846c504c75b023ee6d7e95101d Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:52:07 +0100 Subject: [PATCH 15/45] css --- html/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/style.css b/html/style.css index 08e910d..6c9681c 100644 --- a/html/style.css +++ b/html/style.css @@ -7,6 +7,7 @@ body{ text-rendering:optimizelegibility; margin:0 auto; font-family : "lucida grande", "gill sans", arial, sans-serif; + min-height:100%; } header{ background-color:#A60800; @@ -61,8 +62,8 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - position: relative; - clear: both; + bottom: 0; + } footer a { margin:0px 5px 0px 5px; @@ -80,7 +81,6 @@ section{ margin: 0 auto; overflow: hidden; width: 90%; - min-height:100%; } article{ float: right; From f3664920daed54d806610ffecee8bd0a28f0c4c5 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 21:55:10 +0100 Subject: [PATCH 16/45] hate css --- html/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/html/style.css b/html/style.css index 6c9681c..34a78a8 100644 --- a/html/style.css +++ b/html/style.css @@ -62,6 +62,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; + position: absolute; bottom: 0; } From be40dca757b2c2e7f31914d22702e99464089270 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:00:55 +0100 Subject: [PATCH 17/45] hate css --- html/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 34a78a8..c2934f9 100644 --- a/html/style.css +++ b/html/style.css @@ -1,3 +1,6 @@ +html { + height: 100%; +} body{ width:100%; font-size:100%; @@ -62,7 +65,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - position: absolute; + position: relative; bottom: 0; } From e93fcd1562af5cc8cd4d38d79cf16218bc1215b2 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:06:35 +0100 Subject: [PATCH 18/45] hate css --- html/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index c2934f9..ca4140a 100644 --- a/html/style.css +++ b/html/style.css @@ -2,6 +2,7 @@ html { height: 100%; } body{ + position:relative; width:100%; font-size:100%; top: 0px; @@ -65,7 +66,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - position: relative; + position: absolute; bottom: 0; } From 9435bd5a29c7cb2727de74b76a38a9ab6d403f43 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:07:27 +0100 Subject: [PATCH 19/45] hate css --- html/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/html/style.css b/html/style.css index ca4140a..1cbc544 100644 --- a/html/style.css +++ b/html/style.css @@ -66,6 +66,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; + width: 100%; position: absolute; bottom: 0; From 7333b26d6cefd455b347780c341ebb4c3e05e6c8 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:09:00 +0100 Subject: [PATCH 20/45] hate css --- html/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/html/style.css b/html/style.css index 1cbc544..c2c678d 100644 --- a/html/style.css +++ b/html/style.css @@ -69,7 +69,6 @@ footer{ width: 100%; position: absolute; bottom: 0; - } footer a { margin:0px 5px 0px 5px; From a73f5083dde89c3afa402f7ee1e380700963acaa Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:10:40 +0100 Subject: [PATCH 21/45] hate css --- html/style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/html/style.css b/html/style.css index c2c678d..a7701f1 100644 --- a/html/style.css +++ b/html/style.css @@ -2,7 +2,7 @@ html { height: 100%; } body{ - position:relative; + position:relative; width:100%; font-size:100%; top: 0px; @@ -82,9 +82,7 @@ footer a { text-align: right; } section{ - border-bottom: 1px solid rgb(204, 204, 204); margin: 0 auto; - overflow: hidden; width: 90%; } article{ From cb1488edd92f1b935ad6987e7de835b838a7649c Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:11:45 +0100 Subject: [PATCH 22/45] hate css --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index a7701f1..63c9da3 100644 --- a/html/style.css +++ b/html/style.css @@ -1,5 +1,5 @@ html { - height: 100%; + min-height: 100%; } body{ position:relative; From 7da7bffada114b39bfc2f9dda7f6878bf88d433c Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:12:42 +0100 Subject: [PATCH 23/45] hate css --- html/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/html/style.css b/html/style.css index 63c9da3..7266135 100644 --- a/html/style.css +++ b/html/style.css @@ -1,8 +1,7 @@ html { - min-height: 100%; + height: 100%; } body{ - position:relative; width:100%; font-size:100%; top: 0px; From 02d921d70cf01b6cbc28532966ebdad3a9308803 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:13:49 +0100 Subject: [PATCH 24/45] hate css --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 7266135..808a6d1 100644 --- a/html/style.css +++ b/html/style.css @@ -66,7 +66,7 @@ footer{ line-height: 1.5em; text-align: center; width: 100%; - position: absolute; + position: relative; bottom: 0; } footer a { From 2c1240f4b1c1b4761a98aeb5162626e555f90848 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:18:11 +0100 Subject: [PATCH 25/45] hate css --- html/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/style.css b/html/style.css index 808a6d1..1ed12bb 100644 --- a/html/style.css +++ b/html/style.css @@ -10,6 +10,8 @@ body{ text-rendering:optimizelegibility; margin:0 auto; font-family : "lucida grande", "gill sans", arial, sans-serif; + left:auto; +top:auto; min-height:100%; } header{ From 4c692b1a6fabaa581201c20e85d91dd82c6fb795 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:20:15 +0100 Subject: [PATCH 26/45] hate css --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 1ed12bb..ce4598a 100644 --- a/html/style.css +++ b/html/style.css @@ -68,7 +68,7 @@ footer{ line-height: 1.5em; text-align: center; width: 100%; - position: relative; + position: absolute; bottom: 0; } footer a { From 4058744b0617a375e34a30f3e7f3fabe79777fe9 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:21:38 +0100 Subject: [PATCH 27/45] hate css --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index ce4598a..30dfaca 100644 --- a/html/style.css +++ b/html/style.css @@ -68,7 +68,7 @@ footer{ line-height: 1.5em; text-align: center; width: 100%; - position: absolute; + position:fixed; bottom: 0; } footer a { From 2c46804017b1c99a9251def182ded7672922aa26 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:32:33 +0100 Subject: [PATCH 28/45] hate css --- html/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/style.css b/html/style.css index 30dfaca..7a9cae6 100644 --- a/html/style.css +++ b/html/style.css @@ -67,8 +67,8 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - width: 100%; - position:fixed; + width: 98%; + position:relative; bottom: 0; } footer a { From 22aca3654e9dc743590ae8701cffcaa75d53b7c3 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:33:33 +0100 Subject: [PATCH 29/45] hate css --- html/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/style.css b/html/style.css index 7a9cae6..c522949 100644 --- a/html/style.css +++ b/html/style.css @@ -67,9 +67,9 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - width: 98%; - position:relative; - bottom: 0; + width: 99%; + + } footer a { margin:0px 5px 0px 5px; From b9b8436e78f7bed2b54f5f38ef7bd11beb1ce26b Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:37:23 +0100 Subject: [PATCH 30/45] hate css --- html/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index c522949..c303908 100644 --- a/html/style.css +++ b/html/style.css @@ -68,7 +68,7 @@ footer{ line-height: 1.5em; text-align: center; width: 99%; - + margin-top: -40px; } footer a { @@ -85,6 +85,7 @@ footer a { section{ margin: 0 auto; width: 90%; + padding-bottom: 40px; } article{ float: right; From 7fe3b259388a37c71fd030a5dfd03d66572ccd3f Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:39:37 +0100 Subject: [PATCH 31/45] hate css --- html/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/style.css b/html/style.css index c303908..50d5afa 100644 --- a/html/style.css +++ b/html/style.css @@ -86,6 +86,8 @@ section{ margin: 0 auto; width: 90%; padding-bottom: 40px; + height: auto; + min-height: 100%; } article{ float: right; From ab39b4c3886ce2642600af533ba779dd2cbd49e9 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:41:33 +0100 Subject: [PATCH 32/45] hate css --- html/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/style.css b/html/style.css index 50d5afa..57bedf6 100644 --- a/html/style.css +++ b/html/style.css @@ -86,7 +86,7 @@ section{ margin: 0 auto; width: 90%; padding-bottom: 40px; - height: auto; + overflow:auto; min-height: 100%; } article{ From 7b0075d213f515ea4c15052b3cb5cf11dd2de1c9 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:44:56 +0100 Subject: [PATCH 33/45] hate css --- html/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/html/style.css b/html/style.css index 57bedf6..6ae544e 100644 --- a/html/style.css +++ b/html/style.css @@ -87,6 +87,7 @@ section{ width: 90%; padding-bottom: 40px; overflow:auto; + height: auto; !important; /* real browsers */ min-height: 100%; } article{ From 73d7d974460830b76e18429e11227d7107fa14e6 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:47:19 +0100 Subject: [PATCH 34/45] hate css --- html/style.css | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/html/style.css b/html/style.css index 6ae544e..b0a8913 100644 --- a/html/style.css +++ b/html/style.css @@ -51,7 +51,6 @@ header h1{ background-color:#fff; } footer{ - margin-top: -70px; height: 70px; display: block; color: #343638; @@ -67,9 +66,7 @@ footer{ font-size: 12px; line-height: 1.5em; text-align: center; - width: 99%; - margin-top: -40px; - + width: 100%; } footer a { margin:0px 5px 0px 5px; @@ -86,9 +83,6 @@ section{ margin: 0 auto; width: 90%; padding-bottom: 40px; - overflow:auto; - height: auto; !important; /* real browsers */ - min-height: 100%; } article{ float: right; From 6de395abb8468a3f7eb99589b302f83c5bb22a07 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:54:38 +0100 Subject: [PATCH 35/45] hate css --- html/index.php | 2 +- src/home.php | 41 ++++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/html/index.php b/html/index.php index 82b8d45..1bf659c 100644 --- a/html/index.php +++ b/html/index.php @@ -131,7 +131,7 @@ if(isset($_GET['arena'])){ $siteTitle="Bots Arena"; $siteDescription="bots arena main page. Program your own artificiel intelligence and let it play here"; $mainSectionScript="../src/home.php"; - $asideSectionContent=''; //to do + $asideSectionContent=$lang['SITE_DESCRIPTION']; $cssAdditionalScript=""; $jsAdditionalScript=""; } diff --git a/src/home.php b/src/home.php index 1332bfc..abc1b04 100644 --- a/src/home.php +++ b/src/home.php @@ -1,23 +1,18 @@ -
- -
-
-

Ajouter votre bot

-
- -

-

-

-

-

-

-

-
-
+

Ajouter votre bot

+
+ +

+

+

+

+

+

+

+
+ From 77fb955dd91f64c5a4de71555e78dda0bb20b160 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 22:55:51 +0100 Subject: [PATCH 36/45] hate css --- src/home.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/home.php b/src/home.php index abc1b04..4fd3e43 100644 --- a/src/home.php +++ b/src/home.php @@ -1,3 +1,4 @@ +

Ajouter votre bot

@@ -15,4 +16,5 @@

+
From 83fc7e8cd1dc3dc2c707f1732dc777773595b560 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:00:07 +0100 Subject: [PATCH 37/45] mise en page --- html/style.css | 2 +- src/home.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/style.css b/html/style.css index b0a8913..9fb8c07 100644 --- a/html/style.css +++ b/html/style.css @@ -91,11 +91,11 @@ article{ aside{ float:left; width: 28%; + border-right: } form textarea, form input, form select {width:40%;} form input[type=checkbox], form input[type=radio] { width:15px; } -form input[type=submit]{width: 100%;} form label { float:left; width:40%; diff --git a/src/home.php b/src/home.php index 4fd3e43..e9670bf 100644 --- a/src/home.php +++ b/src/home.php @@ -14,7 +14,7 @@

-

+

From 021dac4aea22b039b64dc82a23eadf2f6ffc461d Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:00:58 +0100 Subject: [PATCH 38/45] mise en page --- src/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/home.php b/src/home.php index e9670bf..6cd5148 100644 --- a/src/home.php +++ b/src/home.php @@ -14,7 +14,7 @@

-

+

From d733ea646583a3c855bfdc6da18f3913e99372bb Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:03:22 +0100 Subject: [PATCH 39/45] mise en page --- html/index.php | 2 +- src/home.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/html/index.php b/html/index.php index 1bf659c..d4241fa 100644 --- a/html/index.php +++ b/html/index.php @@ -131,7 +131,7 @@ if(isset($_GET['arena'])){ $siteTitle="Bots Arena"; $siteDescription="bots arena main page. Program your own artificiel intelligence and let it play here"; $mainSectionScript="../src/home.php"; - $asideSectionContent=$lang['SITE_DESCRIPTION']; + $asideSectionContent=''; $cssAdditionalScript=""; $jsAdditionalScript=""; } diff --git a/src/home.php b/src/home.php index 6cd5148..f0125f0 100644 --- a/src/home.php +++ b/src/home.php @@ -1,4 +1,7 @@
+ +
+

Ajouter votre bot

From 056de4d316d287a9e97885dec342a5a108dc5db7 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:20:28 +0100 Subject: [PATCH 40/45] lecture des erreurs de formulaire --- html/index.php | 2 +- src/addBot.php | 22 ++++++++++++++++++++-- src/home.php | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/html/index.php b/html/index.php index d4241fa..1ea7818 100644 --- a/html/index.php +++ b/html/index.php @@ -120,7 +120,7 @@ if(isset($_GET['arena'])){ $cssAdditionalScript=""; $jsAdditionalScript=""; break; - + default: error(404,"Not found"); break; diff --git a/src/addBot.php b/src/addBot.php index 64445a1..06f824d 100644 --- a/src/addBot.php +++ b/src/addBot.php @@ -1,6 +1,22 @@ -

Add Bot

+
+ + +if((isset($_POST['xd_check'])) && ($_POST['act'] == "addBot")){ + //validation d'ou pas du formulaire + if($alerts==""){ + //it worked + echo "

Relevez vos e-mails

Un lien pour valider le bot vient de vous être envoyé par e-mail. (Vérifiez dans vos spams si vous ne trouvez pas :-$ )

"; + }else{ + echo "

Petite ereur dans votre formulaire

".$alerts."

"; + // TO do put form again + + + } + +}elseif(isset($_GET['params'])){ + //checker si un bot avec ce secret est à valider $rs=mysqli_query($lnMysql,"SELECT id,active,game FROM bots WHERE validate_secret='".mysqli_real_escape_string($lnMysql,$_GET['params'])."'"); if($r=mysqli_fetch_row($rs)){ @@ -18,3 +34,5 @@ if(isset($_GET['params'])){ //problem echo "

Paramètre incorrect, désolé.

"; } +?> +
\ No newline at end of file diff --git a/src/home.php b/src/home.php index f0125f0..582aa1c 100644 --- a/src/home.php +++ b/src/home.php @@ -3,7 +3,7 @@

Ajouter votre bot

- +

From 84bcc7999d84e14123ba98acf895d4886c94cc3a Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:30:39 +0100 Subject: [PATCH 41/45] lecture des erreurs de formulaire --- src/act.php | 9 +++++---- src/addBot.php | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/act.php b/src/act.php index f00e27e..1116b07 100644 --- a/src/act.php +++ b/src/act.php @@ -25,21 +25,22 @@ switch($_POST['act']){ WHERE name='".mysqli_real_escape_string($lnMysql,htmlentities($_POST['botName']))."' AND game='".mysqli_real_escape_string($lnMysql,$_POST['botGame'])."';"); if(mysqli_num_rows($rs) > 0){ - $alerts.="Un bot existant pour ce je porte le même nom\n"; + $alerts.="Un bot existant pour ce jeu porte le même nom.\n"; } //BotUrl (doit retourner un code 200) if(!preg_match("/^(http|https):\/\//", $_POST['botURL'])){ - $alerts.="L'URL n'est pas valide\n"; + $alerts.="L'URL n'est pas valide.\n"; } //email => doit être valide if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) { - $alerts.="L'email n'est pas valide\n"; + $alerts.="L'email n'est pas valide.\n"; } if($alerts <>""){ - echo $alerts; + //echo $alerts; + //do nothing now }else{ //enregistrer le bot et envoyer un email pour la validation diff --git a/src/addBot.php b/src/addBot.php index 06f824d..27a9858 100644 --- a/src/addBot.php +++ b/src/addBot.php @@ -9,10 +9,29 @@ if((isset($_POST['xd_check'])) && ($_POST['act'] == "addBot")){ //it worked echo "

Relevez vos e-mails

Un lien pour valider le bot vient de vous être envoyé par e-mail. (Vérifiez dans vos spams si vous ne trouvez pas :-$ )

"; }else{ - echo "

Petite ereur dans votre formulaire

".$alerts."

"; + echo "

Petite ereur dans votre formulaire

".nl2br($alerts)."

"; // TO do put form again - + echo' + '.xd_check_input(0).' +

+

+

+

+

+

+

+ '; + } }elseif(isset($_GET['params'])){ From de701bf19fc985f713bd90789fbd3edba7560af8 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:31:41 +0100 Subject: [PATCH 42/45] fix php --- src/addBot.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/addBot.php b/src/addBot.php index 27a9858..39bf67b 100644 --- a/src/addBot.php +++ b/src/addBot.php @@ -23,6 +23,7 @@ if((isset($_POST['xd_check'])) && ($_POST['act'] == "addBot")){ echo ''; }else{ echo ''; + } } echo '

From 4c419735fa3e07e58fc3f5d806a4140989efcad4 Mon Sep 17 00:00:00 2001 From: gnieark Date: Wed, 9 Dec 2015 23:32:06 +0100 Subject: [PATCH 43/45] fix php --- src/addBot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addBot.php b/src/addBot.php index 39bf67b..660ec5b 100644 --- a/src/addBot.php +++ b/src/addBot.php @@ -14,7 +14,7 @@ if((isset($_POST['xd_check'])) && ($_POST['act'] == "addBot")){ echo'
'.xd_check_input(0).' -

+