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

N°3685 Revert most of e4f58b5b changes, replace @extend .ibo-button calls with classes in markup for most cases, except jquery-ui buttons

Browse Source
This commit is contained in:
Stephen Abello
2021-08-05 10:20:09 +02:00
parent ad936d7a2f
commit 97d52fb539
13 changed files with 340 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/forms.class.inc.php
View File

@@ -105,7 +105,7 @@ class DesignerForm
foreach($aFields as $oField) {
$aRow = $oField->Render($oP, $sFormId);
if ($oField->IsVisible()) {
$sValidation = '<span class="prop_apply ibo-prop--apply">'.$this->GetValidationArea($oField->GetFieldId()).'</span>';
$sValidation = '<span class="prop_apply ibo-prop--apply ibo-button ibo-is-alternative">'.$this->GetValidationArea($oField->GetFieldId()).'</span>';
$sField = $aRow['value'].$sValidation;
$aDetails[] = array('label' => $aRow['label'], 'value' => $sField);
} else {
@@ -222,7 +222,7 @@ class DesignerForm
if ($oField->IsVisible()) {
$sFieldId = $this->GetFieldId($oField->GetCode());
$sValidation = $this->GetValidationArea($sFieldId, '<span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Apply').'"><i class="fas fa-check"></i></span>');
$sValidationFields = '</td><td class="prop_icon prop_apply ibo-prop--apply" >'.$sValidation.'</td><td class="prop_icon prop_cancel ibo-prop--cancel"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-times"></i></span></td>'
$sValidationFields = '</td><td class="prop_icon prop_apply ibo-prop--apply ibo-button ibo-is-alternative" >'.$sValidation.'</td><td class="prop_icon prop_cancel ibo-prop--cancel ibo-button ibo-is-alternative"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-times"></i></span></td>'
.$this->EndRow();
if (is_null($aRow['label'])) {
@@ -1682,7 +1682,7 @@ class DesignerFormSelectorField extends DesignerFormField
}
if ($sRenderMode == 'property') {
$sHtml .= '</td><td class="prop_icon prop_apply ibo-prop--apply"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Apply').'"><i class="fas fa-check"></i></span></td><td class="prop_icon prop_cancel ibo-prop--cancel"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-times"></i></span></td></tr>';
$sHtml .= '</td><td class="prop_icon prop_apply ibo-prop--apply ibo-button ibo-is-alternative"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Apply').'"><i class="fas fa-check"></i></span></td><td class="prop_icon prop_cancel ibo-prop--cancel ibo-button ibo-is-alternative"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-times"></i></span></td></tr>';
}
foreach ($this->aSubForms as $sKey => $aFormData) {
$sId = $this->oForm->GetFieldId($this->sCode);

4
css/backoffice/application/display-block/_block-csv.scss
View File

@@ -8,8 +8,4 @@ $ibo-block-csv--textarea--margin-top: 10px !default;
min-height: $ibo-block-csv--textarea--min-height;
margin-top: $ibo-block-csv--textarea--margin-top;
}
}
.ibo-block-csv--download-link{
@extend .ibo-button.ibo-is-alternative.ibo-is-primary;
}

1
css/backoffice/components/_prop.scss
View File

@@ -42,6 +42,5 @@ $ibo-prop--apply--error--color: $ibo-color-grey-800 !default;
height: $ibo-prop--apply-cancel--span--height;
width: $ibo-prop--apply-cancel--span--width;
text-align: center;
@extend .ibo-button.ibo-is-alternative;
}
}

10
css/backoffice/components/_search-form.scss
View File

@@ -847,7 +847,6 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
button {
margin-top: 8px;
@extend .ibo-button.ibo-is-primary.ibo-is-regular;
> span {
margin-right: 0.5em;
}
@@ -874,15 +873,6 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
padding-top: $ibo-panel--spacing-top ;
}
.sfc_fg_button{
@extend .ibo-button.ibo-is-neutral;
&.sfc_fg_search, &.sfc_fg_apply, &.sfc_fg_cancel {
@extend .ibo-is-regular;
}
&.sfc_fg_more {
@extend .ibo-is-alternative;
}
}
.sfm_tg_title{
display: none;
}

2
css/backoffice/components/input/_input-datetime.scss
View File

