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°2677 - Add style definition for classes (too much style)

Browse Source
This commit is contained in:
Eric
2021-01-13 08:58:27 +01:00
parent 503817e572
commit 028a3ccec8
17 changed files with 114 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
View File

@@ -279,23 +279,17 @@
<item id="approved">
<rank>1</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/change-approved.png</icon>
</style>
</item>
<item id="rejected">
<rank>2</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/change-rejected.png</icon>
</style>
</item>
<item id="closed">
<rank>3</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/change-closed.png</icon>
</style>
</item>
</highlight_scale>
<stimuli>
@@ -4665,9 +4659,7 @@
AND (C.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
</style>
</item>
<item id="recent_changes" _delta="define">
<oql><![CDATA[
@@ -4682,9 +4674,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-done.png</icon>
</style>
</item>
</items>
</down>
@@ -4706,9 +4696,7 @@
AND (C.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
</style>
</item>
<item id="recent_changes" _delta="define">
<oql><![CDATA[
@@ -4723,9 +4711,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-done.png</icon>
</style>
</item>
</items>
</down>
@@ -4747,9 +4733,7 @@
AND (C.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
</style>
</item>
<item id="recent_changes" _delta="define">
<oql><![CDATA[
@@ -4764,9 +4748,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-done.png</icon>
</style>
</item>
</items>
</down>
@@ -4791,9 +4773,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
</style>
</item>
<item id="recent_changes" _delta="define">
<oql><![CDATA[
@@ -4807,9 +4787,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-done.png</icon>
</style>
</item>
</items>
</down>
@@ -4826,9 +4804,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
</style>
</item>
<item id="recent_changes" _delta="define">
<oql><![CDATA[
@@ -4842,9 +4818,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt-itil/images/change-done.png</icon>
</style>
</item>
</items>
</up>

26
datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
View File

@@ -210,23 +210,17 @@
<item id="approved">
<rank>1</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/change-approved.png</icon>
</style>
</item>
<item id="rejected">
<rank>2</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/change-rejected.png</icon>
</style>
</item>
<item id="closed">
<rank>3</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/change-closed.png</icon>
</style>
</item>
</highlight_scale>
<stimuli>
@@ -921,9 +915,7 @@
AND (C.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-ongoing.png</icon>
</style>
<default>yes</default>
</item>
<item id="recent_changes" _delta="define">
@@ -940,9 +932,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-done.png</icon>
</style>
<default>no</default>
</item>
</items>
@@ -966,9 +956,7 @@
AND (C.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-ongoing.png</icon>
</style>
<default>yes</default>
</item>
<item id="recent_changes" _delta="define">
@@ -985,9 +973,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-done.png</icon>
</style>
<default>no</default>
</item>
</items>
@@ -1011,9 +997,7 @@
AND (C.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-ongoing.png</icon>
</style>
<default>yes</default>
</item>
<item id="recent_changes" _delta="define">
@@ -1030,9 +1014,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-done.png</icon>
</style>
<default>no</default>
</item>
</items>
@@ -1059,9 +1041,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-ongoing.png</icon>
</style>
<default>yes</default>
</item>
<item id="recent_changes" _delta="define">
@@ -1077,9 +1057,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-done.png</icon>
</style>
<default>no</default>
</item>
</items>
@@ -1098,9 +1076,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-ongoing.png</icon>
</style>
<default>yes</default>
</item>
<item id="recent_changes" _delta="define">
@@ -1116,9 +1092,7 @@
AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
]]></oql>
<dict>Tickets:Related:RecentChanges</dict>
<style>
<icon>itop-change-mgmt/images/change-done.png</icon>
</style>
<default>no</default>
</item>
</items>

6
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -6555,9 +6555,7 @@
<dashlet id="1" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagement:AllDevices</title>
<style>
<icon>itop-config-mgmt/images/server.png</icon>
</style>
<subtitle>Menu_ConfigManagement_AllDevices</subtitle>
</dashlet>
<dashlet id="2" xsi:type="DashletBadge">
@@ -6576,9 +6574,7 @@
<dashlet id="4" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagement:SWAndApps</title>
<style>
<icon>itop-config-mgmt/images/application.png</icon>
</style>
</dashlet>
<dashlet id="5" xsi:type="DashletBadge">
<rank>1</rank>
@@ -6628,9 +6624,7 @@
<dashlet id="15" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagement:Misc</title>
<style>
<icon>itop-config-mgmt/images/subnet.png</icon>
</style>
</dashlet>
<dashlet id="16" xsi:type="DashletBadge">
<rank>1</rank>

10
datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig
View File

@@ -2,9 +2,9 @@
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% set sVersion = 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) %}
<div class="details">
<div class="field_container field_small">
<div class="field_label label"><span title="">{{ 'iTopUpdate:UI:CurrentVersion'|dict_s }}</span></div>
<div class="field_data"><div class="field_value">{{ sVersion }}</div></div>
<div class="ibo-field ibo-field-small" data-role="ibo-field">
<div class="ibo-field--label"><span title="">{{ 'iTopUpdate:UI:CurrentVersion'|dict_s }}</span></div>
<div class="ibo-field--value">
<div class="field_value">{{ sVersion }}</div>
</div>
</div>
</div>

213
datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
View File

@@ -1,134 +1,121 @@
{# @copyright Copyright (C) 2010-2019 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% UIBlock Combodo\iTop\Application\UI\Base\Component\Html\Html %}
<div class="page_header"><h1 class="ibo-title--text title is-size-3">{{ 'iTopUpdate:UI:PageTitle'|dict_s }}</h1></div>
{% EndUIBlock %}
{# <div class="ibo-v-spacer">&nbsp;</div> #}
<div class="page_header"><h1>{{ 'iTopUpdate:UI:PageTitle'|dict_s }}</h1></div>
{# <div class="display_block display-files"> #}
{# <fieldset class="ibo-fieldset"> #}
{# <legend class="ibo-fieldset-legend">{{ 'iTopUpdate:UI:Status'|dict_s }}</legend> #}
<div class="display_block display-files">
<fieldset>
<legend>{{ 'iTopUpdate:UI:Status'|dict_s }}</legend>
{# <div id="header-requirements" class="ibo-alert ibo-is-information ibo-is-opened"> #}
{# <div class="ibo-alert--body"> #}
{# <span id="can-core-update">{{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} <i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></span> #}
{# </div> #}
{# </div> #}
<div id="header-requirements" class="header_message message_info">
<div>
<span id="can-core-update">{{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} <i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></span>
</div>
</div>
{# {{ include('DisplayCurrentVersion.html.twig') }} #}
<table style="vertical-align:top" class="one-col-details" data-mode="view">
<tbody>
<tr>
<td style="vertical-align:top" class="">
{# <div class="ibo-field ibo-field-small" data-role="ibo-field"> #}
{# <div class="ibo-field--label"><span title="">{{ 'iTopUpdate:UI:DiskFreeSpace'|dict_s }}</span></div> #}
{# <div class="ibo-field--value"> #}
{# <div class="field_value">{{ sDiskFreeSpace }}</div> #}
{# </div> #}
{# </div> #}
{{ include('DisplayCurrentVersion.html.twig') }}
{# <div class="ibo-field ibo-field-small" data-role="ibo-field"> #}
{# <div class="ibo-field--label"><span title="">{{ 'iTopUpdate:UI:ItopDiskSpace'|dict_s }}</span></div> #}
{# <div class="ibo-field--value"> #}
{# <div id="itop-disk-space" class="field_value"><i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></div> #}
{# </div> #}
{# </div> #}
<div class="details">
<div class="field_container field_small">
<div class="field_label label"><span title="">{{ 'iTopUpdate:UI:DiskFreeSpace'|dict_s }}</span></div>
<div class="field_data"><div class="field_value">{{ sDiskFreeSpace }}</div></div>
</div>
</div>
{# <div class="ibo-field ibo-field-small" data-role="ibo-field"> #}
{# <div class="ibo-field--label"><span title="">{{ 'iTopUpdate:UI:DBDiskSpace'|dict_s }}</span></div> #}
{# <div id="db-disk-space" class="ibo-field--value"><i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></div> #}
{# </div> #}
<div class="details">
<div class="field_container field_small">
<div class="field_label label"><span title="">{{ 'iTopUpdate:UI:ItopDiskSpace'|dict_s }}</span></div>
<div class="field_data"><div id="itop-disk-space" class="field_value"><i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></div></div>
</div>
</div>
{# <div class="ibo-field ibo-field-small" data-role="ibo-field"> #}
{# <div class="ibo-field--label"><span title="">{{ 'iTopUpdate:UI:FileUploadMaxSize'|dict_s }}</span></div> #}
{# <div class="ibo-field--value">{{ sFileUploadMaxSize }}</div> #}
{# </div> #}
<div class="details">
<div class="field_container field_small">
<div class="field_label label"><span title="">{{ 'iTopUpdate:UI:DBDiskSpace'|dict_s }}</span></div>
<div class="field_data"><div id="db-disk-space" class="field_value"><i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></div></div>
</div>
</div>
{# </fieldset> #}
<div class="details">
<div class="field_container field_small">
<div class="field_label label"><span title="">{{ 'iTopUpdate:UI:FileUploadMaxSize'|dict_s }}</span></div>
<div class="field_data"><div class="field_value">{{ sFileUploadMaxSize }}</div></div>
</div>
</div>
</td>
</tr>
</tbody>
</table>
{# <fieldset class="ibo-fieldset"> #}
{# <legend class="ibo-fieldset-legend">{{ 'iTopUpdate:UI:SelectUpdateFile'|dict_s }}</legend> #}
</fieldset>
{# <form enctype="multipart/form-data" method="post"> #}
{# <input type="hidden" name="operation" value="ConfirmUpdate"/> #}
{# <input type="hidden" name="transaction_id" value="{{ sTransactionId }}"> #}
<fieldset>
<legend>{{ 'iTopUpdate:UI:SelectUpdateFile'|dict_s }}</legend>
{# <div id="header-file-size" class="header_message message_error" style="display: none"> #}
{# <div> #}
{# <span>{{ 'iTopUpdate:Error:FileUploadMaxSizeTooSmall'|dict_s }}</span> #}
{# </div> #}
{# <div> #}
{# <span>{{ 'iTopUpdate:UI:PostMaxSize'|dict_format(sPostMaxSize) }}</span> #}
{# </div> #}
{# <div> #}
{# <span>{{ 'iTopUpdate:UI:UploadMaxFileSize'|dict_format(sUploadMaxSize) }}</span> #}
{# </div> #}
{# </div> #}
<div class="details">
<form enctype="multipart/form-data" method="post">
<input type="hidden" name="operation" value="ConfirmUpdate"/>
<input type="hidden" name="transaction_id" value="{{ sTransactionId }}">
{# <div class="field_container field_large"> #}
{# <div class="field_data"> #}
{# <div class="upload_container"> #}
{# <input type="file" id="file" name="file"/> #}
{# </div> #}
{# </div> #}
<div id="header-file-size" class="header_message message_error" style="display: none">
<div>
<span>{{ 'iTopUpdate:Error:FileUploadMaxSizeTooSmall'|dict_s }}</span>
</div>
<div>
<span>{{ 'iTopUpdate:UI:PostMaxSize'|dict_format(sPostMaxSize) }}</span>
</div>
<div>
<span>{{ 'iTopUpdate:UI:UploadMaxFileSize'|dict_format(sUploadMaxSize) }}</span>
</div>
</div>
{# <div id="dobackup-warning" class="header_message message_info" style="display: none">{{ 'iTopUpdate:UI:DoBackup:Warning'|dict_s }}</div> #}
{# <div class="field_data"> #}
{# <label id="dobackup-label" for="doBackup">{{ 'iTopUpdate:UI:DoBackup:Label'|dict_s }}</label> #}
{# <input type="checkbox" id="doBackup" name="doBackup" checked="checked" value="1"/> #}
{# </div> #}
{# <div class="field_data"> #}
{# <label id="dofilesarchive-label" for="doFilesArchive">{{ 'iTopUpdate:UI:DoFilesArchive'|dict_s }}</label> #}
{# <input type="checkbox" id="doFilesArchive" name="doFilesArchive" checked="checked" value="1"/> #}
{# </div> #}
{# </div> #}
{# <p><input id="check-update" type="submit" value="{{ 'iTopUpdate:UI:CheckUpdate'|dict_s }}" disabled="disabled"/> <i id="submit-wait" style="display: none" class="fas fa-spinner fa-spin" aria-hidden="true"></i></p> #}
{# </form> #}
{# </fieldset> #}
<div class="field_container field_large">
<div class="field_data">
<div class="upload_container">
<input type="file" id="file" name="file"/>
</div>
</div>
{# <fieldset class="ibo-fieldset"> #}
{# <legend class="ibo-fieldset-legend">{{ 'iTopUpdate:UI:History'|dict_s }}</legend> #}
<div id="dobackup-warning" class="header_message message_info" style="display: none">{{ 'iTopUpdate:UI:DoBackup:Warning'|dict_s }}</div>
<div class="field_data">
<label id="dobackup-label" for="doBackup">{{ 'iTopUpdate:UI:DoBackup:Label'|dict_s }}</label>
<input type="checkbox" id="doBackup" name="doBackup" checked="checked" value="1"/>
</div>
<div class="field_data">
<label id="dofilesarchive-label" for="doFilesArchive">{{ 'iTopUpdate:UI:DoFilesArchive'|dict_s }}</label>
<input type="checkbox" id="doFilesArchive" name="doFilesArchive" checked="checked" value="1"/>
</div>
</div>
<p><input id="check-update" type="submit" value="{{ 'iTopUpdate:UI:CheckUpdate'|dict_s }}" disabled="disabled"/> <i id="submit-wait" style="display: none" class="fas fa-spinner fa-spin" aria-hidden="true"></i></p>
</form>
</div>
</fieldset>
{# <div class="details"> #}
{# {% for aInstall in aPreviousInstall %} #}
{# {% if loop.first %} #}
{# <table class="listResults ibo-datatable"> #}
{# <tr> #}
{# <th>{{ 'Class:ModuleInstallation/Attribute:name'|dict_s }}</th> #}
{# <th>{{ 'Class:ModuleInstallation/Attribute:version'|dict_s }}</th> #}
{# <th>{{ 'Class:ModuleInstallation/Attribute:installed'|dict_s }}</th> #}
{# <th>{{ 'Class:ModuleInstallation/Attribute:comment'|dict_s }}</th> #}
{# </tr> #}
{# {% endif %} #}
<fieldset>
<legend>{{ 'iTopUpdate:UI:History'|dict_s }}</legend>
{# {% if (loop.index0 % 2) == 0 %} #}
{# {% set sRowClass = "odd" %} #}
{# {% else %} #}
{# {% set sRowClass = "even" %} #}
{# {% endif %} #}
<div class="details">
{% for aInstall in aPreviousInstall %}
{% if loop.first %}
<table class="listResults">
<tr>
<th>{{ 'Class:ModuleInstallation/Attribute:name'|dict_s }}</th>
<th>{{ 'Class:ModuleInstallation/Attribute:version'|dict_s }}</th>
<th>{{ 'Class:ModuleInstallation/Attribute:installed'|dict_s }}</th>
<th>{{ 'Class:ModuleInstallation/Attribute:comment'|dict_s }}</th>
</tr>
{% endif %}
{# <tr class="{{ sRowClass }}"> #}
{# <td>{{ aInstall.name }}</td> #}
{# <td>{{ aInstall.version }}</td> #}
{# <td>{{ aInstall.installed }}</td> #}
{# <td>{{ aInstall.comment }}</td> #}
{# </tr> #}
{% if (loop.index0 % 2) == 0 %}
{% set sRowClass = "odd" %}
{% else %}
{% set sRowClass = "even" %}
{% endif %}
{# {% if loop.last %} #}
{# </table> #}
{# {% endif %} #}
{# {% endfor %} #}
{# </div> #}
{# </fieldset> #}
<tr class="{{ sRowClass }}">
<td>{{ aInstall.name }}</td>
<td>{{ aInstall.version }}</td>
<td>{{ aInstall.installed }}</td>
<td>{{ aInstall.comment }}</td>
</tr>
{% if loop.last %}
</table>
{% endif %}
{% endfor %}
</div>
</fieldset>
</div>
{# </div> #}

16
datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
View File

@@ -10,19 +10,15 @@ $.ajax({
"operation": "CanUpdateCore"
},
dataType: "json",
success: function(data)
{
success: function (data) {
var oRequirements = $("#header-requirements");
var oCanCoreUpdate = $("#can-core-update");
oCanCoreUpdate.html(data.sMessage);
oRequirements.removeClass("message_info");
if (data.bStatus)
{
oRequirements.addClass("message_ok");
}
else
{
oRequirements.addClass("message_error");
oRequirements.removeClass("ibo-is-information");
if (data.bStatus) {
oRequirements.addClass("ibo-is-success");
} else {
oRequirements.addClass("ibo-is-failure");
}
}
});

2
datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
View File

@@ -1390,9 +1390,7 @@
<dashlet id="25" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagement:EndUsers</title>
<style>
<icon>itop-config-mgmt/images/team.png</icon>
</style>
</dashlet>
<dashlet id="26" xsi:type="DashletBadge">
<rank>1</rank>

16
datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
View File

@@ -482,23 +482,17 @@
<item id="warning">
<rank>1</rank>
<color>HIGHLIGHT_CLASS_WARNING</color>
<style>
<icon>images/incident-deadline.png</icon>
</style>
</item>
<item id="critical">
<rank>2</rank>
<color>HIGHLIGHT_CLASS_CRITICAL</color>
<style>
<icon>images/incident-escalated.png</icon>
</style>
</item>
<item id="closed">
<rank>3</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/incident-closed.png</icon>
</style>
</item>
</highlight_scale>
<stimuli>
@@ -1958,9 +1952,7 @@
AND (I.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -1982,9 +1974,7 @@
AND (I.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -2006,9 +1996,7 @@
AND (I.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -2033,9 +2021,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -2052,9 +2038,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>

6
datamodels/2.x/itop-portal-base/portal/vendor/composer/ClassLoader.php vendored
View File

@@ -45,8 +45,8 @@ namespace Composer\Autoload;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
* @see https://www.php-fig.org/psr/psr-0/
* @see https://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
@@ -68,7 +68,7 @@ class ClassLoader
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
}
return array();

10
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -534,23 +534,17 @@
<item id="warning">
<rank>1</rank>
<color>HIGHLIGHT_CLASS_WARNING</color>
<style>
<icon>images/user-request-deadline.png</icon>
</style>
</item>
<item id="critical">
<rank>2</rank>
<color>HIGHLIGHT_CLASS_CRITICAL</color>
<style>
<icon>images/user-request-escalated.png</icon>
</style>
</item>
<item id="closed">
<rank>3</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/user-request-closed.png</icon>
</style>
</item>
</highlight_scale>
<stimuli>
@@ -1880,9 +1874,7 @@
<dashlet id="9" xsi:type="DashletHeaderDynamic">
<rank>0</rank>
<title>Organization:Overview:UserRequests</title>
<style>
<icon>itop-welcome-itil/images/user-request-deadline.png</icon>
</style>
<subtitle>Menu:UserRequest:OpenRequests</subtitle>
<query>SELECT UserRequest WHERE status != "closed" AND org_id=:this-&gt;id</query>
<group_by>status</group_by>
@@ -1929,9 +1921,7 @@
<dashlet id="11" xsi:type="DashletHeaderDynamic">
<rank>0</rank>
<title>Menu:RequestManagement</title>
<style>
<icon>itop-welcome-itil/images/user-request-deadline.png</icon>
</style>
<subtitle>Menu:UserRequest:OpenRequests</subtitle>
<query>SELECT UserRequest WHERE status != "closed"</query>
<group_by>status</group_by>

18
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

@@ -565,23 +565,17 @@
<item id="warning">
<rank>1</rank>
<color>HIGHLIGHT_CLASS_WARNING</color>
<style>
<icon>images/user-request-deadline.png</icon>
</style>
</item>
<item id="critical">
<rank>2</rank>
<color>HIGHLIGHT_CLASS_CRITICAL</color>
<style>
<icon>images/user-request-escalated.png</icon>
</style>
</item>
<item id="closed">
<rank>3</rank>
<color>HIGHLIGHT_CLASS_NONE</color>
<style>
<icon>images/user-request-closed.png</icon>
</style>
</item>
</highlight_scale>
<stimuli>
@@ -1924,9 +1918,7 @@
<dashlet id="9" xsi:type="DashletHeaderDynamic">
<rank>0</rank>
<title>Organization:Overview:UserRequests</title>
<style>
<icon>itop-welcome-itil/images/user-request-deadline.png</icon>
</style>
<subtitle>Menu:UserRequest:OpenRequests</subtitle>
<query>SELECT UserRequest WHERE status != "closed" AND org_id=:this-&gt;id</query>
<group_by>status</group_by>
@@ -1973,9 +1965,7 @@
<dashlet id="9" xsi:type="DashletHeaderDynamic">
<rank>0</rank>
<title>Menu:RequestManagement</title>
<style>
<icon>itop-welcome-itil/images/user-request-deadline.png</icon>
</style>
<subtitle>Menu:UserRequest:OpenRequests</subtitle>
<query>SELECT UserRequest WHERE status != "closed"</query>
<group_by>status</group_by>
@@ -2149,9 +2139,7 @@
AND (R.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-request-mgmt/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -2175,9 +2163,7 @@
AND (R.id != :this->id)
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-request-mgmt/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -2204,9 +2190,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-request-mgmt/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>
@@ -2225,9 +2209,7 @@
AND (L.impact_code != 'not_impacted')
]]></oql>
<dict>Tickets:Related:OpenIncidents</dict>
<style>
<icon>itop-request-mgmt/images/incident-red.png</icon>
</style>
<default>yes</default>
</item>
</items>

2
datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml
View File

File diff suppressed because one or more lines are too long

6
datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml
View File

File diff suppressed because one or more lines are too long

2
datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml
View File

File diff suppressed because one or more lines are too long

6
datamodels/2.x/itop-service-mgmt/data.sample.services.xml
View File

File diff suppressed because one or more lines are too long

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

@@ -901,9 +901,7 @@
<dashlet id="38" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagement:virtualization</title>
<style>
<icon>itop-virtualization-mgmt/images/hypervisor-sw.png</icon>
</style>
</dashlet>
<dashlet id="39" xsi:type="DashletBadge">
<rank>1</rank>

2
datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
View File

@@ -14,9 +14,7 @@
<dashlet id="1" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagementCI</title>
<style>
<icon>itop-welcome-itil/images/database.png</icon>
</style>
</dashlet>
<dashlet id="4" xsi:type="DashletBadge">
<rank>3</rank>