From c0564f705c48ec52cb9e03e4b2a6c8cb153a337b Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sun, 4 Oct 2020 16:49:28 +0200
Subject: [PATCH] =?UTF-8?q?captcha=20pr=C3=A9sentation=20sur=20une=20seule?=
 =?UTF-8?q?=20ligne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/template.class.php        |  4 ++--
 core/layout/common.css               | 10 +++++++---
 module/blog/view/article/article.php |  3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 49408d0a..225ad92a 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -61,10 +61,10 @@ class template {
         copy ('core/vendor/zwiico/png/'.$letters[$firstNumber] .  '.png', 'site/tmp/' . $firstLetter . '.png');
         copy ('core/vendor/zwiico/png/'.$letters[$secondNumber] . '.png', 'site/tmp/' . $secondLetter . '.png');
         // Début du wrapper
-        $html = '<div id="' . $attributes['id'] . 'Wrapper" class="inputWrapper ' . $attributes['classWrapper'] . '">';
+        $html = '<div class="captcha" id="' . $attributes['id'] . 'Wrapper" class="inputWrapper ' . $attributes['classWrapper'] . '">';
         // Label
         $html .= self::label($attributes['id'],
-                 '<img class="captchaNumber" src="' . helper::baseUrl(false) . 'site/tmp/' . $firstLetter . '.png" /> + <img class="captchaNumber" src="' . helper::baseUrl(false) . 'site/tmp/' . $secondLetter . '.png" /> =  en chiffres ?', [
+                 '<img src="' . helper::baseUrl(false) . 'site/tmp/' . $firstLetter . '.png" />' . template::ico('plus')  . '<img class="captchaNumber" src="' . helper::baseUrl(false) . 'site/tmp/' . $secondLetter . '.png" /> =  en chiffres ?', [
                         'help' => $attributes['help']
                 ]);
         // Notice
diff --git a/core/layout/common.css b/core/layout/common.css
index fafe8f2f..7bb2747d 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -1360,14 +1360,18 @@ th.col12 {
 }
 
 /* Captcha
-*  Taille des images
 */
-.captchaNumber {
+.captcha img{
 	height: 30px;
-	vertical-align: bottom;
+	vertical-align: middle;
 	padding-left: 10px;
 	padding-right: 10px;
 }
+.captcha input[type='text']  {
+	width: 4em;
+	text-align: center;
+	margin: auto auto auto 2em;
+}
 
 /*
 * Couleur des icônes + et -
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index 3e9ef09d..620e2129 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -77,7 +77,7 @@
 			]); ?>
 			<?php if($this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')): ?>
 				<div class="row">
-					<div class="col6">
+					<div class="col12">
 						<?php echo template::captcha('blogArticleCaptcha'); ?>
 					</div>
 				</div>
@@ -85,7 +85,6 @@
 			<div class="row">
 				<div class="col2 offset8">
 					<?php echo template::button('blogArticleCommentHide', [
-						'class' => 'buttonGrey',
 						'value' => 'Annuler'
 					]); ?>
 				</div>