Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh for iTop 3.2 #1

Merged
merged 13 commits into from
Nov 7, 2024
Merged

Refresh for iTop 3.2 #1

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
217e43c
Replace image by icons8 one and move file to 3.x directory structure
xtophe38 Oct 31, 2024
0fa2551
Move data file to 3.x directory structure
xtophe38 Oct 31, 2024
aadc4cb
Add FR FR dictionary
xtophe38 Oct 31, 2024
74c8264
Enhance structure
xtophe38 Oct 31, 2024
34c3548
Increase dependencies and revision #
xtophe38 Oct 31, 2024
6338af5
Update extension.xml
xtophe38 Nov 7, 2024
5285d9a
Update datamodel.sv-display-mgmt.xml
xtophe38 Nov 7, 2024
17f5c77
Update datamodel.sv-display-mgmt.xml
xtophe38 Nov 7, 2024
289b81a
Update datamodel.sv-display-mgmt.xml
xtophe38 Nov 7, 2024
8ceebf2
Remove unappropriated copyright
xtophe38 Nov 7, 2024
6ddbb01
Revert dependencies
xtophe38 Nov 7, 2024
30cdc22
Cleanup extension.xml
Hipska Nov 7, 2024
95d4395
Fix dictionary location in xml tree
Hipska Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Be sure to enable the extension during setup.

### Display

![Display icon](images/display.png) Parent: `PhysicalDevice`
![Display icon](asset/img/icons8-display.svg) Parent: `PhysicalDevice`

* Size _(Integer)_ Size of the display in inches
* Type _(ExternalKey)_ [DisplayType](#displaytype)
Expand Down
1 change: 1 addition & 0 deletions asset/img/icons8-display.svg
View file
Open in desktop
Hipska marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 struct.displaytype.xml → data/struct.displaytype.xml
View file
Open in desktop
Hipska marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
18 changes: 17 additions & 1 deletion datamodel.sv-display-mgmt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
</attributes>
</naming>
<display_template/>
<icon>images/display.png</icon>
<style>
<icon>asset/img/icons8-display.svg</icon>
</style>
xtophe38 marked this conversation as resolved.
Show resolved Hide resolved
<reconciliation>
<attributes>
<attribute id="name"/>
Expand Down Expand Up @@ -309,6 +311,20 @@
<entry id="Class:Model/Attribute:type/Value:Display" _delta="define">Monitor</entry>
<entry id="Class:Model/Attribute:type/Value:Display+" _delta="define"><![CDATA[]]></entry>
</entries>
<dictionary id="FR FR">
<entries>
<entry id="Class:Display" _delta="define">Ecran</entry>
<entry id="Class:Display/Attribute:size" _delta="define">Taille</entry>
<entry id="Class:Display/Attribute:size+" _delta="define">Taille de l'écran en pouces</entry>
<entry id="Class:Display/Attribute:type_id" _delta="define">Type</entry>
<entry id="Class:Display/Attribute:type_id+" _delta="define"><![CDATA[]]></entry>
xtophe38 marked this conversation as resolved.
Show resolved Hide resolved
<entry id="Class:DisplayType" _delta="define">Type d'écran</entry>
<entry id="Class:DisplayType/Attribute:display_list" _delta="define">Ecrans</entry>
<entry id="Class:DisplayType/Attribute:display_list+" _delta="define">Tous les écrans de ce type.</entry>
<entry id="Class:Model/Attribute:type/Value:Display" _delta="define">Ecran</entry>
<entry id="Class:Model/Attribute:type/Value:Display+" _delta="define"><![CDATA[]]></entry>
xtophe38 marked this conversation as resolved.
Show resolved Hide resolved
</entries>
</dictionary>
</dictionary>
</dictionaries>
</itop_design>
8 changes: 7 additions & 1 deletion extension.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension format="1.0">
<extension_code>sv-display-mgmt</extension_code>
<version>1.1.1</version>
<company>Super-Vision</company>
<author><![CDATA[Hipska]]></author>
xtophe38 marked this conversation as resolved.
Show resolved Hide resolved
<label><![CDATA[Display management]]></label>
<description><![CDATA[Document displays of various types]]></description>
<version>1.2.0</version>
<release_date>2024-11-04</release_date>
<version_description><![CDATA[]]></version_description>
<itop_version_min>3.2.0</itop_version_min>
<status>stable</status>
Hipska marked this conversation as resolved.
Show resolved Hide resolved
<mandatory>false</mandatory>
<more_info_url>https://github.com/Super-Visions/sv-display-mgmt</more_info_url>
</extension>
Binary file removed images/display.png
View file
Open in desktop
Binary file not shown.
13 changes: 9 additions & 4 deletions module.sv-display-mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?php
/*
* @copyright Copyright (C) 2010-2024 TeemIp
* @license http://opensource.org/licenses/AGPL-3.0
*/

Hipska marked this conversation as resolved.
Show resolved Hide resolved
//
// iTop module definition file
//

SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'sv-display-mgmt/1.1.1',
'sv-display-mgmt/1.2.0',
array(
// Identification
//
Expand All @@ -15,8 +20,8 @@
// Setup
//
'dependencies' => array(
'itop-config-mgmt/2.3.0',
'itop-endusers-devices/2.2.0',
'itop-config-mgmt/3.2.0',
'itop-endusers-devices/3.2.0',
Hipska marked this conversation as resolved.
Show resolved Hide resolved
),
'mandatory' => false,
'visible' => true,
Expand All @@ -30,7 +35,7 @@

),
'data.struct' => array(
'struct.displaytype.xml',
'data/struct.displaytype.xml',
),
'data.sample' => array(
// add your sample data XML files here,
Expand Down