diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 523fedead..7a8322a9e 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -3200,7 +3200,8 @@ EOF // - Fullscreen toggler for large fields $sFullscreenTogglerTooltip = Dict::S('UI:ToggleFullScreen'); $sFullscreenTogglerHTML = (false === in_array($oAttDef->GetEditClass(), static::GetAttEditClassesToRenderAsLargeField())) ? '' : << + HTML; $sLabelAsHtml = ''.MetaModel::GetLabel($sClass, $sAttCode).''.$sFullscreenTogglerHTML; diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index fa2618dd6..9c32b86f3 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -187,6 +187,8 @@ class DisplayBlock 'auto_reload', /** bool|string|numeric 'fast' (reload faster) or 'standard' (= true or 'true') (reload standard) or reload interval value (numeric) */ 'c[menu]', /** string current navigation menu */ 'c[org_id]', /** int current filtered organization */ + 'c[menu', /** string workaround due to extraparams in menunode */ + 'c[org_id', /** int workaround due to extraparams in menunode */ 'dashboard_div_id', /** string dashboard html div id */ ]; diff --git a/css/light-grey.scss b/css/light-grey.scss index 71c3c7eef..95373ef6d 100644 --- a/css/light-grey.scss +++ b/css/light-grey.scss @@ -3371,41 +3371,7 @@ margin-right: 1em; } - div.explain-printable { - border: 5px solid $complement-color; - background: $complement-light; - color: $text-color; - padding: 10px; - margin: 0; - font-size: 12px; - } - .hideable-chapter { - cursor: pointer; - } - - #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span { - padding-left: 20px; - background: url($approot-relative + "images/eye-open-555.png?v=" + $version) 2px center no-repeat; - } - - #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span { - text-decoration: line-through; - background: url($approot-relative + "images/eye-closed-555.png?v=" + $version) 2px center no-repeat; - } - - .printable-version legend { - padding-left: 26px; - background: $complement-color url($approot-relative + "images/eye-open-fff.png?v=" + $version) 8px center no-repeat; - } - - .printable-version .strikethrough legend { - background: $complement-color url($approot-relative + "images/eye-closed-fff.png?v=" + $version) 8px center no-repeat; - } - - .printable-version fieldset.strikethrough span { - display: none; - } h2.printable-tab-title { border-bottom: 2px solid; diff --git a/css/print.css b/css/print.css index 75d599666..e155de4c9 100644 --- a/css/print.css +++ b/css/print.css @@ -1,79 +1,133 @@ @CHARSET "UTF-8"; -.not-printable { display:none; } -span.ui-layout-resizer { display: none; } -#header-logo { display: none; } -#logo { display: none; } -div.header-menu { display:none; } -div.footer { display:none; } -#top-bar { display: none; } -#inner_menu { display: none; } -div.actions_button { display:none; } -div.itop_popup { display:none; } -a.tab { display:none; } -div.itop-tab { border: #ccc 1px solid; margin-top: 1em; padding-bottom:1em; } -#combodo_logo { display:none; } -div.graph_config { display:none; } -h2.printable-tab-title { - page-break-after: avoid; -} -h1 { - page-break-after: avoid; -} -div#tabbedContent_0 { border:none; } -p a, .ui-widget-content td a, p a:hover, .ui-widget-content td a:hover, p a:visited, .ui-widget-content td a:visited, td a, td a:visited, td a:hover { - padding-left: 0; - background: transparent; -} -body { - margin:10px; -} -@page { - margin: 1cm; -} +@media print { + .not-printable { + display: none; + } -.printable-tab { - -webkit-region-break-inside: avoid; - page-break-inside: avoid; -} -.printable-version legend { - padding-left: 8px; - background-image: none; -} + span.ui-layout-resizer { + display: none; + } -/** - * PRINT Stylesheet - * - * First 'neutralize' all the positioning/overflow CSS added by Layout - * Then change or add cosmetic styles (borders, padding) for printing - * - * MUST use "!important" for all size, position, margin & overflow rules, - * so these will 'override' styles applied to the elements by Layout - */ + #header-logo { + display: none; + } + #logo { + display: none; + } + + div.header-menu { + display: none; + } + + div.footer { + display: none; + } + + #top-bar { + display: none; + } + + #inner_menu { + display: none; + } + + div.actions_button { + display: none; + } + + div.itop_popup { + display: none; + } + + a.tab { + display: none; + } + + div.itop-tab { + border: #ccc 1px solid; + margin-top: 1em; + padding-bottom: 1em; + } + + #combodo_logo { + display: none; + } + + div.graph_config { + display: none; + } + + h2.printable-tab-title { + page-break-after: avoid; + } + + h1 { + page-break-after: avoid; + } + + div#tabbedContent_0 { + border: none; + } + + p a, .ui-widget-content td a, p a:hover, .ui-widget-content td a:hover, p a:visited, .ui-widget-content td a:visited, td a, td a:visited, td a:hover { + padding-left: 0; + background: transparent; + } + + body { + margin: 10px; + } + + @page { + margin: 1cm; + } + + .printable-tab { + -webkit-region-break-inside: avoid; + page-break-inside: avoid; + } + + .printable-version legend { + padding-left: 8px; + background-image: none; + } + + /** + * PRINT Stylesheet + * + * First 'neutralize' all the positioning/overflow CSS added by Layout + * Then change or add cosmetic styles (borders, padding) for printing + * + * MUST use "!important" for all size, position, margin & overflow rules, + * so these will 'override' styles applied to the elements by Layout + */ html, body { /* NEUTRALIZE 'layout container' styles */ - overflow: visible !important; - width: auto !important; - height: auto !important; - position: static !important; + overflow: visible !important; + width: auto !important; + height: auto !important; + position: static !important; } - .ui-layout-pane , - .ui-layout-resizer , + + .ui-layout-pane, + .ui-layout-resizer, .ui-layout-toggler { /* NEUTRALIZE 'layout element' styles */ - display: none !important; /* hide ALL by default */ - position: relative !important; - top: auto !important; - bottom: auto !important; - left: auto !important; - right: auto !important; - width: auto !important; - height: auto !important; - overflow: visible !important; + display: none !important; /* hide ALL by default */ + position: relative !important; + top: auto !important; + bottom: auto !important; + left: auto !important; + right: auto !important; + width: auto !important; + height: auto !important; + overflow: visible !important; } + /* SHOW ONLY the panes you want */ .ui-layout-pane-center { - display: block !important; + display: block !important; left: 0 !important; right: 0 !important; /* OPTIONAL: change cosmetic styles as desired @@ -81,4 +135,66 @@ body { padding: 0 !important; background: transparent !important; */ - } \ No newline at end of file + } +} + +div.explain-printable { + border: 5px solid #f8f9fa; + background: #ffffff; + color: #000000; + padding: 10px; + margin: 0; + font-size: 12px; +} + +.hideable-chapter { + cursor: pointer; +} +.ibo-block-print--tablist{ + background-color: #e1e7ec; + position: relative; + display: flex; + align-items: stretch; + height: 2em; +} +#hiddeable_chapters .ibo-block-print--tab span::before { + + padding-left: 10px; + padding-right: 5px; + font-family: "Font Awesome 5 Free"; + font-weight: 900; + content: "\f06e"; +} + +#hiddeable_chapters .ibo-block-print--tab.strikethrough span { + text-decoration: line-through; +} + +#hiddeable_chapters .ibo-block-print--tab.strikethrough span::before { + font-family: "Font Awesome 5 Free"; + font-weight: 900; + content: "\f070"; +} + +.no-print-preview { + display: none; +} + +.itop_popup{ + display: none; +} + +.printable-content legend::before { + padding-right: 10px; + font-family: "Font Awesome 5 Free"; + font-weight: 900; + content: "\f06e"; +} +.printable-content .strikethrough legend::before { + font-family: "Font Awesome 5 Free"; + font-weight: 900; + content: "\f070"; +} +.printable-content fieldset.strikethrough span { + display: none; +} diff --git a/datamodels/2.x/itop-structure/precompiled-themes/light-grey/main.css b/datamodels/2.x/itop-structure/precompiled-themes/light-grey/main.css index b3c5dc44a..4b834f7f8 100644 --- a/datamodels/2.x/itop-structure/precompiled-themes/light-grey/main.css +++ b/datamodels/2.x/itop-structure/precompiled-themes/light-grey/main.css @@ -1,6 +1,6 @@ /* === SIGNATURE BEGIN === -{"variables":"d751713988987e9331980363e24189ce","stylesheets":{"css-variables":"d9fb165d1a7f8d8fd918160c412fe9a0","jqueryui":"a887ad1c00f29132beba3bf729b981c7","main":"89c42c919bb81f77389d747752db35ba"},"imports":[],"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"}} +{"variables":"d751713988987e9331980363e24189ce","stylesheets":{"css-variables":"8f09e480732f79902e91eae584cc5faf","jqueryui":"eaa09c8a9cb976dc0545bfbc178c92a8","main":"4f5559204c5109eab9addfe2d942e6ea"},"imports":[],"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e"}} === SIGNATURE END === */ /*! @@ -99,7 +99,7 @@ background-repeat: no-repeat; width: 16px; height: 16px; - background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608286605"); filter: hue-rotate(0deg); } .ui-widget-icon-block { @@ -232,7 +232,7 @@ .ui-menu .ui-menu-item { margin: 0; cursor: pointer; - list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=1608028054"); + list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=1608286605"); } .ui-menu .ui-menu-item-wrapper { position: relative; @@ -298,7 +298,7 @@ color: #EA7D1E; } .ui-button:hover .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-button:active { text-decoration: none; @@ -306,20 +306,20 @@ color: #EA7D1E; } .ui-button:active .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-button:focus { font-weight: bold; color: #EA7D1E; } .ui-button:focus .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-button .ui-state-highlight.ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608286605"); } .ui-button .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608286605"); } .ui-button-icon-only { width: 2em; @@ -901,7 +901,7 @@ body .ui-tooltip { background-image: none; } .ui-widget-content .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608286605"); } .ui-widget-header .ui-priority-secondary { opacity: 0.7; @@ -913,7 +913,7 @@ body .ui-tooltip { background-image: none; } .ui-widget-header .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608286605"); } .ui-state-default a { text-decoration: none; @@ -925,7 +925,7 @@ body .ui-tooltip { text-decoration: none; } .ui-state-default .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608286605"); } a.ui-button { text-decoration: none; @@ -955,7 +955,7 @@ a:visited.ui-button { text-decoration: none; } .ui-state-hover .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-state-focus a { text-decoration: none; @@ -970,7 +970,7 @@ a:visited.ui-button { text-decoration: none; } .ui-state-focus .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-visual-focus { box-shadow: 0 0 3px 1px #5e9ed6; @@ -988,19 +988,19 @@ a:visited.ui-button { text-decoration: none; } .ui-state-active .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-icon-background { background-color: #EA7D1E; } .ui-state-highlight .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608286605"); } .ui-state-error .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608286605"); } .ui-state-error-text .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608286605"); } .ui-priority-primary { font-weight: bold; @@ -1655,7 +1655,7 @@ a:visited.ui-button { visibility: hidden; } #ibo-main-content .edit-image .view-image.dirty.compat, .ui-dialog .edit-image .view-image.dirty.compat { - background-image: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608286605"); } #ibo-main-content .edit-image .view-image.dirty.compat img, .ui-dialog .edit-image .view-image.dirty.compat img { opacity: 0.3; @@ -1678,7 +1678,7 @@ a:visited.ui-button { opacity: 0.3; } #ibo-main-content .edit-image .edit-buttons .button .ui-icon, .ui-dialog .edit-image .edit-buttons .button .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608286605"); } #ibo-main-content .edit-image .file-input, .ui-dialog .edit-image .file-input { display: block; @@ -1878,7 +1878,7 @@ a:visited.ui-button { background: #EA7D1E; } #ibo-main-content .actions_details span, .ui-dialog .actions_details span { - background: url("../../../../images/actions_right.png?v=1608028054") no-repeat right; + background: url("../../../../images/actions_right.png?v=1608286605") no-repeat right; color: #fff; font-weight: bold; padding-top: 2px; @@ -1901,7 +1901,7 @@ a:visited.ui-button { } #ibo-main-content .ac_input, .ui-dialog .ac_input { border: 1px solid #7f9db9; - background: #fff url("../../../../images/ac-background.gif?v=1608028054") no-repeat right; + background: #fff url("../../../../images/ac-background.gif?v=1608286605") no-repeat right; /* By Rom */ } #ibo-main-content .csvimport_createobj, .ui-dialog .csvimport_createobj { @@ -1956,7 +1956,7 @@ a:visited.ui-button { noborder-top: 1px solid #8b8b8b; padding: 4px 0px 0px 16px; font-size: 8pt; - background: url("../../../../images/green-square.gif?v=1608028054") no-repeat bottom left; + background: url("../../../../images/green-square.gif?v=1608286605") no-repeat bottom left; color: #83b217; font-weight: bold; text-decoration: none; @@ -2032,22 +2032,22 @@ a:visited.ui-button { margin-top: -8px; } #ibo-main-content .notreeview li, .ui-dialog .notreeview li { - background: url("../../../../images/tv-item.gif?v=1608028054") 0 0 no-repeat; + background: url("../../../../images/tv-item.gif?v=1608286605") 0 0 no-repeat; } #ibo-main-content .notreeview .collapsable, .ui-dialog .notreeview .collapsable { - background-image: url("../../../../images/tv-collapsable.gif?v=1608028054"); + background-image: url("../../../../images/tv-collapsable.gif?v=1608286605"); } #ibo-main-content .notreeview .expandable, .ui-dialog .notreeview .expandable { - background-image: url("../../../../images/tv-expandable.gif?v=1608028054"); + background-image: url("../../../../images/tv-expandable.gif?v=1608286605"); } #ibo-main-content .notreeview .last, .ui-dialog .notreeview .last { - background-image: url("../../../../images/tv-item-last.gif?v=1608028054"); + background-image: url("../../../../images/tv-item-last.gif?v=1608286605"); } #ibo-main-content .notreeview .lastCollapsable, .ui-dialog .notreeview .lastCollapsable { - background-image: url("../../../../images/tv-collapsable-last.gif?v=1608028054"); + background-image: url("../../../../images/tv-collapsable-last.gif?v=1608286605"); } #ibo-main-content .notreeview .lastExpandable, .ui-dialog .notreeview .lastExpandable { - background-image: url("../../../../images/tv-expandable-last.gif?v=1608028054"); + background-image: url("../../../../images/tv-expandable-last.gif?v=1608286605"); } #ibo-main-content #OrganizationSelection, .ui-dialog #OrganizationSelection { padding: 5px 0px 16px 20px; @@ -2223,7 +2223,7 @@ a:visited.ui-button { color: #000; } #ibo-main-content th.red, .ui-dialog th.red { - background: url("../../../../images/red-header.gif?v=1608028054") bottom left repeat-x; + background: url("../../../../images/red-header.gif?v=1608286605") bottom left repeat-x; color: #000; } #ibo-main-content .green, .ui-dialog .green { @@ -2231,7 +2231,7 @@ a:visited.ui-button { color: #000; } #ibo-main-content th.green, .ui-dialog th.green { - background: url("../../../../images/green-header.gif?v=1608028054") bottom left repeat-x; + background: url("../../../../images/green-header.gif?v=1608286605") bottom left repeat-x; color: #000; } #ibo-main-content .orange, .ui-dialog .orange { @@ -2239,7 +2239,7 @@ a:visited.ui-button { color: #000; } #ibo-main-content th.orange, .ui-dialog th.orange { - background: url("../../../../images/orange-header.gif?v=1608028054") bottom left repeat-x; + background: url("../../../../images/orange-header.gif?v=1608286605") bottom left repeat-x; color: #000; /* For Date Picker: Creates a little calendar icon * instead of a text link for "Choose date" @@ -2254,7 +2254,7 @@ a:visited.ui-button { display: block; text-indent: -2000px; overflow: hidden; - background: url("../../../../images/calendar.png?v=1608028054") no-repeat; + background: url("../../../../images/calendar.png?v=1608286605") no-repeat; } #ibo-main-content td a.dp-choose-date.dp-disabled, .ui-dialog td a.dp-choose-date.dp-disabled, #ibo-main-content a.dp-choose-date.dp-disabled, .ui-dialog a.dp-choose-date.dp-disabled { background-position: 0 -20px; @@ -2303,19 +2303,19 @@ a:visited.ui-button { /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.odd td.truncated, .ui-dialog table.listResults tr.odd td.truncated, #ibo-main-content table.listResults tr td.truncated, .ui-dialog table.listResults tr td.truncated, #ibo-main-content .wizContainer table.listResults tr.odd td.truncated, .ui-dialog .wizContainer table.listResults tr.odd td.truncated, #ibo-main-content .wizContainer table.listResults tr td.truncated, .ui-dialog .wizContainer table.listResults tr td.truncated { - background: url("../../../../images/truncated.png?v=1608028054") bottom repeat-x; + background: url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.even td.truncated, .ui-dialog table.listResults tr.even td.truncated, #ibo-main-content .wizContainer table.listResults tr.even td.truncated, .ui-dialog .wizContainer table.listResults tr.even td.truncated { - background: #f9f9f1 url("../../../../images/truncated.png?v=1608028054") bottom repeat-x; + background: #f9f9f1 url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.even td.hover.truncated, .ui-dialog table.listResults tr.even td.hover.truncated, #ibo-main-content .wizContainer table.listResults tr.even td.hover.truncated, .ui-dialog .wizContainer table.listResults tr.even td.hover.truncated { - background: #fdf5d0 url("../../../../images/truncated.png?v=1608028054") bottom repeat-x; + background: #fdf5d0 url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.odd td.hover.truncated, .ui-dialog table.listResults tr.odd td.hover.truncated, #ibo-main-content table.listResults tr td.hover.truncated, .ui-dialog table.listResults tr td.hover.truncated, #ibo-main-content .wizContainer table.listResults tr.odd td.hover.truncated, .ui-dialog .wizContainer table.listResults tr.odd td.hover.truncated, #ibo-main-content .wizContainer table.listResults tr td.hover.truncated, .ui-dialog .wizContainer table.listResults tr td.hover.truncated { - background: #fdf5d0 url("../../../../images/truncated.png?v=1608028054") bottom repeat-x; + background: #fdf5d0 url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; } #ibo-main-content table.listResults.truncated, .ui-dialog table.listResults.truncated { border-bottom: 0; @@ -2417,7 +2417,7 @@ a:visited.ui-button { #ibo-main-content div#logo div, .ui-dialog div#logo div { height: 88px; width: 244px; - background: url("../../../../images/itop-logo-2.png?v=1608028054") left no-repeat; + background: url("../../../../images/itop-logo-2.png?v=1608286605") left no-repeat; } #ibo-main-content #left-pane .ui-layout-north, .ui-dialog #left-pane .ui-layout-north { overflow: hidden; @@ -2566,7 +2566,7 @@ a:visited.ui-button { margin: 0 2px; } #ibo-main-content .ui-layout-button-pin-down, .ui-dialog .ui-layout-button-pin-down { - background: url("../../../../images/splitter-bkg.png?v=1608028054") transparent; + background: url("../../../../images/splitter-bkg.png?v=1608286605") transparent; width: 16px; background-position: -144px -144px; } @@ -2694,13 +2694,13 @@ a:visited.ui-button { #ibo-main-content .caselog_header, .ui-dialog .caselog_header { padding: 3px; border-top: 1px solid #fff; - background: #ddd url("../../../../images/plus.gif?v=1608028054") left no-repeat; + background: #ddd url("../../../../images/plus.gif?v=1608286605") left no-repeat; padding-left: 16px; cursor: pointer; width: 100%; } #ibo-main-content .caselog_header.open, .ui-dialog .caselog_header.open { - background: #ddd url("../../../../images/minus.gif?v=1608028054") left no-repeat; + background: #ddd url("../../../../images/minus.gif?v=1608286605") left no-repeat; } #ibo-main-content .caselog_entry, .ui-dialog .caselog_entry, #ibo-main-content .caselog_entry_html, .ui-dialog .caselog_entry_html { overflow-x: auto; @@ -2876,7 +2876,7 @@ a:visited.ui-button { height: 15px; border: 1px #A6A6A6 solid; cursor: pointer; - background-image: url("../../../../images/full-screen.png?v=1608028054"); + background-image: url("../../../../images/full-screen.png?v=1608286605"); background-repeat: no-repeat; background-position: center center; background-size: 98%; @@ -2923,7 +2923,7 @@ a:visited.ui-button { padding: 2px; } #ibo-main-content .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_document .button .ui-icon, .ui-dialog .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_document .button .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608286605"); background-color: #EA7D1E; } #ibo-main-content .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_image input, .ui-dialog .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_image input { @@ -2989,7 +2989,7 @@ a:visited.ui-button { height: 15px; border: 1px #A6A6A6 solid; cursor: pointer; - background-image: url("../../../../images/full-screen.png?v=1608028054"); + background-image: url("../../../../images/full-screen.png?v=1608286605"); background-repeat: no-repeat; background-position: center center; background-size: 98%; @@ -3054,7 +3054,7 @@ a:visited.ui-button { padding-left: 0.4em; } #ibo-main-content .ac_dlg_loading, .ui-dialog .ac_dlg_loading { - background: white url("../../../../images/indicator.gif?v=1608028054") right center no-repeat; + background: white url("../../../../images/indicator.gif?v=1608286605") right center no-repeat; } #ibo-main-content table.pagination, .ui-dialog table.pagination { display: inline-block; @@ -3121,10 +3121,10 @@ a:visited.ui-button { cursor: not-allowed; } #ibo-main-content .dragHover, .ui-dialog .dragHover { - background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608028054"); + background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608286605"); } #ibo-main-content .edit_mode .dashlet, .ui-dialog .edit_mode .dashlet { - background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608028054"); + background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608286605"); padding: 5px; margin: 0; position: relative; @@ -3169,7 +3169,7 @@ a:visited.ui-button { top: 0; right: 0; z-index: 10; - background: transparent url("../../../../images/delete.png?v=1608028054") no-repeat center; + background: transparent url("../../../../images/delete.png?v=1608286605") no-repeat center; } #ibo-main-content td.prop_value, .ui-dialog td.prop_value { text-align: left; @@ -3398,23 +3398,23 @@ a:visited.ui-button { } #ibo-main-content .message_info, .ui-dialog .message_info { border: 1px solid #993; - background: url("../../../../images/info-mini.png?v=1608028054") 1em 1em no-repeat #ffc; + background: url("../../../../images/info-mini.png?v=1608286605") 1em 1em no-repeat #ffc; padding-left: 3em; } #ibo-main-content .message_ok, .ui-dialog .message_ok { border: 1px solid #393; - background: url("../../../../images/ok.png?v=1608028054") 1em 1em no-repeat #cfc; + background: url("../../../../images/ok.png?v=1608286605") 1em 1em no-repeat #cfc; padding-left: 3em; } #ibo-main-content .message_warning, .ui-dialog .message_warning { border: 1px solid #ec9800; - background: url("../../../../images/error.png?v=1608028054") 1em 1em no-repeat #ffd78d; + background: url("../../../../images/error.png?v=1608286605") 1em 1em no-repeat #ffd78d; color: #000; padding-left: 3em; } #ibo-main-content .message_error, .ui-dialog .message_error { border: 1px solid #933; - background: url("../../../../images/error.png?v=1608028054") 1em 1em no-repeat #fcc; + background: url("../../../../images/error.png?v=1608286605") 1em 1em no-repeat #fcc; padding-left: 3em; } #ibo-main-content .fg-menu a img, .ui-dialog .fg-menu a img { @@ -3532,35 +3532,6 @@ a:visited.ui-button { margin-left: 1em; margin-right: 1em; } -#ibo-main-content div.explain-printable, .ui-dialog div.explain-printable { - border: 5px solid #1c94c4; - background: #d6e8ef; - color: #000; - padding: 10px; - margin: 0; - font-size: 12px; -} -#ibo-main-content .hideable-chapter, .ui-dialog .hideable-chapter { - cursor: pointer; -} -#ibo-main-content #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span, .ui-dialog #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span { - padding-left: 20px; - background: url("../../../../images/eye-open-555.png?v=1608028054") 2px center no-repeat; -} -#ibo-main-content #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span, .ui-dialog #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span { - text-decoration: line-through; - background: url("../../../../images/eye-closed-555.png?v=1608028054") 2px center no-repeat; -} -#ibo-main-content .printable-version legend, .ui-dialog .printable-version legend { - padding-left: 26px; - background: #1c94c4 url("../../../../images/eye-open-fff.png?v=1608028054") 8px center no-repeat; -} -#ibo-main-content .printable-version .strikethrough legend, .ui-dialog .printable-version .strikethrough legend { - background: #1c94c4 url("../../../../images/eye-closed-fff.png?v=1608028054") 8px center no-repeat; -} -#ibo-main-content .printable-version fieldset.strikethrough span, .ui-dialog .printable-version fieldset.strikethrough span { - display: none; -} #ibo-main-content h2.printable-tab-title, .ui-dialog h2.printable-tab-title { border-bottom: 2px solid; } @@ -3629,7 +3600,7 @@ a:visited.ui-button { cursor: pointer; width: 16px; height: 16px; - background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608028054"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608286605"); background-position: -16px -192px; } #ibo-main-content .history_entry_truncated .history_truncated_toggler, .ui-dialog .history_entry_truncated .history_truncated_toggler { @@ -3714,7 +3685,7 @@ a:visited.ui-button { #ibo-main-content #itop-breadcrumb .breadcrumb-item a::after, .ui-dialog #itop-breadcrumb .breadcrumb-item a::after { content: ''; position: absolute; - background-image: url("../../../../images/breadcrumb-separator.png?v=1608028054"); + background-image: url("../../../../images/breadcrumb-separator.png?v=1608286605"); background-repeat: no-repeat; width: 8px; height: 16px; diff --git a/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css b/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css index d74f274fb..eaa8d3b12 100644 --- a/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css +++ b/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css @@ -1,6 +1,6 @@ /* === SIGNATURE BEGIN === -{"variables":"8cfe86f2c55d8eff36d57eb4e83d89f1","stylesheets":{"css-variables":"d9fb165d1a7f8d8fd918160c412fe9a0","jqueryui":"a887ad1c00f29132beba3bf729b981c7","main":"89c42c919bb81f77389d747752db35ba","environment-banner":"3de3ffb8232b9a649e912b570a64bf5d"},"imports":[],"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5"}} +{"variables":"8cfe86f2c55d8eff36d57eb4e83d89f1","stylesheets":{"css-variables":"8f09e480732f79902e91eae584cc5faf","jqueryui":"eaa09c8a9cb976dc0545bfbc178c92a8","main":"4f5559204c5109eab9addfe2d942e6ea","environment-banner":"30ec7c32b11db1f92411a93d7d59ecf8"},"imports":[],"images":{"css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","images\/calendar.png":"ab56e59af3c96ca661821257d376465e","images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","images\/delete.png":"93c047549c31a270a037840277cf59d3","images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","images\/error.png":"1af8a1041016f67669c5fd22dc88c82e"}} === SIGNATURE END === */ /*! @@ -99,7 +99,7 @@ background-repeat: no-repeat; width: 16px; height: 16px; - background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608286605"); filter: hue-rotate(0deg); } .ui-widget-icon-block { @@ -232,7 +232,7 @@ .ui-menu .ui-menu-item { margin: 0; cursor: pointer; - list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=1608028358"); + list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=1608286605"); } .ui-menu .ui-menu-item-wrapper { position: relative; @@ -298,7 +298,7 @@ color: #EA7D1E; } .ui-button:hover .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-button:active { text-decoration: none; @@ -306,20 +306,20 @@ color: #EA7D1E; } .ui-button:active .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-button:focus { font-weight: bold; color: #EA7D1E; } .ui-button:focus .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-button .ui-state-highlight.ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608286605"); } .ui-button .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608286605"); } .ui-button-icon-only { width: 2em; @@ -901,7 +901,7 @@ body .ui-tooltip { background-image: none; } .ui-widget-content .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608286605"); } .ui-widget-header .ui-priority-secondary { opacity: 0.7; @@ -913,7 +913,7 @@ body .ui-tooltip { background-image: none; } .ui-widget-header .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608286605"); } .ui-state-default a { text-decoration: none; @@ -925,7 +925,7 @@ body .ui-tooltip { text-decoration: none; } .ui-state-default .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_F26522_256x240.png?v=1608286605"); } a.ui-button { text-decoration: none; @@ -955,7 +955,7 @@ a:visited.ui-button { text-decoration: none; } .ui-state-hover .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-state-focus a { text-decoration: none; @@ -970,7 +970,7 @@ a:visited.ui-button { text-decoration: none; } .ui-state-focus .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-visual-focus { box-shadow: 0 0 3px 1px #5e9ed6; @@ -988,19 +988,19 @@ a:visited.ui-button { text-decoration: none; } .ui-state-active .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_E87C1E_256x240.png?v=1608286605"); } .ui-icon-background { background-color: #EA7D1E; } .ui-state-highlight .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_1c94c4_256x240.png?v=1608286605"); } .ui-state-error .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608286605"); } .ui-state-error-text .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffd27a_256x240.png?v=1608286605"); } .ui-priority-primary { font-weight: bold; @@ -1655,7 +1655,7 @@ a:visited.ui-button { visibility: hidden; } #ibo-main-content .edit-image .view-image.dirty.compat, .ui-dialog .edit-image .view-image.dirty.compat { - background-image: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608286605"); } #ibo-main-content .edit-image .view-image.dirty.compat img, .ui-dialog .edit-image .view-image.dirty.compat img { opacity: 0.3; @@ -1678,7 +1678,7 @@ a:visited.ui-button { opacity: 0.3; } #ibo-main-content .edit-image .edit-buttons .button .ui-icon, .ui-dialog .edit-image .edit-buttons .button .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608286605"); } #ibo-main-content .edit-image .file-input, .ui-dialog .edit-image .file-input { display: block; @@ -1878,7 +1878,7 @@ a:visited.ui-button { background: #EA7D1E; } #ibo-main-content .actions_details span, .ui-dialog .actions_details span { - background: url("../../../../images/actions_right.png?v=1608028358") no-repeat right; + background: url("../../../../images/actions_right.png?v=1608286605") no-repeat right; color: #fff; font-weight: bold; padding-top: 2px; @@ -1901,7 +1901,7 @@ a:visited.ui-button { } #ibo-main-content .ac_input, .ui-dialog .ac_input { border: 1px solid #7f9db9; - background: #fff url("../../../../images/ac-background.gif?v=1608028358") no-repeat right; + background: #fff url("../../../../images/ac-background.gif?v=1608286605") no-repeat right; /* By Rom */ } #ibo-main-content .csvimport_createobj, .ui-dialog .csvimport_createobj { @@ -1956,7 +1956,7 @@ a:visited.ui-button { noborder-top: 1px solid #8b8b8b; padding: 4px 0px 0px 16px; font-size: 8pt; - background: url("../../../../images/green-square.gif?v=1608028358") no-repeat bottom left; + background: url("../../../../images/green-square.gif?v=1608286605") no-repeat bottom left; color: #83b217; font-weight: bold; text-decoration: none; @@ -2032,22 +2032,22 @@ a:visited.ui-button { margin-top: -8px; } #ibo-main-content .notreeview li, .ui-dialog .notreeview li { - background: url("../../../../images/tv-item.gif?v=1608028358") 0 0 no-repeat; + background: url("../../../../images/tv-item.gif?v=1608286605") 0 0 no-repeat; } #ibo-main-content .notreeview .collapsable, .ui-dialog .notreeview .collapsable { - background-image: url("../../../../images/tv-collapsable.gif?v=1608028358"); + background-image: url("../../../../images/tv-collapsable.gif?v=1608286605"); } #ibo-main-content .notreeview .expandable, .ui-dialog .notreeview .expandable { - background-image: url("../../../../images/tv-expandable.gif?v=1608028358"); + background-image: url("../../../../images/tv-expandable.gif?v=1608286605"); } #ibo-main-content .notreeview .last, .ui-dialog .notreeview .last { - background-image: url("../../../../images/tv-item-last.gif?v=1608028358"); + background-image: url("../../../../images/tv-item-last.gif?v=1608286605"); } #ibo-main-content .notreeview .lastCollapsable, .ui-dialog .notreeview .lastCollapsable { - background-image: url("../../../../images/tv-collapsable-last.gif?v=1608028358"); + background-image: url("../../../../images/tv-collapsable-last.gif?v=1608286605"); } #ibo-main-content .notreeview .lastExpandable, .ui-dialog .notreeview .lastExpandable { - background-image: url("../../../../images/tv-expandable-last.gif?v=1608028358"); + background-image: url("../../../../images/tv-expandable-last.gif?v=1608286605"); } #ibo-main-content #OrganizationSelection, .ui-dialog #OrganizationSelection { padding: 5px 0px 16px 20px; @@ -2223,7 +2223,7 @@ a:visited.ui-button { color: #000; } #ibo-main-content th.red, .ui-dialog th.red { - background: url("../../../../images/red-header.gif?v=1608028358") bottom left repeat-x; + background: url("../../../../images/red-header.gif?v=1608286605") bottom left repeat-x; color: #000; } #ibo-main-content .green, .ui-dialog .green { @@ -2231,7 +2231,7 @@ a:visited.ui-button { color: #000; } #ibo-main-content th.green, .ui-dialog th.green { - background: url("../../../../images/green-header.gif?v=1608028358") bottom left repeat-x; + background: url("../../../../images/green-header.gif?v=1608286605") bottom left repeat-x; color: #000; } #ibo-main-content .orange, .ui-dialog .orange { @@ -2239,7 +2239,7 @@ a:visited.ui-button { color: #000; } #ibo-main-content th.orange, .ui-dialog th.orange { - background: url("../../../../images/orange-header.gif?v=1608028358") bottom left repeat-x; + background: url("../../../../images/orange-header.gif?v=1608286605") bottom left repeat-x; color: #000; /* For Date Picker: Creates a little calendar icon * instead of a text link for "Choose date" @@ -2254,7 +2254,7 @@ a:visited.ui-button { display: block; text-indent: -2000px; overflow: hidden; - background: url("../../../../images/calendar.png?v=1608028358") no-repeat; + background: url("../../../../images/calendar.png?v=1608286605") no-repeat; } #ibo-main-content td a.dp-choose-date.dp-disabled, .ui-dialog td a.dp-choose-date.dp-disabled, #ibo-main-content a.dp-choose-date.dp-disabled, .ui-dialog a.dp-choose-date.dp-disabled { background-position: 0 -20px; @@ -2303,19 +2303,19 @@ a:visited.ui-button { /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.odd td.truncated, .ui-dialog table.listResults tr.odd td.truncated, #ibo-main-content table.listResults tr td.truncated, .ui-dialog table.listResults tr td.truncated, #ibo-main-content .wizContainer table.listResults tr.odd td.truncated, .ui-dialog .wizContainer table.listResults tr.odd td.truncated, #ibo-main-content .wizContainer table.listResults tr td.truncated, .ui-dialog .wizContainer table.listResults tr td.truncated { - background: url("../../../../images/truncated.png?v=1608028358") bottom repeat-x; + background: url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.even td.truncated, .ui-dialog table.listResults tr.even td.truncated, #ibo-main-content .wizContainer table.listResults tr.even td.truncated, .ui-dialog .wizContainer table.listResults tr.even td.truncated { - background: #f9f9f1 url("../../../../images/truncated.png?v=1608028358") bottom repeat-x; + background: #f9f9f1 url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.even td.hover.truncated, .ui-dialog table.listResults tr.even td.hover.truncated, #ibo-main-content .wizContainer table.listResults tr.even td.hover.truncated, .ui-dialog .wizContainer table.listResults tr.even td.hover.truncated { - background: #fdf5d0 url("../../../../images/truncated.png?v=1608028358") bottom repeat-x; + background: #fdf5d0 url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */ } #ibo-main-content table.listResults tr.odd td.hover.truncated, .ui-dialog table.listResults tr.odd td.hover.truncated, #ibo-main-content table.listResults tr td.hover.truncated, .ui-dialog table.listResults tr td.hover.truncated, #ibo-main-content .wizContainer table.listResults tr.odd td.hover.truncated, .ui-dialog .wizContainer table.listResults tr.odd td.hover.truncated, #ibo-main-content .wizContainer table.listResults tr td.hover.truncated, .ui-dialog .wizContainer table.listResults tr td.hover.truncated { - background: #fdf5d0 url("../../../../images/truncated.png?v=1608028358") bottom repeat-x; + background: #fdf5d0 url("../../../../images/truncated.png?v=1608286605") bottom repeat-x; } #ibo-main-content table.listResults.truncated, .ui-dialog table.listResults.truncated { border-bottom: 0; @@ -2417,7 +2417,7 @@ a:visited.ui-button { #ibo-main-content div#logo div, .ui-dialog div#logo div { height: 88px; width: 244px; - background: url("../../../../images/itop-logo-2.png?v=1608028358") left no-repeat; + background: url("../../../../images/itop-logo-2.png?v=1608286605") left no-repeat; } #ibo-main-content #left-pane .ui-layout-north, .ui-dialog #left-pane .ui-layout-north { overflow: hidden; @@ -2566,7 +2566,7 @@ a:visited.ui-button { margin: 0 2px; } #ibo-main-content .ui-layout-button-pin-down, .ui-dialog .ui-layout-button-pin-down { - background: url("../../../../images/splitter-bkg.png?v=1608028358") transparent; + background: url("../../../../images/splitter-bkg.png?v=1608286605") transparent; width: 16px; background-position: -144px -144px; } @@ -2694,13 +2694,13 @@ a:visited.ui-button { #ibo-main-content .caselog_header, .ui-dialog .caselog_header { padding: 3px; border-top: 1px solid #fff; - background: #ddd url("../../../../images/plus.gif?v=1608028358") left no-repeat; + background: #ddd url("../../../../images/plus.gif?v=1608286605") left no-repeat; padding-left: 16px; cursor: pointer; width: 100%; } #ibo-main-content .caselog_header.open, .ui-dialog .caselog_header.open { - background: #ddd url("../../../../images/minus.gif?v=1608028358") left no-repeat; + background: #ddd url("../../../../images/minus.gif?v=1608286605") left no-repeat; } #ibo-main-content .caselog_entry, .ui-dialog .caselog_entry, #ibo-main-content .caselog_entry_html, .ui-dialog .caselog_entry_html { overflow-x: auto; @@ -2876,7 +2876,7 @@ a:visited.ui-button { height: 15px; border: 1px #A6A6A6 solid; cursor: pointer; - background-image: url("../../../../images/full-screen.png?v=1608028358"); + background-image: url("../../../../images/full-screen.png?v=1608286605"); background-repeat: no-repeat; background-position: center center; background-size: 98%; @@ -2923,7 +2923,7 @@ a:visited.ui-button { padding: 2px; } #ibo-main-content .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_document .button .ui-icon, .ui-dialog .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_document .button .ui-icon { - background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=1608286605"); background-color: #EA7D1E; } #ibo-main-content .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_image input, .ui-dialog .field_container > div > div.field_value .attribute-edit .field_input_zone.field_input_image input { @@ -2989,7 +2989,7 @@ a:visited.ui-button { height: 15px; border: 1px #A6A6A6 solid; cursor: pointer; - background-image: url("../../../../images/full-screen.png?v=1608028358"); + background-image: url("../../../../images/full-screen.png?v=1608286605"); background-repeat: no-repeat; background-position: center center; background-size: 98%; @@ -3054,7 +3054,7 @@ a:visited.ui-button { padding-left: 0.4em; } #ibo-main-content .ac_dlg_loading, .ui-dialog .ac_dlg_loading { - background: white url("../../../../images/indicator.gif?v=1608028358") right center no-repeat; + background: white url("../../../../images/indicator.gif?v=1608286605") right center no-repeat; } #ibo-main-content table.pagination, .ui-dialog table.pagination { display: inline-block; @@ -3121,10 +3121,10 @@ a:visited.ui-button { cursor: not-allowed; } #ibo-main-content .dragHover, .ui-dialog .dragHover { - background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608028358"); + background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608286605"); } #ibo-main-content .edit_mode .dashlet, .ui-dialog .edit_mode .dashlet { - background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608028358"); + background: url("../../../../css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=1608286605"); padding: 5px; margin: 0; position: relative; @@ -3169,7 +3169,7 @@ a:visited.ui-button { top: 0; right: 0; z-index: 10; - background: transparent url("../../../../images/delete.png?v=1608028358") no-repeat center; + background: transparent url("../../../../images/delete.png?v=1608286605") no-repeat center; } #ibo-main-content td.prop_value, .ui-dialog td.prop_value { text-align: left; @@ -3398,23 +3398,23 @@ a:visited.ui-button { } #ibo-main-content .message_info, .ui-dialog .message_info { border: 1px solid #993; - background: url("../../../../images/info-mini.png?v=1608028358") 1em 1em no-repeat #ffc; + background: url("../../../../images/info-mini.png?v=1608286605") 1em 1em no-repeat #ffc; padding-left: 3em; } #ibo-main-content .message_ok, .ui-dialog .message_ok { border: 1px solid #393; - background: url("../../../../images/ok.png?v=1608028358") 1em 1em no-repeat #cfc; + background: url("../../../../images/ok.png?v=1608286605") 1em 1em no-repeat #cfc; padding-left: 3em; } #ibo-main-content .message_warning, .ui-dialog .message_warning { border: 1px solid #ec9800; - background: url("../../../../images/error.png?v=1608028358") 1em 1em no-repeat #ffd78d; + background: url("../../../../images/error.png?v=1608286605") 1em 1em no-repeat #ffd78d; color: #000; padding-left: 3em; } #ibo-main-content .message_error, .ui-dialog .message_error { border: 1px solid #933; - background: url("../../../../images/error.png?v=1608028358") 1em 1em no-repeat #fcc; + background: url("../../../../images/error.png?v=1608286605") 1em 1em no-repeat #fcc; padding-left: 3em; } #ibo-main-content .fg-menu a img, .ui-dialog .fg-menu a img { @@ -3532,35 +3532,6 @@ a:visited.ui-button { margin-left: 1em; margin-right: 1em; } -#ibo-main-content div.explain-printable, .ui-dialog div.explain-printable { - border: 5px solid #1c94c4; - background: #d6e8ef; - color: #000; - padding: 10px; - margin: 0; - font-size: 12px; -} -#ibo-main-content .hideable-chapter, .ui-dialog .hideable-chapter { - cursor: pointer; -} -#ibo-main-content #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span, .ui-dialog #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span { - padding-left: 20px; - background: url("../../../../images/eye-open-555.png?v=1608028358") 2px center no-repeat; -} -#ibo-main-content #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span, .ui-dialog #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span { - text-decoration: line-through; - background: url("../../../../images/eye-closed-555.png?v=1608028358") 2px center no-repeat; -} -#ibo-main-content .printable-version legend, .ui-dialog .printable-version legend { - padding-left: 26px; - background: #1c94c4 url("../../../../images/eye-open-fff.png?v=1608028358") 8px center no-repeat; -} -#ibo-main-content .printable-version .strikethrough legend, .ui-dialog .printable-version .strikethrough legend { - background: #1c94c4 url("../../../../images/eye-closed-fff.png?v=1608028358") 8px center no-repeat; -} -#ibo-main-content .printable-version fieldset.strikethrough span, .ui-dialog .printable-version fieldset.strikethrough span { - display: none; -} #ibo-main-content h2.printable-tab-title, .ui-dialog h2.printable-tab-title { border-bottom: 2px solid; } @@ -3629,7 +3600,7 @@ a:visited.ui-button { cursor: pointer; width: 16px; height: 16px; - background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608028358"); + background-image: url("../../../../css/ui-lightness/images/ui-icons_222222_256x240.png?v=1608286605"); background-position: -16px -192px; } #ibo-main-content .history_entry_truncated .history_truncated_toggler, .ui-dialog .history_entry_truncated .history_truncated_toggler { @@ -3714,7 +3685,7 @@ a:visited.ui-button { #ibo-main-content #itop-breadcrumb .breadcrumb-item a::after, .ui-dialog #itop-breadcrumb .breadcrumb-item a::after { content: ''; position: absolute; - background-image: url("../../../../images/breadcrumb-separator.png?v=1608028358"); + background-image: url("../../../../images/breadcrumb-separator.png?v=1608286605"); background-repeat: no-repeat; width: 8px; height: 16px; diff --git a/dictionaries/ui/components/en.dictionary.itop.datatable.php b/dictionaries/ui/components/en.dictionary.itop.datatable.php index 281bed56f..be865910b 100644 --- a/dictionaries/ui/components/en.dictionary.itop.datatable.php +++ b/dictionaries/ui/components/en.dictionary.itop.datatable.php @@ -17,15 +17,13 @@ * You should have received a copy of the GNU Affero General Public License */ -// Global search +// Display DataTable Dict::Add('EN US', 'English', 'English', array( 'UI:Datatables:Language:Processing' => 'Please wait...', - 'UI:Datatables:Language:Search' => 'Filter:', 'UI:Datatables:Language:LengthMenu' => 'Showing _MENU_ out of', 'UI:Datatables:Language:ZeroRecords' => 'No result', 'UI:Datatables:Language:Info' => '_TOTAL_ items', 'UI:Datatables:Language:InfoEmpty' => 'No information', - 'UI:Datatables:Language:InfoFiltered' => 'filtered out of _MAX_ items', 'UI:Datatables:Language:EmptyTable' => 'No data available in this table', 'UI:Datatables:Language:DisplayLength:All' => 'All', 'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort', diff --git a/dictionaries/ui/components/fr.dictionary.itop.datatable.php b/dictionaries/ui/components/fr.dictionary.itop.datatable.php new file mode 100644 index 000000000..1491d3699 --- /dev/null +++ b/dictionaries/ui/components/fr.dictionary.itop.datatable.php @@ -0,0 +1,31 @@ + 'Patientez ...', + 'UI:Datatables:Language:LengthMenu' => '_MENU_ parmi ', + 'UI:Datatables:Language:ZeroRecords' => 'Pas de résultat', + 'UI:Datatables:Language:Info' => '_TOTAL_ résultat(s)', + 'UI:Datatables:Language:InfoEmpty' => 'Pas d\'information', + 'UI:Datatables:Language:EmptyTable' => 'Pas de résultat', + 'UI:Datatables:Language:DisplayLength:All' => 'Tous', + 'UI:Datatables:Language:Sort:Ascending' => 'tri croissant', + 'UI:Datatables:Language:Sort:Descending' => 'tri décroissant', +)); \ No newline at end of file diff --git a/js/pages/backoffice/toolbox.js b/js/pages/backoffice/toolbox.js index 1d98219e3..cc32ee638 100644 --- a/js/pages/backoffice/toolbox.js +++ b/js/pages/backoffice/toolbox.js @@ -108,6 +108,20 @@ const CombodoBackofficeToolbox = { } }; +// For disabling the CKEditor at init time when the corresponding textarea is disabled ! +CKEDITOR.plugins.add( 'disabler', + { + init : function( editor ) + { + editor.on( 'instanceReady', function(e) + { + e.removeListener(); + $('#'+ editor.name).trigger('update'); + }); + } + + }); + // Processing $(document).ready(function(){ // Enable tooltips based on existing HTML markup, won't work on markup added dynamically after DOM ready (AJAX, ...) diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index b162098ac..ee3f33757 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -199,6 +199,7 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreate' => $baseDir . '/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateFactory' => $baseDir . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateHelper' => $baseDir . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\SearchBlock\\SearchBlock' => $baseDir . '/sources/application/UI/Base/Component/SearchBlock/SearchBlock.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\Title' => $baseDir . '/sources/application/UI/Base/Component/Title/Title.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleFactory' => $baseDir . '/sources/application/UI/Base/Component/Title/TitleFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleForObjectDetails' => $baseDir . '/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php', @@ -251,6 +252,7 @@ return array( 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinksEdit\\BlockIndirectLinksEdit' => $baseDir . '/sources/application/UI/Links/Indirect/BlockIndirectLinksEdit/BlockIndirectLinksEdit.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog\\BlockObjectPickerDialog' => $baseDir . '/sources/application/UI/Links/Indirect/BlockObjectPickerDialog/BlockObjectPickerDialog.php', 'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => $baseDir . '/sources/application/UI/Preferences/BlockShortcuts/BlockShortcuts.php', + 'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => $baseDir . '/sources/application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php', 'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php', 'Combodo\\iTop\\Controller\\AjaxRenderController' => $baseDir . '/sources/Controller/AjaxRenderController.php', 'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 18e6242b6..aa91c9241 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -429,6 +429,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreate' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateHelper' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\SearchBlock\\SearchBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/SearchBlock/SearchBlock.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\Title' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Title/Title.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Title/TitleFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleForObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php', @@ -481,6 +482,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinksEdit\\BlockIndirectLinksEdit' => __DIR__ . '/../..' . '/sources/application/UI/Links/Indirect/BlockIndirectLinksEdit/BlockIndirectLinksEdit.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog\\BlockObjectPickerDialog' => __DIR__ . '/../..' . '/sources/application/UI/Links/Indirect/BlockObjectPickerDialog/BlockObjectPickerDialog.php', 'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => __DIR__ . '/../..' . '/sources/application/UI/Preferences/BlockShortcuts/BlockShortcuts.php', + 'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => __DIR__ . '/../..' . '/sources/application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php', 'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php', 'Combodo\\iTop\\Controller\\AjaxRenderController' => __DIR__ . '/../..' . '/sources/Controller/AjaxRenderController.php', 'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php', diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php index 9c6419b08..a5cfdfea7 100644 --- a/sources/Controller/AjaxRenderController.php +++ b/sources/Controller/AjaxRenderController.php @@ -137,12 +137,12 @@ class AjaxRenderController } /** - * @param $sFilter + * @param string $sFilter * * @return array * @throws \Exception */ - public static function SearchAndRefresh($sFilter): array + public static function SearchAndRefresh(string $sFilter): array { $extraParams = utils::ReadParam('extra_params', '', false, 'raw_data'); $aExtraParams = array(); @@ -167,10 +167,10 @@ class AjaxRenderController } /** - * @param $sEncoding - * @param $sFilter + * @param string $sEncoding + * @param string $sFilter * - * @return mixed + * @return array * @throws \ArchivedObjectException * @throws \CoreException * @throws \CoreUnexpectedValue @@ -180,7 +180,7 @@ class AjaxRenderController * @throws \MySQLHasGoneAwayException * @throws \OQLException */ - public static function Search($sEncoding, $sFilter) + public static function Search(string $sEncoding, string $sFilter):array { $extraParams = utils::ReadParam('extra_params', '', false, 'raw_data'); $aExtraParams = array(); diff --git a/sources/Renderer/Console/ConsoleBlockRenderer.php b/sources/Renderer/Console/ConsoleBlockRenderer.php index 55b3efd59..526586329 100644 --- a/sources/Renderer/Console/ConsoleBlockRenderer.php +++ b/sources/Renderer/Console/ConsoleBlockRenderer.php @@ -71,9 +71,9 @@ class ConsoleBlockRenderer extends BlockRenderer protected static function AddCssJsTemplatesToPageRecursively(WebPage $oPage, iUIBlock $oBlock, array $aContextParams = []): void { $oBlockRenderer = new static($oBlock, $aContextParams); - $oPage->add_init_script($oBlockRenderer->RenderJsInline(iUIBlock::JS_TYPE_ON_INIT)); - $oPage->add_script($oBlockRenderer->RenderJsInline(iUIBlock::JS_TYPE_LIVE)); - $oPage->add_ready_script($oBlockRenderer->RenderJsInline(iUIBlock::JS_TYPE_ON_READY)); + $oPage->add_init_script($oBlockRenderer->RenderJsInline(iUIBlock::ENUM_JS_TYPE_ON_INIT)); + $oPage->add_script($oBlockRenderer->RenderJsInline(iUIBlock::ENUM_JS_TYPE_LIVE)); + $oPage->add_ready_script($oBlockRenderer->RenderJsInline(iUIBlock::ENUM_JS_TYPE_ON_READY)); $oPage->add_style($oBlockRenderer->RenderCssInline()); foreach ($oBlock->GetSubBlocks() as $oSubBlock) { diff --git a/sources/application/UI/Base/Component/DataTable/DataTableFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableFactory.php index 54e1e113f..043a15599 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableFactory.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableFactory.php @@ -33,6 +33,7 @@ use WebPage; */ class DataTableFactory { + /** * @param \WebPage $oPage * @param string $sListId @@ -758,7 +759,8 @@ class DataTableFactory public Static function MakeForForm(string $sRef, array $aColumns): FormTable { - $oTable = new FormTable($sRef); + $oTable = new FormTable("datatable_".$sRef); + $oTable->SetRef($sRef); $oTable->SetColumns($aColumns); return $oTable; diff --git a/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php b/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php index c9f02d790..ebb8ec694 100644 --- a/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php +++ b/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php @@ -31,7 +31,7 @@ class FormTable extends StaticTable public function __construct(string $sRef, string $sContainerCSSClass = '') { - parent::__construct("dt_{$sRef}", $sContainerCSSClass); + parent::__construct($sRef, $sContainerCSSClass); $this->SetRef($sRef); $this->aRows = []; } diff --git a/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php b/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php index b4015f34e..779083d0c 100644 --- a/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php +++ b/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php @@ -34,6 +34,7 @@ class PageContentWithSideContent extends PageContent { // Overloaded constants public const BLOCK_CODE = 'ibo-page-content-with-side-content'; public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/page-content/with-side-content'; + public const DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH = 'base/layouts/page-content/with-side-content'; // Specific constants public const ENUM_CONTENT_AREA_SIDE = 'side'; diff --git a/sources/application/UI/Base/UIBlock.php b/sources/application/UI/Base/UIBlock.php index 641f67198..e0a83b4ef 100644 --- a/sources/application/UI/Base/UIBlock.php +++ b/sources/application/UI/Base/UIBlock.php @@ -94,9 +94,9 @@ abstract class UIBlock implements iUIBlock $this->aJsFilesRelPath = static::DEFAULT_JS_FILES_REL_PATH; $this->aCssFilesRelPath = static::DEFAULT_CSS_FILES_REL_PATH; $this->sHtmlTemplateRelPath = static::DEFAULT_HTML_TEMPLATE_REL_PATH; - $this->aJsTemplateRelPath[self::JS_TYPE_LIVE] = static::DEFAULT_JS_LIVE_TEMPLATE_REL_PATH; - $this->aJsTemplateRelPath[self::JS_TYPE_ON_INIT] = static::DEFAULT_JS_TEMPLATE_REL_PATH; - $this->aJsTemplateRelPath[self::JS_TYPE_ON_READY] = static::DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH; + $this->aJsTemplateRelPath[self::ENUM_JS_TYPE_LIVE] = static::DEFAULT_JS_LIVE_TEMPLATE_REL_PATH; + $this->aJsTemplateRelPath[self::ENUM_JS_TYPE_ON_INIT] = static::DEFAULT_JS_TEMPLATE_REL_PATH; + $this->aJsTemplateRelPath[self::ENUM_JS_TYPE_ON_READY] = static::DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH; $this->sCssTemplateRelPath = static::DEFAULT_CSS_TEMPLATE_REL_PATH; $this->sGlobalTemplateRelPath = static::DEFAULT_GLOBAL_TEMPLATE_REL_PATH; $this->aDataAttributes = []; @@ -121,7 +121,7 @@ abstract class UIBlock implements iUIBlock * @inheritDoc */ public function GetJsTemplateRelPath(string $sType) { - if ($sType != self::JS_TYPE_LIVE && $sType != self::JS_TYPE_ON_INIT && $sType != self::JS_TYPE_ON_READY){ + if (!in_array($sType, [self::ENUM_JS_TYPE_LIVE, self::ENUM_JS_TYPE_ON_INIT, self::ENUM_JS_TYPE_ON_READY])) { throw new UIException($this, "Type of javascript $sType not supported"); } return $this->aJsTemplateRelPath[$sType]; diff --git a/sources/application/UI/Base/iUIBlock.php b/sources/application/UI/Base/iUIBlock.php index 2ae3494f1..cba1098f6 100644 --- a/sources/application/UI/Base/iUIBlock.php +++ b/sources/application/UI/Base/iUIBlock.php @@ -30,9 +30,9 @@ use Combodo\iTop\Application\UI\Base\UIException; * @since 3.0.0 */ interface iUIBlock { - public const JS_TYPE_ON_INIT = "js"; - public const JS_TYPE_LIVE = "live.js"; - public const JS_TYPE_ON_READY = "ready.js"; + public const ENUM_JS_TYPE_ON_INIT = "js"; + public const ENUM_JS_TYPE_LIVE = "live.js"; + public const ENUM_JS_TYPE_ON_READY = "ready.js"; /** * Return the relative path (from /templates/) of the global template (HTML, JS, CSS) to use or null if it's not provided. Should not be used to often as JS/CSS files would be duplicated making the browser parsing time way longer. * @@ -50,7 +50,7 @@ interface iUIBlock { /** * Return the relative path (from /templates/) of the JS template to use or null if there is no inline JS to render * - * @param string $sType javascript type only JS_TYPE_ON_INIT / JS_TYPE_ON_READY / JS_TYPE_LIVE + * @param string $sType javascript type only ENUM_JS_TYPE_ON_INIT / ENUM_JS_TYPE_ON_READY / ENUM_JS_TYPE_LIVE * * @return string|null */ diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php index 0d4f9d1ec..70b732220 100644 --- a/sources/application/WebPage/iTopWebPage.php +++ b/sources/application/WebPage/iTopWebPage.php @@ -30,6 +30,7 @@ use Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBar; use Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarFactory; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Combodo\iTop\Application\UI\Base\UIBlock; +use Combodo\iTop\Application\UI\Printable\BlockPrintHeader\BlockPrintHeader; use Combodo\iTop\Renderer\BlockRenderer; use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer; @@ -155,6 +156,9 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage if (!$this->IsPrintableVersion()) { $this->PrepareLayout(); + } else{ + $oPrintHeader = $this->OutputPrintable(); + $this->AddUiBlock($oPrintHeader); } } @@ -490,21 +494,11 @@ JS var oUserPreferences = $sUserPrefs; - // For disabling the CKEditor at init time when the corresponding textarea is disabled ! - CKEDITOR.plugins.add( 'disabler', - { - init : function( editor ) - { - editor.on( 'instanceReady', function(e) - { - e.removeListener(); - $('#'+ editor.name).trigger('update'); - }); - } - - }); + JS ); + + } @@ -578,8 +572,11 @@ JS */ public function SetContentLayout(PageContent $oLayout) { + $oPrevContentLayout=$this->oContentLayout; $this->oContentLayout = $oLayout; - + foreach ($oPrevContentLayout->GetSubBlocks() as $oBlock){ + $this->AddUiBlock($oBlock); + } return $this; } @@ -834,6 +831,7 @@ EOF; $sAbsoluteUrlAppRoot = addslashes($this->m_sRootUrl); $sFaviconUrl = $this->GetFaviconAbsoluteUrl(); $sMetadataLanguage = $this->GetLanguageForMetadata(); + $oPrintHeader = null; // Prepare internal parts (js files, css files, js snippets, css snippets, ...) // - Generate necessary dict. files @@ -853,6 +851,8 @@ EOF; 'sCharset' => static::PAGES_CHARSET, 'sLang' => $sMetadataLanguage, ], + 'oPrintHeader' => $oPrintHeader, + 'isPrintable' => $this->IsPrintableVersion(), ]; // Base tag @@ -876,13 +876,13 @@ EOF; ]; // - Prepare navigation menu $aData['aLayouts']['oNavigationMenu'] = $this->GetNavigationMenuLayout(); + $aData['aDeferredBlocks']['oNavigationMenu'] = $this->GetDeferredBlocks($this->GetNavigationMenuLayout()); // - Prepare top bar $aData['aLayouts']['oTopBar'] = $this->GetTopBarLayout(); + $aData['aDeferredBlocks']['oTopBar'] = $this->GetDeferredBlocks($this->GetTopBarLayout()); // - Prepare content $aData['aLayouts']['oPageContent'] = $this->GetContentLayout(); - $aData['aDeferredBlocks'] = array_merge($this->GetDeferredBlocks($this->GetContentLayout()), - $this->GetDeferredBlocks($this->GetNavigationMenuLayout()), - $this->GetDeferredBlocks($this->GetTopBarLayout())); + $aData['aDeferredBlocks']['oPageContent'] = $this->GetDeferredBlocks($this->GetContentLayout()); // - Retrieve layouts linked files // Note: Adding them now instead of in the template allow us to remove duplicates and lower the browser parsing time @@ -892,7 +892,7 @@ EOF; continue; } - ConsoleBlockRenderer::AddCssJsToPage($this, $oLayout); + ConsoleBlockRenderer::AddCssJsToPage($this, $oLayout, $aData); } // Components @@ -924,9 +924,12 @@ EOF; } } + // Render final TWIG into global HTML $oKpi = new ExecutionKPI(); $sHtml = TwigHelper::RenderTemplate($oTwigEnv, $aData, $this->GetTemplateRelPath()); + + $oKpi->ComputeAndReport('TWIG rendering'); // Echo global HTML @@ -974,167 +977,10 @@ EOF // TODO 3.0.0: Is this for the "Debug" popup? We should do a helper to display a popup in various cases (welcome message for example) $s_captured_output = $this->ob_get_clean_safe(); - // TODO 3.0.0: Stylesheet for printing instead of having all those "IsPrintableVersion()" ifs - // TODO 3.0.0: Careful! In the print view, we can actually choose which part to print or not, so it's not just a print stylesheet... - // special stylesheet for printing, hides the navigation gadgets - $sHtml .= "\n"; - if ($this->GetOutputFormat() == 'html') - { -// $sHtml .= $this->output_dict_entries(true); // before any script so that they can benefit from the translations - -// if (!$this->IsPrintableVersion()) -// { -// $this->add_script("var iPaneVisWatchDog = window.setTimeout('FixPaneVis()',5000);"); -// } - - - // TODO 3.0.0: Should we still do this init vs ready separation? -// $this->add_script("\$(document).ready(function() {\n{$sInitScripts};\nwindow.setTimeout('onDelayedReady()',10)\n});"); - if ($this->IsPrintableVersion()) - { - $this->add_ready_script( - <<' + oHiddeableChapters[sId] + ''; - //alert(oHiddeableChapters[sId]); -} -sHiddeableChapters += ''; -$('#hiddeable_chapters').html(sHiddeableChapters); -$('.hideable-chapter').click(function(){ - var sChapterId = $(this).attr('chapter-id'); - $('#'+sChapterId).toggle(); - $(this).toggleClass('strikethrough'); -}); -$('fieldset').each(function() { - var jLegend = $(this).find('legend'); - jLegend.remove(); - $(this).wrapInner('').prepend(jLegend); -}); -$('legend').css('cursor', 'pointer').click(function(){ - $(this).parent('fieldset').toggleClass('not-printable strikethrough'); - }); -EOF - ); - } - - } - - $sBodyClass = ""; - if ($this->IsPrintableVersion()) - { - $sBodyClass = 'printable-version'; - } -// $sHtml .= "\n"; - if ($this->IsPrintableVersion()) - { - $sHtml .= "
"; - $sHtml .= '

