OCS Inventory: OCSReports

Merge lp:~pieroliste/ocsinventory-ocsreports/trunk into lp:ocsinventory-ocsreports

  1. trunk
  2. Merge into trunk
Proposed by Pierfrancesco Passerini
Status: Merged
Merged at revision: 392
Proposed branch: lp:~pieroliste/ocsinventory-ocsreports/trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: 182 lines (+24/-11)
9 files modified
plugins/language/english/english.txt (+1/-0)
plugins/language/french/french.txt (+1/-0)
plugins/language/italian/italian.txt (+5/-3)
plugins/main_sections/ms_admininfo/ms_admininfo.php (+1/-1)
plugins/main_sections/ms_all_soft/ms_all_soft.php (+2/-0)
plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php (+1/-1)
plugins/main_sections/ms_multi_search/ms_multi_search.php (+1/-1)
plugins/main_sections/ms_search_soft/ms_search_soft.php (+10/-3)
require/function_table_html.php (+2/-2)
To merge this branch: bzr merge lp:~pieroliste/ocsinventory-ocsreports/trunk
Reviewer Review Type Date Requested Status
OCS Inventory Dev Team Pending
Review via email: mp+28044@code.launchpad.net

Description of the change

Small fix to interface & translation updates

To post a comment you must log in.
lp:~pieroliste/ocsinventory-ocsreports/trunk updated
392. By Erwan

