From 1ce5ec73eab5c92db1d9b1faaa33643ffa4616e3 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 24 Feb 2020 09:24:23 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02798=20-=20Fix=20unable=20to=20submit=20?=
 =?UTF-8?q?portal=20forms=20(Regression=20from=20dba6e8ce)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/public/css/portal.css              | 29 +++++++++++++++----
 .../portal/public/css/portal.scss             |  3 +-
 .../bsfieldrenderer.class.inc.php             |  1 -
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/portal.css b/datamodels/2.x/itop-portal-base/portal/public/css/portal.css
index 17443c72ec..563a27f29a 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/css/portal.css
+++ b/datamodels/2.x/itop-portal-base/portal/public/css/portal.css
@@ -1,4 +1,21 @@
-/*
+/*!
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+/*!
  * Copyright (C) 2013-2020 Combodo SARL
  *
  * This file is part of iTop.
@@ -15,7 +32,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 /*!
  * Combodo portal template v1.0.0
  */
@@ -1035,6 +1051,11 @@ table .group-actions {
   color: #EA7D1E;
   font-size: 0.9em;
 }
+/* Note: We don't put the .form_field selector as it must work for read-only */
+.form-control-static img {
+  max-width: 100% !important;
+  height: initial !important;
+}
 /* ExternalKey */
 .selectobject .input-group-addon {
   cursor: pointer;
@@ -1249,10 +1270,6 @@ table .group-actions {
 .form_fields .file_open_link {
   margin-left: 10px;
 }
-.form_field .form-control-static img {
-  max-width: 100% !important;
-  height: initial !important;
-}
 .form_buttons {
   padding-top: 20px;
   text-align: center;
diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/portal.scss b/datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
index 8b93ef8af0..f06bf7d382 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
+++ b/datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
@@ -1116,7 +1116,8 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 	color: $brand-primary;
 	font-size: 0.9em;
 }
-.form_field .form-control-static img{
+/* Note: We don't put the .form_field selector as it must work for read-only */
+.form-control-static img{
 	max-width: 100% !important;
 	height: initial !important;
 }
diff --git a/sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php
index 355d2965ec..71c2fa574c 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php
@@ -39,7 +39,6 @@ class BsFieldRenderer extends FieldRenderer
 	public function Render()
 	{
 		$oOutput = parent::Render();
-		$oOutput->AddCssClass('form_field');
 		$oOutput->AddCssClass('form_field_'.$this->oField->GetDisplayMode());
 
 		return $oOutput;