From 0b400cdb35dd543a60a45feafc9b28857882aa47 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 12 Aug 2020 09:21:40 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9bordement=20dans=20inputfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/template.class.php        |  2 +-
 core/layout/common.css               | 10 ++++++++++
 module/blog/view/article/article.php |  1 -
 module/blog/view/edit/edit.php       |  6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 786ecc97..dfdcad0d 100755
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -244,7 +244,7 @@ class template {
             'value' => $attributes['value']
         ]);
         // Champ d'upload
-        $html .= '<div>';
+        $html .= '<div class="inputWrapper">';
         $html .= sprintf(
             '<a
                 href="' .
diff --git a/core/layout/common.css b/core/layout/common.css
index 4e37b800..dbe8ecb4 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -1019,6 +1019,16 @@ label {
 	text-decoration: none;
 }
 
+/* Empêche le débordement et les sauts de ligne */
+.inputWrapper {
+    display: inline;
+}
+.inputWrapper > .inputFile {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 /* Pagination */
 .pagination {
 	padding: 10px 0;
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index 11f4f5e9..848418f6 100755
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -11,7 +11,6 @@
 				AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
 			 ): ?>
 		<div class="col2">
-		<?php echo $this->getUser('group'); ?>
 			<?php echo template::button('blogEdit', [
 						'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
 						'value' => 'Editer'
diff --git a/module/blog/view/edit/edit.php b/module/blog/view/edit/edit.php
index da093b3f..e964ef93 100755
--- a/module/blog/view/edit/edit.php
+++ b/module/blog/view/edit/edit.php
@@ -36,7 +36,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col4">
+					<div class="col6">
 						<?php echo template::file('blogEditPicture', [
 							'help' => 'Taille optimale de l\'image de couverture : ' . ((int) substr($this->getData(['theme', 'site', 'width']), 0, -2) - (20 * 2)) . ' x 350 pixels.',
 							'label' => 'Image de couverture',
@@ -44,13 +44,13 @@
 							'value' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'picture'])
 						]); ?>
 					</div>
-					<div class="col4">
+					<div class="col3">
 						<?php echo template::select('blogEditPictureSize', $module::$pictureSizes, [
 							'label' => 'Largeur de l\'image',
 							'selected' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'pictureSize'])
 						]); ?>
 					</div>
-					<div class="col4">
+					<div class="col3">
 						<?php echo template::select('blogEditPicturePosition', $module::$picturePositions, [
 							'label' => 'Position',
 							'selected' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'picturePosition']),