N°635 Portal: Final touches on forms layout refactoring

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4738 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css

@@ -4953,13 +4953,18 @@ label {
   }
   .form_field_compact .form-group.form_group_small .control-label, .form_field_dense .form-group.form_group_small .control-label {
     margin-right: 0.5em;
+    margin-bottom: 0px;
+    height: 28px;
+    vertical-align: sub;
   }
   .form_field_compact .form-group.form_group_small .form-control-static, .form_field_dense .form-group.form_group_small .form-control-static {
-    display: inline;
+    display: inline-block;
+    height: 28px;
+    vertical-align: sub;
   }
   .form_field_compact .form-group.form_group_small .form-control, .form_field_dense .form-group.form_group_small .form-control {
     height: 28px;
-    padding: 4px 5px;
+    padding: 4px 6px;
     font-size: 12px;
   }
   .form_field_compact .form-group.form_group_small .input-group-addon, .form_field_dense .form-group.form_group_small .input-group-addon {

datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss

@@ -6039,13 +6039,18 @@ label {
 
         .control-label{
             margin-right: 0.5em;
+            margin-bottom: 0px;
+            height: 28px;
+            vertical-align: sub;
         }
         .form-control-static{
-            display: inline;
+            display: inline-block;
+            height: 28px;
+            vertical-align: sub;
         }
         .form-control{
             height: 28px;
-            padding: 4px 5px;
+            padding: 4px 6px;
             font-size: 12px;
         }
         .input-group-addon {

datamodels/2.x/itop-portal-base/portal/web/css/portal.css

@@ -1125,6 +1125,10 @@ table .group-actions {
   border-radius: 0px;
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
+/* CKEditor : Styling basics */
+.form_field div.cke .cke_contents {
+  height: 180px !important;
+}
 /* CKEditor : Styling notifications based on BS alerts */
 .cke_notification {
   position: relative;

datamodels/2.x/itop-portal-base/portal/web/css/portal.scss

@@ -1195,6 +1195,10 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 	border-radius: $border-radius-base;
 	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
 }
+/* CKEditor : Styling basics */
+.form_field div.cke .cke_contents{
+	height: 180px !important;
+}
 /* CKEditor : Styling notifications based on BS alerts */
 .cke_notification{
     position: relative;

datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -1322,6 +1322,8 @@
 				<form id="ticket-edit">
 					<class>Ticket</class>
 					<properties>
+						<!--Display mode of the form fields. "cosy" for a regular labels over values layout; "compact" for a side-by-side layout with input aligned; "dense" for a side-by-side layout with input filling all available space. You can also use a custom css class that will be used on the form as "form_xxx", as well as on the fields as "form_field_xxx".-->
+						<!--<display_mode>cosy</display_mode>-->
 						<!-- When set to false, submit button is hidden when transitions are available on the object (in edit mode only). Default is false. -->
 						<!--<always_show_submit>false</always_show_submit>-->
 					</properties>

js/ckeditor/contents.css

@@ -15,13 +15,13 @@ body
 	/* Remove the background color to make it transparent */
 	background-color: #fff;
 
-	margin: 20px;
+	margin: 5px 10px; /* Changed. Original value was 20px */
 }
 
 .cke_editable
 {
 	font-size: 13px;
-	line-height: 1.6;
+	line-height: 1.4; /* Changed. Original value was 1.6 */
 
 	/* Fix for missing scrollbars with RTL texts. (#10488) */
 	word-wrap: break-word;

sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php

@@ -87,7 +87,7 @@ class BsSelectObjectFieldRenderer extends FieldRenderer
 				// Note : Autocomplete/Search is disabled for template fields as they are not external keys, thus they will just be displayed as regular select.
 				$bRegularSelect = ( ($iSetCount <= $this->oField->GetMaximumComboLength()) || ($this->oField->GetSearchEndpoint() === null) || ($this->oField->GetSearchEndpoint() === '') );
 				unset($oCountSet);
-$bRegularSelect=false;
+
 				// - For regular select
 				if ($bRegularSelect)
 				{