From ebe467b77abecda3a18d2bbb8864ceeee1441d81 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Tue, 16 May 2017 14:50:51 +0000 Subject: [PATCH] =?UTF-8?q?N=C2=B0635=20Portal:=20Final=20touches=20on=20f?= =?UTF-8?q?orms=20layout=20refactoring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:trunk[4738] --- .../portal/web/css/bootstrap-theme-combodo.css | 9 +++++++-- .../portal/web/css/bootstrap-theme-combodo.scss | 9 +++++++-- .../2.x/itop-portal-base/portal/web/css/portal.css | 4 ++++ .../2.x/itop-portal-base/portal/web/css/portal.scss | 4 ++++ datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml | 2 ++ js/ckeditor/contents.css | 4 ++-- .../bsselectobjectfieldrenderer.class.inc.php | 2 +- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css index 8b516edc8..5ebd44404 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css +++ b/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 { diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss index 44a8f854d..737b9bec5 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss +++ b/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 { 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 9cb52c4b2..82a6c1976 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 @@ -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; 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 4623727cf..78dc76705 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 @@ -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; diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index 11cca82e9..46f9daf6e 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -1322,6 +1322,8 @@
Ticket + + diff --git a/js/ckeditor/contents.css b/js/ckeditor/contents.css index f9a02b8a3..b86d63eff 100644 --- a/js/ckeditor/contents.css +++ b/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; diff --git a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php index 4dca07642..59233ecfa 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php +++ b/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) {