'.Dict::Format('UI:ExplainPrintable', - '').'

'; - $sHtml .= "
"; - $sHtml .= ''; - $sHtml .= ' '; - $sHtml .= ''; - $sHtml .= ' '; - - $sDefaultResolution = '27.7cm'; - $aResolutionChoices = array( - '100%' => Dict::S('UI:PrintResolution:FullSize'), - '19cm' => Dict::S('UI:PrintResolution:A4Portrait'), - '27.7cm' => Dict::S('UI:PrintResolution:A4Landscape'), - '19.6cm' => Dict::S('UI:PrintResolution:LetterPortrait'), - '25.9cm' => Dict::S('UI:PrintResolution:LetterLandscape'), - ); - $sHtml .= - << -EOF; - foreach ($aResolutionChoices as $sValue => $sText) - { - $sHtml .= ''; - } - $sHtml .= ""; - - $sHtml .= "
"; - $sHtml .= "
"; - } - - // TODO 3.0.0 -// // Render the text of the global search form -// $sText = htmlentities(utils::ReadParam('text', '', false, 'raw_data'), ENT_QUOTES, self::PAGES_CHARSET); -// $sOnClick = " onclick=\"if ($('#global-search-input').val() != '') { $('#global-search form').submit(); } \""; -// $sDefaultPlaceHolder = Dict::S("UI:YourSearch"); - - if ($this->IsPrintableVersion()) { - $sHtml .= ' '; - $sHtml .= utils::FilterXSS($this->s_content); - $sHtml .= ' '; - } elseif ($this->GetOutputFormat() == 'html') { - - // Add the captured output - if (trim($s_captured_output) != "") { - $sHtml .= "
".utils::FilterXSS($s_captured_output)."
\n"; - } -// $sHtml .= "
".utils::FilterXSS($this->s_deferred_content)."
"; -// $sHtml .= "
Please wait...
\n"; // jqModal Window -// $sHtml .= "
"; -// $sHtml .= "
"; - } else { - $sHtml .= utils::FilterXSS($this->s_content); - } - - if ($this->IsPrintableVersion()) - { - $sHtml .= '
'; - } - - - if ($this->GetOutputFormat() == 'html') - { -// $oKpi = new ExecutionKPI(); -// echo $sHtml; -// $oKpi->ComputeAndReport('Echoing ('.round(strlen($sHtml) / 1024).' Kb)'); - } - else - { - // TODO 3.0.0: Check with ITOMIG if we can remove this - if ($this->GetOutputFormat() == 'pdf' && $this->IsOutputFormatAvailable('pdf')) - { - // Note: Apparently this was a demand from ITOMIG a while back, so it's not "dead code" per say. - // The last trace we got is in R-007989. Do not remove this without checking before with the concerned parties if it is still used! - if (@is_readable(APPROOT.'lib/MPDF/mpdf.php')) - { - require_once(APPROOT.'lib/MPDF/mpdf.php'); - /** @noinspection PhpUndefinedClassInspection Check above comment */ - $oMPDF = new mPDF('c'); - $oMPDF->mirroMargins = false; - if ($this->a_base['href'] != '') - { - $oMPDF->setBasePath($this->a_base['href']); // Seems that the tag is not recognized by mPDF... - } - $oMPDF->showWatermarkText = true; - if ($this->GetOutputOption('pdf', 'template_path')) - { - $oMPDF->setImportUse(); // Allow templates - $oMPDF->SetDocTemplate($this->GetOutputOption('pdf', 'template_path'), 1); - } - $oMPDF->WriteHTML($sHtml); - $sOutputName = $this->s_title.'.pdf'; - if ($this->GetOutputOption('pdf', 'output_name')) - { - $sOutputName = $this->GetOutputOption('pdf', 'output_name'); - } - $oMPDF->Output($sOutputName, 'I'); - } - } - } } + /** * @inheritDoc * @throws \Exception @@ -1360,5 +1206,15 @@ EOF return $this; } + /** + * + * @return BlockPrintHeader + */ + protected function OutputPrintable(): BlockPrintHeader + { + $oBlock= new BlockPrintHeader(); + return $oBlock; + } + } diff --git a/templates/application/printable/block-print-header/layout.live.js.twig b/templates/application/printable/block-print-header/layout.live.js.twig new file mode 100644 index 000000000..41e14bd5e --- /dev/null +++ b/templates/application/printable/block-print-header/layout.live.js.twig @@ -0,0 +1,7 @@ +{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @license http://opensource.org/licenses/AGPL-3.0 #} +{% apply spaceless %} + +var oHiddeableChapters = {}; + +{% endapply %} \ No newline at end of file diff --git a/templates/base/components/button/layout.html.twig b/templates/base/components/button/layout.html.twig index 23cebe466..645b80abd 100644 --- a/templates/base/components/button/layout.html.twig +++ b/templates/base/components/button/layout.html.twig @@ -1,5 +1,5 @@