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

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source
This commit is contained in:
Molkobain
2020-10-07 11:38:49 +02:00
parent e48d257b00 51669d0479
commit e81e3a0f1c
7 changed files with 43 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
application/datamodel.application.xml
View File

@@ -400,36 +400,4 @@
</class>
</classes>
</meta>
<branding >
<themes>
<theme id="light-grey" _delta="define">
<variables>
</variables>
<imports>
<import id="css-variables">../css/css-variables.scss</import>
</imports>
<stylesheets>
<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
<stylesheet id="main">../css/light-grey.scss</stylesheet>
</stylesheets>
<precompiled_stylesheet>itop-config-mgmt/precompiled-themes/light-grey/main.css</precompiled_stylesheet>
</theme>
<theme id="test-red" _delta="define">
<variables>
<variable id="backoffice-environment-banner-background-color">#C53030</variable>
<variable id="backoffice-environment-banner-text-color">#F7FAFC</variable>
<variable id="backoffice-environment-banner-text-content">"THIS IS A TEST INSTANCE"</variable>
</variables>
<imports>
<import id="css-variables">../css/css-variables.scss</import>
</imports>
<stylesheets>
<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
<stylesheet id="main">../css/light-grey.scss</stylesheet>
<stylesheet id="environment-banner">../css/backoffice-environment-banner.scss</stylesheet>
</stylesheets>
<precompiled_stylesheet>itop-config-mgmt/precompiled-themes/test-red/main.css</precompiled_stylesheet>
</theme>
</themes>
</branding>
</itop_design>

3
datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
View File

@@ -19,7 +19,6 @@
<attribute id="functionalci_id"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
@@ -129,7 +128,6 @@
<attribute id="functionalci_id"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
@@ -210,7 +208,6 @@
<attribute id="functionalci_id"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>

2
datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
View File

@@ -15,7 +15,6 @@
<attribute id="title"/>
</attributes>
</naming>
<display_template/>
<icon>images/faq.png</icon>
<reconciliation>
<attributes>
@@ -154,7 +153,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>

1
datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
View File

@@ -331,7 +331,6 @@
<attribute id="link_type"/>
</attributes>
</naming>
<display_template>../business/templates/default.html</display_template>
<icon/>
<reconciliation>
<attributes>

11
datamodels/2.x/itop-portal/datamodel.itop-portal.xml
View File

@@ -141,6 +141,17 @@
</form>
</brick>
</bricks>
<navigation_rules>
<!-- Close form (either the modal or the whole page) -->
<navigation_rule id="close-form" xsi:type="close" _delta="define"/>
<!-- Go to the homepage -->
<navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
</navigation_rules>
</module_design>
</module_designs>
<module_parameters>
<parameters id="itop-portal" _delta="define">
<lazy_loading_threshold>500</lazy_loading_threshold><!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings -->
</parameters>
</module_parameters>
</itop_design>

45
datamodels/2.x/itop-structure/datamodel.itop-structure.xml
View File

@@ -21,7 +21,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/building.png</icon>
<reconciliation>
<attributes>
@@ -182,7 +181,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/location.png</icon>
<reconciliation>
<attributes>
@@ -345,7 +343,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/team.png</icon>
<reconciliation>
<attributes>
@@ -513,7 +510,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/person.png</icon>
<reconciliation>
<attributes>
@@ -831,7 +827,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/team.png</icon>
<reconciliation>
<attributes>
@@ -941,7 +936,6 @@
<attribute id="person_id"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
@@ -1039,7 +1033,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
@@ -1099,7 +1092,6 @@
<naming>
<attributes/>
</naming>
<display_template/>
<icon>images/document.png</icon>
<reconciliation>
<attributes>
@@ -1249,7 +1241,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/document.png</icon>
<reconciliation>
<attributes>
@@ -1372,7 +1363,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/document.png</icon>
<reconciliation>
<attributes>
@@ -1476,7 +1466,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon>images/document.png</icon>
<reconciliation>
<attributes>
@@ -1578,7 +1567,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
@@ -1626,7 +1614,6 @@
<attribute id="name"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
@@ -1788,4 +1775,36 @@
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
</menus>
<branding>
<themes>
<theme id="light-grey" _delta="define">
<variables>
</variables>
<imports>
<import id="css-variables">../css/css-variables.scss</import>
</imports>
<stylesheets>
<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
<stylesheet id="main">../css/light-grey.scss</stylesheet>
</stylesheets>
<precompiled_stylesheet>itop-config-mgmt/precompiled-themes/light-grey/main.css</precompiled_stylesheet>
</theme>
<theme id="test-red" _delta="define">
<variables>
<variable id="backoffice-environment-banner-background-color">#C53030</variable>
<variable id="backoffice-environment-banner-text-color">#F7FAFC</variable>
<variable id="backoffice-environment-banner-text-content">"THIS IS A TEST INSTANCE"</variable>
</variables>
<imports>
<import id="css-variables">../css/css-variables.scss</import>
</imports>
<stylesheets>
<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
<stylesheet id="main">../css/light-grey.scss</stylesheet>
<stylesheet id="environment-banner">../css/backoffice-environment-banner.scss</stylesheet>
</stylesheets>
<precompiled_stylesheet>itop-config-mgmt/precompiled-themes/test-red/main.css</precompiled_stylesheet>
</theme>
</themes>
</branding>
</itop_design>

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

@@ -1272,10 +1272,6 @@
</action_rule>
</action_rules>
<navigation_rules>
<!-- Close form (either the modal or the whole page) -->
<navigation_rule id="close-form" xsi:type="close" _delta="define"/>
<!-- Go to the homepage -->
<navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
<!-- Open a manage brick (simple method) -->
<navigation_rule id="go-to-open-requests" xsi:type="go-to-manage-brick" _delta="define">
<!-- Mandatory, ID of the ManageBrick to go to -->
@@ -1310,9 +1306,4 @@
</navigation_rules>
</module_design>
</module_designs>
<module_parameters>
<parameters id="itop-portal" _delta="define">
<lazy_loading_threshold>500</lazy_loading_threshold><!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings -->
</parameters>
</module_parameters>
</itop_design>