From ed089a503205e586108a8bff88a27e6b948dcbf2 Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Fri, 2 Apr 2021 09:47:18 +0200 Subject: [PATCH] Replaced all .gif occurencies in the code by .png --- data/static/html/system/error.htm | 4 +- data/template/default/css/bloc.css | 2 +- data/template/default/css/button.css | 20 ++++----- data/template/default/css/custom.css | 16 +++---- data/template/default/css/global.css | 10 ++--- data/template/default/css/home.css | 32 +++++++------- data/template/default/default.css | 22 +++++----- .../adminentrynode/configuration.mxt | 4 +- .../admingroup/actionadmin.mxt | 4 +- .../admingroup/configuration.mxt | 4 +- .../admingroup/updateadmin.mxt | 4 +- .../adminnode/actionadmin.mxt | 4 +- .../adminnode/configuration.mxt | 4 +- .../adminnode/updateadmin.mxt | 4 +- .../adminobject/configuration.mxt | 4 +- .../adminuser/configuration.mxt | 4 +- .../coordinationobj/configuration.mxt | 4 +- .../home/actionlecture.mxt | 6 +-- .../object_coordination/home/formlecture.mxt | 4 +- .../installmanager/beforeinstall.mxt | 4 +- .../installmanager/beforeuninstall.mxt | 4 +- .../installmanager/bkpmanageinstall.mxt | 4 +- .../installmanager/configuration.mxt | 4 +- .../installmanager/listinstall.mxt | 42 +++++++++---------- .../usertemp/configuration.mxt | 4 +- .../object_printing/helpprint/helpprint.mxt | 4 +- .../coordinationobj/configuration.mxt | 2 +- .../installmanager/beforeinstall.mxt | 2 +- .../installmanager/beforeuninstall.mxt | 2 +- .../installmanager/bkpmanageinstall.mxt | 2 +- .../installmanager/listinstall.mxt | 32 +++++++------- .../object_printing/helpprint/helpprint.mxt | 4 +- install/db_scripts/mysql/7_insert_datas.sql | 28 ++++++------- install/media/install.css | 2 +- lib/object_coordination/addcom/addcom.php | 2 +- .../admingroup/admingroup.php | 6 +-- .../adminnode/adminnode.php | 4 +- .../adminobject/adminobject.php | 4 +- .../currentcoordinationobjprint.php | 6 +-- .../navigationnodeprint.php | 4 +- .../navigationprint/navigationprint.php | 6 +-- .../objectentrynodeprint.php | 2 +- .../objectprint/objectprint.php | 2 +- .../system_coordination/coordinationobj.php | 2 +- 44 files changed, 167 insertions(+), 167 deletions(-) diff --git a/data/static/html/system/error.htm b/data/static/html/system/error.htm index a922f54..009dfb5 100755 --- a/data/static/html/system/error.htm +++ b/data/static/html/system/error.htm @@ -1,6 +1,6 @@ - + -








 Veuillez cliquer sur un dossier