@@ -25,7 +25,7 @@ $ibo-input-datetime--ui-tpicker-slider--padding-right: 18px !default;
color: $ibo-input-datetime--action-button--color;
}
.ui-datepicker-current, .ui-datepicker-close{
@extend .ibo-button.ibo-is-regular.ibo-is-secondary;
@extend .ibo-button, .ibo-is-regular, .ibo-is-secondary;
}
.ui_tpicker_hour_slider, .ui_tpicker_minute_slider, .ui_tpicker_second_slider{
@extend .ibo-input-wrapper;

1
css/backoffice/layout/dashboard/_dashboard-editor.scss
View File

@@ -100,7 +100,6 @@ $ibo-dashboard-editor--delete-dashlet-icon--z-index: 21 !default;
right: $ibo-dashboard-editor--delete-dashlet-icon--right;
padding: $ibo-dashboard-editor--delete-dashlet-icon--padding;
z-index: $ibo-dashboard-editor--delete-dashlet-icon--z-index;
@extend .ibo-button.ibo-is-alternative.ibo-is-danger;
}
.ibo-dashboard-editor .itop-dashboard{
a{

2
css/backoffice/vendors/_jqueryui.scss vendored
View File

@@ -167,7 +167,7 @@ $ibo-vendors-jqueryui--ui-slider--ui-slider-handle--hover--border-color: $ibo-co
top: 0;
}
.ui-button {
@extend .ibo-button.ibo-is-regular.ibo-is-secondary;
@extend .ibo-button, .ibo-is-regular, .ibo-is-secondary;
> .ui-icon {
background-image: none;
float: unset;

310
datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
View File

File diff suppressed because one or more lines are too long

310
datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
View File

File diff suppressed because one or more lines are too long

2
js/dashlet.js
View File

@@ -30,7 +30,7 @@ $(function()
{
var me = this;
this.closeBox = $('<div class="ibo-dashboard-editor--delete-dashlet-icon close-box"/>').append('<i class="fas fa-trash ibo-button--icon"></i>');
this.closeBox = $('<div class="ibo-dashboard-editor--delete-dashlet-icon close-box ibo-button ibo-is-alternative ibo-is-danger"/>').append('<i class="fas fa-trash ibo-button--icon"></i>');
this.closeBox
.on('click', function () {
me._remove_dashlet();

8
js/search/search_form_criteria.js
View File

@@ -486,10 +486,10 @@ $(function()
// DOM elements
this.element.find('.sfc_fg_buttons')
.append('<button type="button" name="search" class="sfc_fg_button sfc_fg_search">' + Dict.S('UI:Button:Search') + '</button>')
.append('<button type="button" name="apply" class="sfc_fg_button sfc_fg_apply">' + Dict.S('UI:Button:Apply') + '</button>')
.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel">' + Dict.S('UI:Button:Cancel') + '</button>')
.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '<span' + ' class="fas fa-angle-double-down"></span></button>')
.append('<button type="button" name="search" class="sfc_fg_button sfc_fg_search ibo-button ibo-is-neutral ibo-is-regular">' + Dict.S('UI:Button:Search') + '</button>')
.append('<button type="button" name="apply" class="sfc_fg_button sfc_fg_apply ibo-button ibo-is-neutral ibo-is-regular">' + Dict.S('UI:Button:Apply') + '</button>')
.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel ibo-button ibo-is-neutral ibo-is-regular">' + Dict.S('UI:Button:Cancel') + '</button>')
.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more ibo-button ibo-is-neutral ibo-is-alternative">' + Dict.S('UI:Button:More') + '<span' + ' class="fas fa-angle-double-down"></span></button>')
.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '<span' + ' class="fas fa-angle-double-up"></span></button>');
// Events

2
js/search/search_form_handler.js
View File

@@ -794,7 +794,7 @@ $(function()
// Make placeholder if nothing yet
if(oResultAreaElem.html() === '')
{
oResultAreaElem.html('<div class="sf_results_placeholder"><p>' + Dict.S('UI:Search:NoAutoSubmit:ExplainText') + '</p><p><button type="button"><span class="fas fa-search"></span>' + Dict.S('UI:Button:Search') + '</button></p></div>');
oResultAreaElem.html('<div class="sf_results_placeholder"><p>' + Dict.S('UI:Search:NoAutoSubmit:ExplainText') + '</p><p><button type="button" class="ibo-button ibo-is-primary ibo-is-regular"><span class="fas fa-search"></span>' + Dict.S('UI:Button:Search') + '</button></p></div>');
oResultAreaElem.find('button').on('click', function(){
// TODO: Bug: Open "Search for CI", change child classe in the dropdown, click the search button. It submit the search for the original child classe, not the current one; whereas a click on the upper right pictogram does. This might be due to the form reloading.
me._onSubmitClick();

2
templates/application/display-block/block-csv/layout.html.twig
View File

@@ -5,7 +5,7 @@
<div>
<table style="width:100%" class="transparent">
<tr>
<td><a href="{{ oUIBlock.sDownloadLink }}" class="ibo-block-csv--download-link">{{ 'UI:Download-CSV'|dict_format(oUIBlock.sCsvFile) }}</a>{{ oUIBlock.sCharsetNotice }}</td>
<td><a href="{{ oUIBlock.sDownloadLink }}" class="ibo-block-csv--download-link ibo-button ibo-is-alternative ibo-is-primary">{{ 'UI:Download-CSV'|dict_format(oUIBlock.sCsvFile) }}</a>{{ oUIBlock.sCharsetNotice }}</td>
<td style="text-align:right">
<input type="checkbox" {{ oUIBlock.sChecked }} onClick="window.location.href='{{ oUIBlock.sLinkToToggle }}'">
&nbsp;{{ 'UI:CSVExport:AdvancedMode'|dict_s }}