From c185e1fc4fa39e6cac67747db22adffb0153014e Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 13 Dec 2016 10:45:34 +0000
Subject: [PATCH] Portal: LinkedSet label in forms can now be toggled by
 clicking on the field label (Was only working on the linkedset count and
 chevron)

SVN:trunk[4514]
---
 datamodels/2.x/itop-portal-base/portal/web/css/portal.css     | 4 +++-
 datamodels/2.x/itop-portal-base/portal/web/css/portal.scss    | 4 +++-
 .../fieldrenderer/bslinkedsetfieldrenderer.class.inc.php      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css
index 26b941abe..1e73a76d8 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css
@@ -652,10 +652,12 @@ table .group-actions {
 }
 /* LinkedSet*/
 .form_linkedset_toggler, .form_linkedset_toggler:hover, .form_linkedset_toggler:focus {
-  margin-left: 0.4em;
   text-decoration: none;
   color: inherit;
 }
+.form_linkedset_toggler > .text {
+  margin-left: 0.4em;
+}
 .form_linkedset_toggler > .text:before {
   content: "(";
 }
diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
index bf241b202..fce7377d2 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
@@ -692,10 +692,12 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 .form_linkedset_toggler,
 .form_linkedset_toggler:hover,
 .form_linkedset_toggler:focus{
-	margin-left: 0.4em;
 	text-decoration: none;
 	color: inherit;
 }
+.form_linkedset_toggler > .text{
+	margin-left: 0.4em;
+}
 .form_linkedset_toggler > .text:before{
 	content: "(";
 }
diff --git a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
index 2b58e1421..a13e47194 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
@@ -67,8 +67,8 @@ class BsLinkedSetFieldRenderer extends FieldRenderer
 			if ($this->oField->GetLabel() !== '')
 			{
 				$oOutput->AddHtml('<label for="' . $this->oField->GetGlobalId() . '" class="control-label">')
-					->AddHtml($this->oField->GetLabel(), true)
 					->AddHtml('<a id="' . $sCollapseTogglerId . '" class="form_linkedset_toggler" data-toggle="collapse" href="#' . $sFieldWrapperId . '" aria-expanded="false" aria-controls="' . $sFieldWrapperId . '">')
+					->AddHtml($this->oField->GetLabel(), true)
 					->AddHtml('<span class="text">' . count($aItemIds) . '</span>')
 					->AddHtml('<span class="glyphicon ' . $sCollapseTogglerHiddenClass . '"></>')
 					->AddHtml('</a>')