pour accéder à vos outils.
\ No newline at end of file + diff --git a/data/template/default/css/bloc.css b/data/template/default/css/bloc.css index c75b5fd..a46f255 100755 --- a/data/template/default/css/bloc.css +++ b/data/template/default/css/bloc.css @@ -21,7 +21,7 @@ text-align:center; font-size:0.7em; font-weight:bold; - background:url(../../../image/perso.gif) 0 0 no-repeat; + background:url(../../../image/perso.png) 0 0 no-repeat; } diff --git a/data/template/default/css/button.css b/data/template/default/css/button.css index 1de0ce9..c681129 100755 --- a/data/template/default/css/button.css +++ b/data/template/default/css/button.css @@ -23,15 +23,15 @@ {} -.linkview{background: url(../media/picto/view.gif) 0px 0px no-repeat;} -.linkadd{background: url(../media/picto/add.gif) 0px 0px no-repeat;} -.linksave{background: url(../media/picto/update.gif) 0px 0px no-repeat;} -.linkupdate{background: url(../media/picto/update.gif) 0px 0px no-repeat;} -.linkok{background: url(../media/picto/update.gif) 0px 0px no-repeat;} -.linkback{background: url(../media/picto/back.gif) 0px 0px no-repeat;} -.linknext{background: url(../media/picto/next.gif) 0px 0px no-repeat;} -.linkdelete{background: url(../media/picto/delete.gif) 0px 0px no-repeat;} -.linkconfig{background: url(../media/picto/config.gif) 0px 0px no-repeat;} +.linkview{background: url(../media/picto/view.png) 0px 0px no-repeat;} +.linkadd{background: url(../media/picto/add.png) 0px 0px no-repeat;} +.linksave{background: url(../media/picto/update.png) 0px 0px no-repeat;} +.linkupdate{background: url(../media/picto/update.png) 0px 0px no-repeat;} +.linkok{background: url(../media/picto/update.png) 0px 0px no-repeat;} +.linkback{background: url(../media/picto/back.png) 0px 0px no-repeat;} +.linknext{background: url(../media/picto/next.png) 0px 0px no-repeat;} +.linkdelete{background: url(../media/picto/delete.png) 0px 0px no-repeat;} +.linkconfig{background: url(../media/picto/config.png) 0px 0px no-repeat;} /*A utiliser pour les boutons ayant un libellé plus long que les autres */ -.buttonfreesize{background: url(../media/picto/update.gif) #c1d2ee 0 0 no-repeat;} \ No newline at end of file +.buttonfreesize{background: url(../media/picto/update.png) #c1d2ee 0 0 no-repeat;} diff --git a/data/template/default/css/custom.css b/data/template/default/css/custom.css index c9faea2..ec86157 100755 --- a/data/template/default/css/custom.css +++ b/data/template/default/css/custom.css @@ -28,7 +28,7 @@ position: absolute; top: 90px; } #helplink a{ - background: url(../media/picto/help.gif) 0 0 no-repeat ; + background: url(../media/picto/help.png) 0 0 no-repeat ; color: #FFFFFF; font-weight: bold; width: 50px; @@ -179,7 +179,7 @@ margin-left: 205px; margin-bottom: 10px; padding: 5px 5px 5px 24px; margin-top: 3px; - background: url(../media/picto/info.gif) 2px 2px no-repeat; + background: url(../media/picto/info.png) 2px 2px no-repeat; background-color: #c1d2ee; border: 2px solid #333366; font-weight: bold; @@ -339,7 +339,7 @@ margin-left: 205px; } #data .tabledashboard .outilsview{ width: 70%; - /*background: url(../media/picto/fermer.gif) 2px 1px no-repeat;*/ + /*background: url(../media/picto/fermer.png) 2px 1px no-repeat;*/ background-color: #333366; border-left: 1px solid #FFFFFF; border-right: 1px solid #FFFFFF; @@ -349,7 +349,7 @@ margin-left: 205px; } #data .tabledashboard .outilshide{ width: 70%; -/* background: url(../media/picto/view.gif) 0px 0px no-repeat;*/ +/* background: url(../media/picto/view.png) 0px 0px no-repeat;*/ background-color: #333366; border-left: 1px solid #FFFFFF; border-right: 1px solid #FFFFFF; @@ -369,7 +369,7 @@ margin-left: 205px; height: auto; width: 100px; cursor: pointer; - background: url(../media/picto/view.gif) 1px -2px no-repeat; + background: url(../media/picto/view.png) 1px -2px no-repeat; float: right; text-align: right; padding-bottom: 3px; @@ -381,7 +381,7 @@ margin-left: 205px; height: auto; cursor: pointer; width: 100px; - background: url(../media/picto/fermer.gif) 2px -1px no-repeat; + background: url(../media/picto/fermer.png) 2px -1px no-repeat; float: right; text-align: right; padding-bottom: 3px; @@ -419,7 +419,7 @@ margin-left: 205px; font-size: x-small; } #data .tabledashboard .outilstd span{ - background: url(../media/picto/puce.gif) 0px 4px no-repeat; + background: url(../media/picto/puce.png) 0px 4px no-repeat; text-align: left; padding-left: 15px; font-size: x-small; @@ -474,4 +474,4 @@ margin-left: 205px; } /* Element selectionnés des objets de navigation/défaut */ .NavigationSelected{background-color: #E7EAED; font-weight:bold;} -.ObjectSelected{background-color: #E7EAED; font-weight:bold;} \ No newline at end of file +.ObjectSelected{background-color: #E7EAED; font-weight:bold;} diff --git a/data/template/default/css/global.css b/data/template/default/css/global.css index 85c73a0..4866fe0 100755 --- a/data/template/default/css/global.css +++ b/data/template/default/css/global.css @@ -11,19 +11,19 @@ #header{ height: 122px; width: 100%; - background: url(../media/image/haut_fond.gif) 0 0 ; + background: url(../media/image/haut_fond.png) 0 0 ; background-position: left top; } /* Logo */ #logo{ height: 122px; width: 100%; - background: url(../media/image/haut_logo_main.gif) 0 0 no-repeat; + background: url(../media/image/haut_logo_main.png) 0 0 no-repeat; background-position: left top; } /* footer */ #footer{ - background: url(../media/image/bas_fond.gif) 0 0 ; + background: url(../media/image/bas_fond.png) 0 0 ; width: 100%; height: 24px; } @@ -517,7 +517,7 @@ width: 230px; } #data .header p{ display: block; - background: url(../media/picto/puce.gif) 0 2px no-repeat; + background: url(../media/picto/puce.png) 0 2px no-repeat; padding: 0 10px 0 10px; margin-left: 2px; vertical-align: top; @@ -650,4 +650,4 @@ width: 230px; /* * Fin du main -*/ \ No newline at end of file +*/ diff --git a/data/template/default/css/home.css b/data/template/default/css/home.css index 26a7e7b..5afaa38 100755 --- a/data/template/default/css/home.css +++ b/data/template/default/css/home.css @@ -9,7 +9,7 @@ /* Menu de gauche pour l'objet home*/ #toollefthomehaut{ position: absolute; - background: url(../media/image/milieu1.gif) 0 0 repeat; + background: url(../media/image/milieu1.png) 0 0 repeat; background-position: left top; float: left; left: 0; /* IE !!! */ @@ -18,7 +18,7 @@ } #LastCom{ position: relative; - background: url(../media/image/milieu2.gif) 0 0 no-repeat; + background: url(../media/image/milieu2.png) 0 0 no-repeat; width: 40px; height: 180px; left: 0; /* IE !!! */ @@ -26,7 +26,7 @@ } #Basgauche{ position: absolute; - background: url(../media/image/bas_gauche.gif) #233956 0 0 no-repeat; + background: url(../media/image/bas_gauche.png) #233956 0 0 no-repeat; width: 250px; height: 118px; left: 0; /* IE !!! */ @@ -37,7 +37,7 @@ #Basgauche a{font-weight:bold;color:#FFFFFF;} #logoBienvenue{ - background: url(../media/image/bas_bienvenue.gif) #FFFFFF 0 0 no-repeat; + background: url(../media/image/bas_bienvenue.png) #FFFFFF 0 0 no-repeat; display: block; position: absolute; width: 50px; @@ -55,7 +55,7 @@ /* img bas menu gauche */ #toollefthomebas{ position: absolute; - background: url(../media/image/bas_gauche.gif) 0 0 no-repeat; + background: url(../media/image/bas_gauche.png) 0 0 no-repeat; top: 1045px; left: 0; /* IE !!! */ width: 30px; @@ -76,24 +76,24 @@ #headerhome{ height: 122px; width: 100%; - background: url(../media/image/haut_fond.gif) 0 0 ; + background: url(../media/image/haut_fond.png) 0 0 ; background-position: left top; } /* Logo */ #logohome{ height: 122px; width: 100%; - background: url(../media/image/haut_logo.gif) 0 0 no-repeat; + background: url(../media/image/haut_logo.png) 0 0 no-repeat; background-position: left top; } /* footer */ #footerhome{ - background: url(../media/image/bas_fond.gif) 0 0 ; + background: url(../media/image/bas_fond.png) 0 0 ; width: 100%; height: 24px; } #footerlogohome{ - background: url(../media/image/bas.gif) 0 0 ; + background: url(../media/image/bas.png) 0 0 ; width: 710px; height: 24px; } @@ -107,7 +107,7 @@ padding-left: 40px; padding-right: 10px; padding-top: 2px; - background: url(../media/image/milieu1.gif) 0 0 no-repeat; + background: url(../media/image/milieu1.png) 0 0 no-repeat; } #datahome .box{ width: 99%; @@ -272,13 +272,13 @@ width: 230px; } #datahome .cadre1{ - background: url(../media/image/gros_picto.gif) #99CCFF 4px 5px no-repeat; + background: url(../media/image/gros_picto.png) #99CCFF 4px 5px no-repeat; } #datahome .cadre2{ - background: url(../media/image/gros_picto.gif) #9999CC 4px 5px no-repeat; + background: url(../media/image/gros_picto.png) #9999CC 4px 5px no-repeat; } #datahome .cadre3{ - background: url(../media/image/gros_picto.gif) #6699CC 4px 5px no-repeat; + background: url(../media/image/gros_picto.png) #6699CC 4px 5px no-repeat; } /*fin gestion des derniéres communauté*/ @@ -468,7 +468,7 @@ nobr{ /* legende d'un tableau */ #datahome .legend{ - background: url(../media/picto/sort.gif) #FFFFFF 0 2px no-repeat; + background: url(../media/picto/sort.png) #FFFFFF 0 2px no-repeat; border-bottom: 1px solid #333366; height: 22px; } @@ -519,7 +519,7 @@ nobr{ /* gestion des barre d'outils */ /*#data .tool{ - background: url(../media/picto/sort.gif) #c1d2ee 0 2px no-repeat; + background: url(../media/picto/sort.png) #c1d2ee 0 2px no-repeat; border-bottom: 1px solid #333366; padding-left: 20px; height: 22px; @@ -547,4 +547,4 @@ nobr{ /* * Fin du main -*/ \ No newline at end of file +*/ diff --git a/data/template/default/default.css b/data/template/default/default.css index a6d33ae..5350756 100755 --- a/data/template/default/default.css +++ b/data/template/default/default.css @@ -96,7 +96,7 @@ strong, b{ text-align:center; font-size:10px; font-weight:bold; - background:url(../../image/perso.gif) 0 0 no-repeat;*/ + background:url(../../image/perso.png) 0 0 no-repeat;*/ } /* Cadre de connexion */ @@ -350,15 +350,15 @@ strong, b{ {} -.linkview{background: url(media/picto/view.gif) 0px 0px no-repeat;} -.linkadd{background: url(media/picto/add.gif) 0px 0px no-repeat;} -.linksave{background: url(media/picto/update.gif) 0px 0px no-repeat;} -.linkupdate{background: url(media/picto/update.gif) 0px 0px no-repeat;} -.linkok{background: url(media/picto/update.gif) 0px 0px no-repeat;} -.linkback{background: url(media/picto/back.gif) 0px 0px no-repeat;} -.linknext{background: url(media/picto/next.gif) 0px 0px no-repeat;} -.linkdelete{background: url(media/picto/delete.gif) 0px 0px no-repeat;} -.linkconfig{background: url(media/picto/config.gif) 0px 0px no-repeat;} +.linkview{background: url(media/picto/view.png) 0px 0px no-repeat;} +.linkadd{background: url(media/picto/add.png) 0px 0px no-repeat;} +.linksave{background: url(media/picto/update.png) 0px 0px no-repeat;} +.linkupdate{background: url(media/picto/update.png) 0px 0px no-repeat;} +.linkok{background: url(media/picto/update.png) 0px 0px no-repeat;} +.linkback{background: url(media/picto/back.png) 0px 0px no-repeat;} +.linknext{background: url(media/picto/next.png) 0px 0px no-repeat;} +.linkdelete{background: url(media/picto/delete.png) 0px 0px no-repeat;} +.linkconfig{background: url(media/picto/config.png) 0px 0px no-repeat;} /*A utiliser pour les boutons ayant un libellé plus long que les autres */ -.buttonfreesize{background: url(media/picto/update.gif) #c1d2ee 0 0 no-repeat;} \ No newline at end of file +.buttonfreesize{background: url(media/picto/update.png) #c1d2ee 0 0 no-repeat;} diff --git a/data/template/default/object_coordination/adminentrynode/configuration.mxt b/data/template/default/object_coordination/adminentrynode/configuration.mxt index fce88df..04f4c35 100755 --- a/data/template/default/object_coordination/adminentrynode/configuration.mxt +++ b/data/template/default/object_coordination/adminentrynode/configuration.mxt @@ -32,7 +32,7 @@
-
Picto
+
Picto
@@ -92,4 +92,4 @@ function imgPicto() } imgPicto(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/admingroup/actionadmin.mxt b/data/template/default/object_coordination/admingroup/actionadmin.mxt index 2332008..f639547 100755 --- a/data/template/default/object_coordination/admingroup/actionadmin.mxt +++ b/data/template/default/object_coordination/admingroup/actionadmin.mxt @@ -26,7 +26,7 @@
- +
@@ -62,4 +62,4 @@ function imgPicto() } imgPicto(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/admingroup/configuration.mxt b/data/template/default/object_coordination/admingroup/configuration.mxt index e297b35..4feea84 100755 --- a/data/template/default/object_coordination/admingroup/configuration.mxt +++ b/data/template/default/object_coordination/admingroup/configuration.mxt @@ -31,7 +31,7 @@
-
picto
+
picto
@@ -82,4 +82,4 @@ function imgPicto() } imgPicto(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/admingroup/updateadmin.mxt b/data/template/default/object_coordination/admingroup/updateadmin.mxt index 450d667..63a65a9 100755 --- a/data/template/default/object_coordination/admingroup/updateadmin.mxt +++ b/data/template/default/object_coordination/admingroup/updateadmin.mxt @@ -38,7 +38,7 @@
- +
@@ -76,4 +76,4 @@ imgPicto();
-
\ No newline at end of file +
diff --git a/data/template/default/object_coordination/adminnode/actionadmin.mxt b/data/template/default/object_coordination/adminnode/actionadmin.mxt index f20f1b5..bfaed2c 100755 --- a/data/template/default/object_coordination/adminnode/actionadmin.mxt +++ b/data/template/default/object_coordination/adminnode/actionadmin.mxt @@ -21,7 +21,7 @@
-
+
@@ -81,4 +81,4 @@ } imgTemplate(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/adminnode/configuration.mxt b/data/template/default/object_coordination/adminnode/configuration.mxt index d993c35..405f2eb 100755 --- a/data/template/default/object_coordination/adminnode/configuration.mxt +++ b/data/template/default/object_coordination/adminnode/configuration.mxt @@ -30,7 +30,7 @@
-
Picto
+
Picto
@@ -105,4 +105,4 @@ function imgTemplate() } imgTemplate(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/adminnode/updateadmin.mxt b/data/template/default/object_coordination/adminnode/updateadmin.mxt index 3bebed7..5fa0271 100755 --- a/data/template/default/object_coordination/adminnode/updateadmin.mxt +++ b/data/template/default/object_coordination/adminnode/updateadmin.mxt @@ -39,7 +39,7 @@
- +
@@ -99,4 +99,4 @@ imgTemplate();
-
\ No newline at end of file + diff --git a/data/template/default/object_coordination/adminobject/configuration.mxt b/data/template/default/object_coordination/adminobject/configuration.mxt index b6b11e4..dc94934 100755 --- a/data/template/default/object_coordination/adminobject/configuration.mxt +++ b/data/template/default/object_coordination/adminobject/configuration.mxt @@ -30,7 +30,7 @@
-
picto
+
picto
@@ -106,4 +106,4 @@ function imgTemplate() } imgTemplate(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/adminuser/configuration.mxt b/data/template/default/object_coordination/adminuser/configuration.mxt index d980fc0..3d97854 100755 --- a/data/template/default/object_coordination/adminuser/configuration.mxt +++ b/data/template/default/object_coordination/adminuser/configuration.mxt @@ -30,7 +30,7 @@
-
Picto
+
Picto
@@ -78,4 +78,4 @@ function imgPicto() } imgPicto(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/coordinationobj/configuration.mxt b/data/template/default/object_coordination/coordinationobj/configuration.mxt index 036528c..00051d4 100755 --- a/data/template/default/object_coordination/coordinationobj/configuration.mxt +++ b/data/template/default/object_coordination/coordinationobj/configuration.mxt @@ -30,7 +30,7 @@
-
Picto
+
Picto
@@ -73,4 +73,4 @@ function imgPicto() } imgPicto(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/home/actionlecture.mxt b/data/template/default/object_coordination/home/actionlecture.mxt index f6627be..2375b3a 100755 --- a/data/template/default/object_coordination/home/actionlecture.mxt +++ b/data/template/default/object_coordination/home/actionlecture.mxt @@ -2,7 +2,7 @@
- +
@@ -32,7 +32,7 @@



- fin de la présentation + fin de la présentation
@@ -58,4 +58,4 @@ function FselectCom() } } //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/home/formlecture.mxt b/data/template/default/object_coordination/home/formlecture.mxt index b804d3e..6dbc05d 100755 --- a/data/template/default/object_coordination/home/formlecture.mxt +++ b/data/template/default/object_coordination/home/formlecture.mxt @@ -1,7 +1,7 @@

