Forráskód Böngészése

Portal: LinkedSet label in forms can now be toggled by clicking on the field label (Was only working on the linkedset count and chevron)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4514 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 8 éve
szülő
commit
82af5d2b27

+ 3 - 1
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: "(";
 }

+ 3 - 1
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: "(";
 }

+ 1 - 1
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>')