small fix and use language files.
tx to Pierfrancesco Passerini

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/language/english/english.txt'
--- plugins/language/english/english.txt 2010-06-20 17:43:46 +0000
+++ plugins/language/english/english.txt 2010-06-21 10:37:27 +0000
@@ -1012,6 +1012,7 @@
10121117 E-mail10121117 E-mail
10131118 Edit10131118 Edit
10141119 Select10141119 Select
10151120 Quantity
10151016
10165000 [DEBUG]computers insertions request =>[DEBUG]10175000 [DEBUG]computers insertions request =>[DEBUG]
10175001 [DEBUG]REQUEST MADE => [DEBUG]10185001 [DEBUG]REQUEST MADE => [DEBUG]
10181019
=== modified file 'plugins/language/french/french.txt'
--- plugins/language/french/french.txt 2010-06-21 08:09:14 +0000
+++ plugins/language/french/french.txt 2010-06-21 10:37:27 +0000
@@ -1037,6 +1037,7 @@
10371117 E-mail10371117 E-mail
10381118 Editer10381118 Editer
10391119 Sélectionner10391119 Sélectionner
10401120 Quantité
10401041
10415000 [DEBUG]requête d'insertion de machines =>[DEBUG]10425000 [DEBUG]requête d'insertion de machines =>[DEBUG]
10425001 [DEBUG]REQUETE JOUEE => [DEBUG]10435001 [DEBUG]REQUETE JOUEE => [DEBUG]
10431044
=== modified file 'plugins/language/italian/italian.txt'
--- plugins/language/italian/italian.txt 2010-06-20 17:43:46 +0000
+++ plugins/language/italian/italian.txt 2010-06-21 10:37:27 +0000
@@ -204,7 +204,7 @@
204293 Tipi unità di rete204293 Tipi unità di rete
205294 Nomi sottoreti205294 Nomi sottoreti
206295 Fai click per modificare206295 Fai click per modificare
207296 Uid207296 Id
208297 Non è possibile scrivere nella directory208297 Non è possibile scrivere nella directory
209298 Tutti i campi devono essere riempiti209298 Tutti i campi devono essere riempiti
210299 Indirizzo IP errato (deve essere: x.x.x.x)210299 Indirizzo IP errato (deve essere: x.x.x.x)
@@ -213,7 +213,7 @@
213302 La rete è stata eliminata213302 La rete è stata eliminata
214303 Aggiungi una sottorete214303 Aggiungi una sottorete
215304 Nome rete215304 Nome rete
216305 Uid216305 Reparto
217306 Elenco sotterete217306 Elenco sotterete
218307 Aggiungi un tipo218307 Aggiungi un tipo
219308 Nome tipo219308 Nome tipo
@@ -978,7 +978,8 @@
9781083 Identificazione del perimetro9781083 Identificazione del perimetro
9791084 Nome del gruppo per test9791084 Nome del gruppo per test
9801085 Nome del gruppo per la restrizione del perimetro9801085 Nome del gruppo per la restrizione del perimetro
9811086 Valore dell'etichetta per test9811086 Nome dell'etichetta di definizione dei parametri
9821087 Valore dell'etichetta per test
9821088 Valore dell'etichetta per la restrizione del perimetro9831088 Valore dell'etichetta per la restrizione del perimetro
9831089 Nessuno stato è attivo. Inizia attivandone uno.9841089 Nessuno stato è attivo. Inizia attivandone uno.
9841090 E' stata modificata la richiesta n°9851090 E' stata modificata la richiesta n°
@@ -1011,6 +1012,7 @@
10111117 E-mail10121117 E-mail
10121118 Modifica10131118 Modifica
10131119 Seleziona10141119 Seleziona
10151120 Quantità
10141016
10155000 [DEBUG]computers insertions request =>[DEBUG]10175000 [DEBUG]computers insertions request =>[DEBUG]
10165001 [DEBUG]REQUEST MADE => [DEBUG]10185001 [DEBUG]REQUEST MADE => [DEBUG]
10171019
=== modified file 'plugins/main_sections/ms_admininfo/ms_admininfo.php'
--- plugins/main_sections/ms_admininfo/ms_admininfo.php 2010-06-07 10:14:29 +0000
+++ plugins/main_sections/ms_admininfo/ms_admininfo.php 2010-06-21 10:37:27 +0000
@@ -145,7 +145,7 @@
145 <table width='60%'>145 <table width='60%'>
146 <tr>146 <tr>
147 <td align='right' width='50%'>147 <td align='right' width='50%'>
148 <font face='Verdana' size='-1'>".$l->g(228)." :&nbsp;&nbsp;&nbsp;&nbsp;</font>148 <font face='Verdana' size='-1'>".$l->g(228).":&nbsp;&nbsp;&nbsp;&nbsp;</font>
149 </td>149 </td>
150 <td width='50%' align='left'><input size=40 name='nom'>150 <td width='50%' align='left'><input size=40 name='nom'>
151 </td>151 </td>
152152
=== modified file 'plugins/main_sections/ms_all_soft/ms_all_soft.php'
--- plugins/main_sections/ms_all_soft/ms_all_soft.php 2009-11-13 10:57:00 +0000
+++ plugins/main_sections/ms_all_soft/ms_all_soft.php 2010-06-21 10:37:27 +0000
@@ -137,6 +137,8 @@
137 $list_col_cant_del=$default_fields;137 $list_col_cant_del=$default_fields;
138 $tab_options['LIEN_LBL']['nbre']='index.php?'.PAG_INDEX.'='.$pages_refs['ms_multi_search'].'&prov=allsoft&value=';138 $tab_options['LIEN_LBL']['nbre']='index.php?'.PAG_INDEX.'='.$pages_refs['ms_multi_search'].'&prov=allsoft&value=';
139 $tab_options['LIEN_CHAMP']['nbre']='name';139 $tab_options['LIEN_CHAMP']['nbre']='name';
140 $tab_options['LBL']['name']=$l->g(847);
141 $tab_options['LBL']['nbre']=$l->g(1120);
140 //$tab_options['nbre'][]142 //$tab_options['nbre'][]
141 $result_exist=tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$sql,$form_name,80,$tab_options); 143 $result_exist=tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$sql,$form_name,80,$tab_options);
142}144}
143145
=== modified file 'plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php'
--- plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php 2010-01-26 15:18:13 +0000
+++ plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php 2010-06-21 10:37:27 +0000
@@ -29,7 +29,7 @@
29 foreach ($dpt as $key=>$value){29 foreach ($dpt as $key=>$value){
30 $list_index[$key]=$value;30 $list_index[$key]=$value;
31 }31 }
32 echo $l->g(562).show_modif($list_index,'DPT_CHOISE',2,$form_name);32 echo $l->g(562)." ".show_modif($list_index,'DPT_CHOISE',2,$form_name);
33 }33 }
34 if (isset($protectedPost['DPT_CHOISE']) and $protectedPost['DPT_CHOISE'] != ''){34 if (isset($protectedPost['DPT_CHOISE']) and $protectedPost['DPT_CHOISE'] != ''){
35 35
3636
=== modified file 'plugins/main_sections/ms_multi_search/ms_multi_search.php'
--- plugins/main_sections/ms_multi_search/ms_multi_search.php 2010-03-30 17:39:41 +0000
+++ plugins/main_sections/ms_multi_search/ms_multi_search.php 2010-06-21 10:37:27 +0000
@@ -866,7 +866,7 @@
866 }866 }
867}867}
868$protectedPost['multiSearch']=$l->g(32);868$protectedPost['multiSearch']=$l->g(32);
869$aff_field_search= $l->g(31).":".show_modif($optArray_trait,'multiSearch',2,$form_name,array('DEFAULT'=>'NO'));869$aff_field_search= $l->g(31).": ".show_modif($optArray_trait,'multiSearch',2,$form_name,array('DEFAULT'=>'NO'));
870$aff_field_search.="<img src='image/delete_all.png' onclick='pag(\"ok\",\"reset\",\"".$form_name."\");' alt='".$l->g(41)."'>";870$aff_field_search.="<img src='image/delete_all.png' onclick='pag(\"ok\",\"reset\",\"".$form_name."\");' alt='".$l->g(41)."'>";
871echo "<table border=1 class='mlt_bordure' WIDTH = '75%' ALIGN = 'Center' CELLPADDING='5'>";871echo "<table border=1 class='mlt_bordure' WIDTH = '75%' ALIGN = 'Center' CELLPADDING='5'>";
872echo "<tr><td colspan=100 align=center bgcolor='#FFFFFF'>".$aff_field_search."</td></tr>";872echo "<tr><td colspan=100 align=center bgcolor='#FFFFFF'>".$aff_field_search."</td></tr>";
873873
=== modified file 'plugins/main_sections/ms_search_soft/ms_search_soft.php'
--- plugins/main_sections/ms_search_soft/ms_search_soft.php 2010-05-19 06:42:36 +0000
+++ plugins/main_sections/ms_search_soft/ms_search_soft.php 2010-06-21 10:37:27 +0000
@@ -27,7 +27,7 @@
2727
28//echo "\n".'<body>';28//echo "\n".'<body>';
29//echo "\n".'<div id="en-tete"><p><img src="intranet.gif" alt="intranet" id="intranet" /></p></div>';29//echo "\n".'<div id="en-tete"><p><img src="intranet.gif" alt="intranet" id="intranet" /></p></div>';
30echo "\n".'<i>Logiciel : ';30echo "\n".'<i>'.$l->g(20).": ";
31//echo "\n".'</i><select name="logiciel_select" >'."\n";31//echo "\n".'</i><select name="logiciel_select" >'."\n";
3232
33// voir fontion.php33// voir fontion.php
@@ -40,7 +40,7 @@
40//echo "\n".'<form method="post" name="form-test" id="form-test" >';40//echo "\n".'<form method="post" name="form-test" id="form-test" >';
41//echo "\n".'<input type="hidden" name="ms_options" id="ms_options" value="index.php?function=search_soft_option&no_header=1">';41//echo "\n".'<input type="hidden" name="ms_options" id="ms_options" value="index.php?function=search_soft_option&no_header=1">';
42echo "\n".'<br><br><input type="text" name="logiciel_text" value="'.$protectedPost['logiciel_text'].'" id="champ-texte" size="15"/>';42echo "\n".'<br><br><input type="text" name="logiciel_text" value="'.$protectedPost['logiciel_text'].'" id="champ-texte" size="15"/>';
43echo "\n".'<br><input type="submit" id="bouton-submit" value="Afficher" name="bouton-submit">';43echo "\n".'<br><input type="submit" id="bouton-submit" value="'.$l->g(965).'" name="bouton-submit">';
44//echo "\n".'</form>';44//echo "\n".'</form>';
4545
4646
@@ -66,7 +66,7 @@
66if ((isset($protectedPost['logiciel_select']) and $protectedPost['logiciel_select'] != '')66if ((isset($protectedPost['logiciel_select']) and $protectedPost['logiciel_select'] != '')
67 or (isset($protectedPost['logiciel_text']) and $protectedPost['logiciel_text'] != '')) //logiciel du select name='logiciel'67 or (isset($protectedPost['logiciel_text']) and $protectedPost['logiciel_text'] != '')) //logiciel du select name='logiciel'
68 {68 {
69 echo "\n".'<input type="button" id="bouton-print" value="Imprimer" onclick="imprime_zone(\'tableau\',\'fr\');">';69 echo "\n".'<input type="button" id="bouton-print" value="'.$l->g(214).'" onclick="imprime_zone(\'tableau\',\'fr\');">';
70 70
71 if (isset($protectedPost['logiciel_select']) and $protectedPost['logiciel_select'] != '')71 if (isset($protectedPost['logiciel_select']) and $protectedPost['logiciel_select'] != '')
72 $logiciel=$protectedPost['logiciel_select'];72 $logiciel=$protectedPost['logiciel_select'];
@@ -97,6 +97,13 @@
97 $queryDetails.= " FROM hardware h ,softwares a97 $queryDetails.= " FROM hardware h ,softwares a
98 WHERE a.HARDWARE_ID =h.ID and a.NAME='".$logiciel."'";98 WHERE a.HARDWARE_ID =h.ID and a.NAME='".$logiciel."'";
99 99
100 $tab_options['LBL']['NAME']=$l->g(478);
101 $tab_options['LBL']['ip']=$l->g(176);
102 $tab_options['LBL']['domaine']=$l->g(680);
103 $tab_options['LBL']['snom']=$l->g(847);
104 $tab_options['LBL']['sversion']=$l->g(848);
105 $tab_options['LBL']['sfold']=$l->g(849);
106
100 tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$queryDetails,$form_name,80,$tab_options);107 tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$queryDetails,$form_name,80,$tab_options);
101108
102 //creerTableau($logiciel);109 //creerTableau($logiciel);
103110
=== modified file 'require/function_table_html.php'
--- require/function_table_html.php 2010-06-20 17:43:46 +0000
+++ require/function_table_html.php 2010-06-21 10:37:27 +0000
@@ -560,7 +560,7 @@
560 echo "<table cellspacing='5' width='".$taille_cadre."%' BORDER='0' ALIGN = 'Center' CELLPADDING='0' BGCOLOR='".$bgcolor."' BORDERCOLOR='".$bordercolor."'><tr><td align=center>";560 echo "<table cellspacing='5' width='".$taille_cadre."%' BORDER='0' ALIGN = 'Center' CELLPADDING='0' BGCOLOR='".$bgcolor."' BORDERCOLOR='".$bordercolor."'><tr><td align=center>";
561 //$machNmb = array(5,10,15,20,50,100,200,300,500,800,1000);561 //$machNmb = array(5,10,15,20,50,100,200,300,500,800,1000);
562 $machNmb = array(5=>5,10=>10,15=>15,20=>20,50=>50,100=>100,200=>200);562 $machNmb = array(5=>5,10=>10,15=>15,20=>20,50=>50,100=>100,200=>200);
563 $pcParPageHtml= $l->g(340).":".show_modif($machNmb,'pcparpage',2,$form_name,array('DEFAULT'=>'NO'));563 $pcParPageHtml= $l->g(340).": ".show_modif($machNmb,'pcparpage',2,$form_name,array('DEFAULT'=>'NO'));
564 $pcParPageHtml .= "</td></tr></table>564 $pcParPageHtml .= "</td></tr></table>
565 </td></tr><tr><td align=center>";565 </td></tr><tr><td align=center>";
566 echo $pcParPageHtml;566 echo $pcParPageHtml;
@@ -743,7 +743,7 @@
743743
744 }744 }
745 if (is_array ($list_rest)){745 if (is_array ($list_rest)){
746 $select_restCol= $l->g(349).":".show_modif($list_rest,'restCol'.$tab_name,2,$form_name);746 $select_restCol= $l->g(349).": ".show_modif($list_rest,'restCol'.$tab_name,2,$form_name);
747 $select_restCol .= "<a href=# OnClick='pag(\"".$tab_name."\",\"RAZ\",\"".$id_form."\");'><img src=image/supp.png></a></td></tr></table>"; //</td></tr><tr><td align=center>747 $select_restCol .= "<a href=# OnClick='pag(\"".$tab_name."\",\"RAZ\",\"".$id_form."\");'><img src=image/supp.png></a></td></tr></table>"; //</td></tr><tr><td align=center>
748 echo $select_restCol;748 echo $select_restCol;
749 }else749 }else

Subscribers

People subscribed via source and target branches