- <mx:text id='messageInscriptionNoeud'/> + <mx:text id='messageInscriptionNoeud'/>

@@ -54,4 +54,4 @@
(*) :
-
[] 
\ No newline at end of file +
[] 
diff --git a/data/template/default/object_coordination/installmanager/beforeinstall.mxt b/data/template/default/object_coordination/installmanager/beforeinstall.mxt index d4095d7..4d358df 100755 --- a/data/template/default/object_coordination/installmanager/beforeinstall.mxt +++ b/data/template/default/object_coordination/installmanager/beforeinstall.mxt @@ -46,7 +46,7 @@ - picto + picto @@ -104,4 +104,4 @@ function visible(element) } } //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/installmanager/beforeuninstall.mxt b/data/template/default/object_coordination/installmanager/beforeuninstall.mxt index 5cb65b5..74d9f9d 100755 --- a/data/template/default/object_coordination/installmanager/beforeuninstall.mxt +++ b/data/template/default/object_coordination/installmanager/beforeuninstall.mxt @@ -66,7 +66,7 @@ - + @@ -134,4 +134,4 @@ function visible(element) } } //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/installmanager/bkpmanageinstall.mxt b/data/template/default/object_coordination/installmanager/bkpmanageinstall.mxt index 013bedd..c5a34e5 100755 --- a/data/template/default/object_coordination/installmanager/bkpmanageinstall.mxt +++ b/data/template/default/object_coordination/installmanager/bkpmanageinstall.mxt @@ -16,7 +16,7 @@

