composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°931 TagSet : FAQ.domains is now displayes in the portal (FAQ list and details form)

Browse Source
This commit is contained in:
Pierre Goiffon
2018-10-22 18:39:31 +02:00
parent def4c54d26
commit 84ebca58ac
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
View File

@@ -642,6 +642,7 @@
<title>Class:FAQ</title> <title>Class:FAQ</title>
<fields> <fields>
<field id="error_code"/> <field id="error_code"/>
<field id="domains"/>
<field id="key_words"> <field id="key_words">
<hidden>true</hidden> <hidden>true</hidden>
</field> </field>
@@ -673,6 +674,7 @@
<field id="title"/> <field id="title"/>
<field id="error_code"/> <field id="error_code"/>
<field id="key_words"/> <field id="key_words"/>
<field id="domains"/>
<field id="summary"/> <field id="summary"/>
<field id="description"/> <field id="description"/>
</fields> </fields>
@@ -683,6 +685,7 @@
<div class="form_field" data-field-id="title"></div> <div class="form_field" data-field-id="title"></div>
<div class="form_field" data-field-id="error_code"></div> <div class="form_field" data-field-id="error_code"></div>
<div class="form_field" data-field-id="key_words"></div> <div class="form_field" data-field-id="key_words"></div>
<div class="form_field" data-field-id="domains"></div>
<div class="form_field" data-field-id="summary"></div> <div class="form_field" data-field-id="summary"></div>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">

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

@@ -3212,7 +3212,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
background-color: #fff; background-color: #fff;
cursor: not-allowed; cursor: not-allowed;
} }
.label { .label, .attribute-set-item {
display: inline-block; display: inline-block;
padding: 0.2em 0.6em 0.3em; padding: 0.2em 0.6em 0.3em;
font-size: 75%; font-size: 75%;
@@ -3225,23 +3225,23 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
border-radius: 0px; border-radius: 0px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
} }
a.label:hover, a.label:focus { a.label:hover, a.attribute-set-item:hover, a.label:focus, a.attribute-set-item:focus {
color: #222; color: #222;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
.label:empty { .label:empty, .attribute-set-item:empty {
display: none; display: none;
} }
.btn .label { .btn .label, .btn .attribute-set-item {
position: relative; position: relative;
top: -1px; top: -1px;
} }
.label-default { .label-default, .attribute-set-item {
color: #222; color: #222;
background-color: #fff; background-color: #fff;
} }
.label-default[href]:hover, .label-default[href]:focus { .label-default[href]:hover, .attribute-set-item[href]:hover, .label-default[href]:focus, .attribute-set-item[href]:focus {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
.label-primary { .label-primary {
@@ -5047,15 +5047,15 @@ table.dataTable tbody tr.selected a, table.dataTable tbody th.selected a, table.
background-color: #fcfcfc; background-color: #fcfcfc;
} }
/* Temp */ /* Temp */
.label { .label, .attribute-set-item {
margin-right: 0.4em; margin-right: 0.4em;
margin-bottom: 0.4em; margin-bottom: 0.4em;
padding: 0.5em 0.7em 0.5em; padding: 0.5em 0.7em 0.5em;
font-size: 85%; font-size: 90%;
font-weight: normal; font-weight: normal;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
} }
.label:last-of-type { .label:last-of-type, .attribute-set-item:last-of-type {
margin-right: 0; margin-right: 0;
} }
.selectize-control.multi .selectize-input .attribute-set-item[data-value] { .selectize-control.multi .selectize-input .attribute-set-item[data-value] {
@@ -5063,6 +5063,7 @@ table.dataTable tbody tr.selected a, table.dataTable tbody th.selected a, table.
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: none; border: none;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
text-shadow: none; text-shadow: none;
color: black; color: black;
} }

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

@@ -6198,3 +6198,8 @@ table.dataTable{
border-left: none; border-left: none;
} }
} }
.attribute-set-item {
@extend .label;
@extend .label-default;
}