Skip to content

Commit

Permalink
Merge pull request #1 from xtophe38/master
Browse files Browse the repository at this point in the history
Refresh for iTop 3.2
  • Loading branch information
Hipska authored Nov 7, 2024
2 parents d544a84 + 95d4395 commit d7a9b7f
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
16 changes: 15 additions & 1 deletion datamodel.sv-display-mgmt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</attributes>
</naming>
<display_template/>
<icon>images/display.png</icon>
<icon>assets/img/icons8-display.svg</icon>
<reconciliation>
<attributes>
<attribute id="name"/>
Expand Down Expand Up @@ -282,6 +282,20 @@
<entry id="Class:Model/Attribute:type/Value:Display+" _delta="define"/>
</entries>
</dictionary>
<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"/>
<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"/>
</entries>
</dictionary>
<dictionary id="NL NL">
<entries>
<entry id="Class:Display" _delta="define">Scherm</entry>
Expand Down
7 changes: 6 additions & 1 deletion extension.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
<?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-Visions</company>
<label><![CDATA[Display management]]></label>
<description><![CDATA[Document displays of various types]]></description>
<version>1.2.0</version>
<release_date>2024-11-08</release_date>
<version_description><![CDATA[Add compatibility with iTop 3.2]]></version_description>
<itop_version_min>2.3.0</itop_version_min>
<status>stable</status>
<mandatory>false</mandatory>
<more_info_url>https://github.com/Super-Visions/sv-display-mgmt</more_info_url>
</extension>
Binary file removed images/display.png
Binary file not shown.
4 changes: 2 additions & 2 deletions module.sv-display-mgmt.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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 @@ -30,7 +30,7 @@

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

0 comments on commit d7a9b7f

Please sign in to comment.