-config.gif +config.png
@@ -174,4 +174,4 @@ function validDoBkp(url) } } //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/installmanager/configuration.mxt b/data/template/default/object_coordination/installmanager/configuration.mxt index 844cc55..a7772e9 100755 --- a/data/template/default/object_coordination/installmanager/configuration.mxt +++ b/data/template/default/object_coordination/installmanager/configuration.mxt @@ -30,7 +30,7 @@
-
Picto
+
Picto
@@ -80,4 +80,4 @@ function imgPicto() } imgPicto(); //--> - \ No newline at end of file + diff --git a/data/template/default/object_coordination/installmanager/listinstall.mxt b/data/template/default/object_coordination/installmanager/listinstall.mxt index 87ffbed..a22339b 100755 --- a/data/template/default/object_coordination/installmanager/listinstall.mxt +++ b/data/template/default/object_coordination/installmanager/listinstall.mxt @@ -36,13 +36,13 @@
@@ -76,13 +76,13 @@ @@ -117,13 +117,13 @@ @@ -157,13 +157,13 @@ @@ -198,13 +198,13 @@ @@ -216,4 +216,4 @@
- + - - + + - +
- + - - + + - +
- + - - + + - +
- + - - + + - +
-
\ No newline at end of file +
diff --git a/data/template/default/object_coordination/usertemp/configuration.mxt b/data/template/default/object_coordination/usertemp/configuration.mxt index 6d73762..4825ac0 100755 --- a/data/template/default/object_coordination/usertemp/configuration.mxt +++ b/data/template/default/object_coordination/usertemp/configuration.mxt @@ -31,7 +31,7 @@
-
Picto
+
Picto
@@ -82,4 +82,4 @@ function imgPicto() imgPicto(); //--> -
\ No newline at end of file +
diff --git a/data/template/default/object_printing/helpprint/helpprint.mxt b/data/template/default/object_printing/helpprint/helpprint.mxt index 57018cd..09be201 100755 --- a/data/template/default/object_printing/helpprint/helpprint.mxt +++ b/data/template/default/object_printing/helpprint/helpprint.mxt @@ -11,7 +11,7 @@
  • - +
    • @@ -53,4 +53,4 @@ function visiblehelp(element,frame) \ No newline at end of file + diff --git a/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt b/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt index 0dade34..cc49742 100755 --- a/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt +++ b/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt @@ -34,7 +34,7 @@
    - Picto + Picto
    diff --git a/data/template/lcube6/object_coordination/installmanager/beforeinstall.mxt b/data/template/lcube6/object_coordination/installmanager/beforeinstall.mxt index 7c40af2..393f45a 100755 --- a/data/template/lcube6/object_coordination/installmanager/beforeinstall.mxt +++ b/data/template/lcube6/object_coordination/installmanager/beforeinstall.mxt @@ -41,7 +41,7 @@ - picto + picto diff --git a/data/template/lcube6/object_coordination/installmanager/beforeuninstall.mxt b/data/template/lcube6/object_coordination/installmanager/beforeuninstall.mxt index a5c41bf..432d935 100755 --- a/data/template/lcube6/object_coordination/installmanager/beforeuninstall.mxt +++ b/data/template/lcube6/object_coordination/installmanager/beforeuninstall.mxt @@ -66,7 +66,7 @@ - + diff --git a/data/template/lcube6/object_coordination/installmanager/bkpmanageinstall.mxt b/data/template/lcube6/object_coordination/installmanager/bkpmanageinstall.mxt index 1b68a2d..d60b7c6 100755 --- a/data/template/lcube6/object_coordination/installmanager/bkpmanageinstall.mxt +++ b/data/template/lcube6/object_coordination/installmanager/bkpmanageinstall.mxt @@ -19,7 +19,7 @@
    - config.gif + config.png
    diff --git a/data/template/lcube6/object_coordination/installmanager/listinstall.mxt b/data/template/lcube6/object_coordination/installmanager/listinstall.mxt index 5c876a5..8783cff 100755 --- a/data/template/lcube6/object_coordination/installmanager/listinstall.mxt +++ b/data/template/lcube6/object_coordination/installmanager/listinstall.mxt @@ -71,13 +71,13 @@ @@ -108,13 +108,13 @@ @@ -145,13 +145,13 @@ @@ -182,13 +182,13 @@ diff --git a/data/template/lcube6/object_printing/helpprint/helpprint.mxt b/data/template/lcube6/object_printing/helpprint/helpprint.mxt index 57018cd..09be201 100755 --- a/data/template/lcube6/object_printing/helpprint/helpprint.mxt +++ b/data/template/lcube6/object_printing/helpprint/helpprint.mxt @@ -11,7 +11,7 @@
    • - +
      • @@ -53,4 +53,4 @@ function visiblehelp(element,frame) - \ No newline at end of file + diff --git a/install/db_scripts/mysql/7_insert_datas.sql b/install/db_scripts/mysql/7_insert_datas.sql index e56af7f..a076b08 100755 --- a/install/db_scripts/mysql/7_insert_datas.sql +++ b/install/db_scripts/mysql/7_insert_datas.sql @@ -94,22 +94,22 @@ INSERT INTO `{_PREFIX_}package_user_space` VALUES (1, 1, 0, 2147483647); #-- #-- Contenu de la table `coordination_object` #-- -INSERT INTO `{_PREFIX_}coordination_object` VALUES (1, '0000-00-00 00:00:00', 2, 3, 'defaultobject.gif', 'adminobject', '\n\r\n\r\r\n c. Gérer les outils\r\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a333a7b733a31323a22746162466f7262696464656e223b613a303a7b7d733a373a2267726f75704964223b733a313a2231223b733a363a226e6f64654964223b733a313a2231223b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (3, '0000-00-00 00:00:00', 2, 100, 'defaultobject.gif', 'home', '\r\n\r\n\r\n Accueil\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a303a7b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (4, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'adminnode', '\r\n\r\n\r\n b. Gérer les espaces\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a333a7b733a373a2267726f75704964223b693a313b733a363a226e6f64654964223b733a313a2231223b733a383a2274656d706c617465223b613a313a7b693a303b733a373a2264656661756c74223b7d7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (5, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'addcom', '\r\n\r\n\r\n a. Créer une communauté\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a303a7b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (6, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'admingroup', '\r\n\r\n\r\n d. Gérer les groupes\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a313a7b733a373a2267726f75704964223b733a313a2231223b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (7, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'adminentrynode', '\r\n\r\n\r\n e. Gérer les accès\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a323a7b733a373a2267726f75704964223b733a313a2231223b733a363a226e6f64654964223b733a313a2231223b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (8, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'adminuser', '\r\n\r\n\r\n f. Gérer les comptes\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a313a7b733a373a2267726f75704964223b733a313a2231223b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (35, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'installmanager', '\r\n\r\n\r\n g. Gérer les mises à jour\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a333a7b733a333a22667470223b733a31373a226d616a2e6772616e69776172652e6e6574223b733a353a226c6f67696e223b733a363a22737461626c65223b733a363a22706173737764223b733a363a22737461626c65223b7d); -INSERT INTO `{_PREFIX_}coordination_object` VALUES (2, '0000-00-00 00:00:00', 2, 99, 'defaultobject.gif', 'community', '\r\n\r\n\r\n Les communautés\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a303a7b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (1, '0000-00-00 00:00:00', 2, 3, 'defaultobject.png', 'adminobject', '\n\r\n\r\r\n c. Gérer les outils\r\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a333a7b733a31323a22746162466f7262696464656e223b613a303a7b7d733a373a2267726f75704964223b733a313a2231223b733a363a226e6f64654964223b733a313a2231223b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (3, '0000-00-00 00:00:00', 2, 100, 'defaultobject.png', 'home', '\r\n\r\n\r\n Accueil\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a303a7b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (4, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'adminnode', '\r\n\r\n\r\n b. Gérer les espaces\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a333a7b733a373a2267726f75704964223b693a313b733a363a226e6f64654964223b733a313a2231223b733a383a2274656d706c617465223b613a313a7b693a303b733a373a2264656661756c74223b7d7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (5, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'addcom', '\r\n\r\n\r\n a. Créer une communauté\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a303a7b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (6, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'admingroup', '\r\n\r\n\r\n d. Gérer les groupes\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a313a7b733a373a2267726f75704964223b733a313a2231223b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (7, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'adminentrynode', '\r\n\r\n\r\n e. Gérer les accès\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a323a7b733a373a2267726f75704964223b733a313a2231223b733a363a226e6f64654964223b733a313a2231223b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (8, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'adminuser', '\r\n\r\n\r\n f. Gérer les comptes\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a313a7b733a373a2267726f75704964223b733a313a2231223b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (35, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'installmanager', '\r\n\r\n\r\n g. Gérer les mises à jour\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a333a7b733a333a22667470223b733a31373a226d616a2e6772616e69776172652e6e6574223b733a353a226c6f67696e223b733a363a22737461626c65223b733a363a22706173737764223b733a363a22737461626c65223b7d); +INSERT INTO `{_PREFIX_}coordination_object` VALUES (2, '0000-00-00 00:00:00', 2, 99, 'defaultobject.png', 'community', '\r\n\r\n\r\n Les communautés\r\n\r\n\r\n', '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0x613a303a7b7d); #----------------------------------------------------------- #-- #-- Contenu de la table `group` #-- INSERT INTO `{_PREFIX_}group` VALUES (1, 0, '\r\n\r\n\r\nTous les utilisateurs\r\n\r\n\r\n', ''); INSERT INTO `{_PREFIX_}group` VALUES (2, 1, '\r\n\r\n\r\nAnonyme\r\n\r\n\r\n', ''); -INSERT INTO `{_PREFIX_}group` VALUES (3, 1, '\r\n\r\n\r\nAdministrateur\r\n\r\n\r\n', 'defaultnode.gif'); +INSERT INTO `{_PREFIX_}group` VALUES (3, 1, '\r\n\r\n\r\nAdministrateur\r\n\r\n\r\n', 'defaultnode.png'); #----------------------------------------------------------- #-- #-- Contenu de la table `group_user` @@ -125,11 +125,11 @@ INSERT INTO `{_PREFIX_}langue` VALUES (1, '\r\n\r\n\r\nRacine\r\n\r\n\r\n', 'orange08.gif', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); +INSERT INTO `{_PREFIX_}node` VALUES (1, 0, '\r\n\r\n\r\nRacine\r\n\r\n\r\n', 'orange08.png', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); INSERT INTO `{_PREFIX_}node` VALUES (2, 1, '\r\n\r\n\r\nAnonyme\r\n\r\n\r\n', 'blockdevice.png', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); -INSERT INTO `{_PREFIX_}node` VALUES (3, 1, '\r\n\r\n\r\nAdministration\r\n\r\n\r\n', 'orange15.gif', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); -INSERT INTO `{_PREFIX_}node` VALUES (99, 3, '\r\n\r\n\r\nConfiguration\r\n\r\n\r\n', 'defaultnode.gif', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); -INSERT INTO `{_PREFIX_}node` VALUES (100, 3, '\r\n\r\n\r\nSite public\r\n\r\n\r\n', 'defaultnode.gif', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); +INSERT INTO `{_PREFIX_}node` VALUES (3, 1, '\r\n\r\n\r\nAdministration\r\n\r\n\r\n', 'orange15.png', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); +INSERT INTO `{_PREFIX_}node` VALUES (99, 3, '\r\n\r\n\r\nConfiguration\r\n\r\n\r\n', 'defaultnode.png', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); +INSERT INTO `{_PREFIX_}node` VALUES (100, 3, '\r\n\r\n\r\nSite public\r\n\r\n\r\n', 'defaultnode.png', 'lcube6', 'www.qware.fr', 'off', 'default', '', 0, 0, 0, ''); #----------------------------------------------------------- #-- #-- Contenu de la table `node_group_user` diff --git a/install/media/install.css b/install/media/install.css index 45f732e..1f42a90 100755 --- a/install/media/install.css +++ b/install/media/install.css @@ -117,7 +117,7 @@ strong #top{ /* display:block; background-color: transparent;*/ -/* background: url(haut_logo.gif); +/* background: url(haut_logo.png); width: 620px; height: 122px;*/ } diff --git a/lib/object_coordination/addcom/addcom.php b/lib/object_coordination/addcom/addcom.php index 3cebb52..4c5ff76 100755 --- a/lib/object_coordination/addcom/addcom.php +++ b/lib/object_coordination/addcom/addcom.php @@ -177,7 +177,7 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad } $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", '', $tabIcone, 'Icône de la communauté', '', 'id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); - $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.gif", getMessage("PreviewPicto")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.png", getMessage("PreviewPicto")); $GLOBALS['SYSTEM_TEMPLATE']->MxText("txtNodeType", getMessage("txtNodeType")); $GLOBALS['SYSTEM_TEMPLATE']->MxText("txtNodeTypereg", getMessage("txtNodeTypereg")); diff --git a/lib/object_coordination/admingroup/admingroup.php b/lib/object_coordination/admingroup/admingroup.php index 0a2e366..bb28628 100755 --- a/lib/object_coordination/admingroup/admingroup.php +++ b/lib/object_coordination/admingroup/admingroup.php @@ -127,9 +127,9 @@ Class AdminGroup extends CoordinationObj } @closedir($handle); asort($tabIcone); -// if ( $Node->getIcone() == "") $nodeIcone = "defaultnode.gif"; else $nodeIcone = $Node->getIcone(); +// if ( $Node->getIcone() == "") $nodeIcone = "defaultnode.png"; else $nodeIcone = $Node->getIcone(); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", '', $tabIcone, 'Icône du groupe', '', 'id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("TxtPictoGroup"), ENT_QUOTES)."\"", getMessage("TxtPictoGroup")); - $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.gif", getMessage("PreviewPicto")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.png", getMessage("PreviewPicto")); for ($i=0; $igetIcone() == "") $groupIcone = "defaultnode.gif"; else $groupIcone = $Group->getIcone(); + if ( $Group->getIcone() == "") $groupIcone = "defaultnode.png"; else $groupIcone = $Group->getIcone(); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("ToHidde".".icone", "iconeN", $groupIcone, $tabIcone, '', '', 'id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("ToHidde.pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/".$groupIcone, getMessage("PreviewPicto")); diff --git a/lib/object_coordination/adminnode/adminnode.php b/lib/object_coordination/adminnode/adminnode.php index 019d3e3..01962cc 100755 --- a/lib/object_coordination/adminnode/adminnode.php +++ b/lib/object_coordination/adminnode/adminnode.php @@ -162,7 +162,7 @@ Class AdminNode extends CoordinationObj $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("template", "template_name", '', $tabTemplate, '', '', 'id="template"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTemplate"), ENT_QUOTES)."\"", getMessage("txtNodeTemplate")); $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("screenTemplate", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."preview.png", getMessage("PreviewTemplate")); - $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.gif", getMessage("PreviewPicto")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.png", getMessage("PreviewPicto")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ctype", "text", "node_ctype", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeType"), ENT_QUOTES)."\"", getMessage("txtNodeType")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ctypereg", "text", "node_ctypereg", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTypereg"), ENT_QUOTES)."\"", getMessage("txtNodeTypereg")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("domain", "text", "node_domain", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeDomain"), ENT_QUOTES)."\"", getMessage("txtNodeDomain")); @@ -342,7 +342,7 @@ Class AdminNode extends CoordinationObj @closedir($handle); asort($tabIcone); // var_dump($Node->getIcone()); - if ( $Node->getIcone() == "") $nodeIcone = "defaultnode.gif"; else $nodeIcone = $Node->getIcone(); + if ( $Node->getIcone() == "") $nodeIcone = "defaultnode.png"; else $nodeIcone = $Node->getIcone(); // var_dump($nodeIcone); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("ToHidde".".icone", "iconeN", $nodeIcone, $tabIcone, '', '', 'id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); diff --git a/lib/object_coordination/adminobject/adminobject.php b/lib/object_coordination/adminobject/adminobject.php index 5fe79c9..ee394ce 100755 --- a/lib/object_coordination/adminobject/adminobject.php +++ b/lib/object_coordination/adminobject/adminobject.php @@ -164,7 +164,7 @@ Class AdminObject extends CoordinationObj $GLOBALS['SYSTEM_TEMPLATE']->MxText("langCode", $currentCode); - $GLOBALS['SYSTEM_TEMPLATE']->MxText("CurrentTemplate", $GLOBALS['CONF_DATA_PATH']."data/image/icons/object/defaultobject.gif"); + $GLOBALS['SYSTEM_TEMPLATE']->MxText("CurrentTemplate", $GLOBALS['CONF_DATA_PATH']."data/image/icons/object/defaultobject.png"); if($optList==0) { @@ -273,7 +273,7 @@ Class AdminObject extends CoordinationObj { $img=$GLOBALS['CONF_DATA_PATH']."data/image/icons/object/".$tabObject[$i]->getIcone(); }else{ - $img=$GLOBALS['CONF_DATA_PATH']."data/image/icons/object/defaultobject.gif"; + $img=$GLOBALS['CONF_DATA_PATH']."data/image/icons/object/defaultobject.png"; } /* gestion de la template */ diff --git a/lib/object_printing/currentcoordinationobjprint/currentcoordinationobjprint.php b/lib/object_printing/currentcoordinationobjprint/currentcoordinationobjprint.php index a475373..fb6fc0b 100755 --- a/lib/object_printing/currentcoordinationobjprint/currentcoordinationobjprint.php +++ b/lib/object_printing/currentcoordinationobjprint/currentcoordinationobjprint.php @@ -115,7 +115,7 @@ class CurrentCoordinationObjPrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/".strtolower($node->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.png"; } if ($node->getLibelle($currentCode) != "") @@ -148,7 +148,7 @@ class CurrentCoordinationObjPrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/".strtolower($GLOBALS["SYSTEM_CONTROL"]->currentCoordinationObject->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.png"; } if ($GLOBALS["SYSTEM_CONTROL"]->currentCoordinationObject->getName($currentCode) != "") @@ -156,7 +156,7 @@ class CurrentCoordinationObjPrint extends Printing else $name = $GLOBALS["SYSTEM_CONTROL"]->currentCoordinationObject->getName($defaultCode); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.png"; $name=""; } /*Fonction permettant de supprimer les numéros, le point et l'espace à l'affichage*/ diff --git a/lib/object_printing/navigationnodeprint/navigationnodeprint.php b/lib/object_printing/navigationnodeprint/navigationnodeprint.php index 8e1921a..2423f2a 100755 --- a/lib/object_printing/navigationnodeprint/navigationnodeprint.php +++ b/lib/object_printing/navigationnodeprint/navigationnodeprint.php @@ -77,7 +77,7 @@ class NavigationNodePrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/".strtolower($Node->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.png"; } $urlToGo = formatUrlNode("navigationNode", $Node->getId()); @@ -154,7 +154,7 @@ class NavigationNodePrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/".strtolower($tabNode[$i]->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.png"; } $urlToGo = formatUrlNode("navigationNode", $tabNode[$i]->getId()); diff --git a/lib/object_printing/navigationprint/navigationprint.php b/lib/object_printing/navigationprint/navigationprint.php index 6d3f24f..1937585 100755 --- a/lib/object_printing/navigationprint/navigationprint.php +++ b/lib/object_printing/navigationprint/navigationprint.php @@ -79,7 +79,7 @@ class NavigationPrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/".strtolower($Node->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/defaultnode.png"; } // BLOC INFOS UTILISATEUR @@ -298,7 +298,7 @@ class NavigationPrint extends Printing { $img="data/image/icons/node/".strtolower($tabObj[$i]->getIcone()); }else{ - $img="data/image/icons/node/defaultnode.gif"; + $img="data/image/icons/node/defaultnode.png"; } /* on prepare l'url */ @@ -363,7 +363,7 @@ class NavigationPrint extends Printing { $img="data/image/icons/object/".strtolower($tabObj[$i][1]->getIcone()); }else{ - $img="data/image/icons/object/defaultobject.gif"; + $img="data/image/icons/object/defaultobject.png"; } $urlToGo = formatUrl($tabObj[$i][1]->getId(), $tabObj[$i][0]->getClassName(), $tabObj[$i][0]->getMethodName(),"","",$tabObj[$i][0]->getNodeId()); diff --git a/lib/object_printing/objectentrynodeprint/objectentrynodeprint.php b/lib/object_printing/objectentrynodeprint/objectentrynodeprint.php index e950421..911e954 100755 --- a/lib/object_printing/objectentrynodeprint/objectentrynodeprint.php +++ b/lib/object_printing/objectentrynodeprint/objectentrynodeprint.php @@ -110,7 +110,7 @@ class ObjectEntryNodePrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/".strtolower($tabObject[$i][1]->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.png"; } $urlToGo = formatUrl($tabObject[$i][1]->getId(), $tabObject[$i][0]->getClassName(), $tabObject[$i][0]->getMethodName()); diff --git a/lib/object_printing/objectprint/objectprint.php b/lib/object_printing/objectprint/objectprint.php index bd77b1a..5062f58 100755 --- a/lib/object_printing/objectprint/objectprint.php +++ b/lib/object_printing/objectprint/objectprint.php @@ -118,7 +118,7 @@ class ObjectPrint extends Printing { $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/".($tabObject[$i][1]->getIcone()); }else{ - $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.gif"; + $img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.png"; } $urlToGo = formatUrl($tabObject[$i][1]->getId(), $tabObject[$i][0]->getClassName(), $tabObject[$i][0]->getMethodName(),"","",$tabObject[$i][0]->getNodeId()); diff --git a/lib/system/system_coordination/coordinationobj.php b/lib/system/system_coordination/coordinationobj.php index ecf7560..0c9ce76 100755 --- a/lib/system/system_coordination/coordinationobj.php +++ b/lib/system/system_coordination/coordinationobj.php @@ -572,7 +572,7 @@ var $archivage= null; } @closedir($handle); asort($tabIcone); - if ( $this->getIcone() == "") $nodeIcone = "defaultobject.gif"; else $nodeIcone = $this->getIcone(); + if ( $this->getIcone() == "") $nodeIcone = "defaultobject.png"; else $nodeIcone = $this->getIcone(); $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", $nodeIcone, $tabIcone, 'Icône de l\'espace', '', 'onchange="javascript:imgPicto();" id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("TxtImage"), ENT_QUOTES)."\"", getMessage("TxtImage")); $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $chemintotal.$nodeIcone, $nodeIcone, "name=\"pictoObject\" id=\"pictoObject\"");
    - + - - + + - +
    - + - - + + - +
    - + - - + + - +