composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-02 07:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°635 Portal: Final touches on forms layout refactoring

Browse Source 
SVN:trunk[4738]
This commit is contained in:
Guillaume Lajarige
2017-05-16 14:50:51 +00:00
parent e9b7ccd475
commit ebe467b77a
7 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css vendored
View File

@@ -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 {

9
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss vendored
View File

@@ -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 {

4
datamodels/2.x/itop-portal-base/portal/web/css/portal.css
View File

@@ -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;

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

@@ -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;

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

@@ -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>

4
js/ckeditor/contents.css
View File

@@ -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;

2
sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php
View File

@@ -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)
{