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
1=== modified file 'plugins/language/english/english.txt'
2--- plugins/language/english/english.txt 2010-06-20 17:43:46 +0000
3+++ plugins/language/english/english.txt 2010-06-21 10:37:27 +0000
4@@ -1012,6 +1012,7 @@
5 1117 E-mail
6 1118 Edit
7 1119 Select
8+1120 Quantity
9
10 5000 [DEBUG]computers insertions request =>[DEBUG]
11 5001 [DEBUG]REQUEST MADE => [DEBUG]
12
13=== modified file 'plugins/language/french/french.txt'
14--- plugins/language/french/french.txt 2010-06-21 08:09:14 +0000
15+++ plugins/language/french/french.txt 2010-06-21 10:37:27 +0000
16@@ -1037,6 +1037,7 @@
17 1117 E-mail
18 1118 Editer
19 1119 Sélectionner
20+1120 Quantité
21
22 5000 [DEBUG]requête d'insertion de machines =>[DEBUG]
23 5001 [DEBUG]REQUETE JOUEE => [DEBUG]
24
25=== modified file 'plugins/language/italian/italian.txt'
26--- plugins/language/italian/italian.txt 2010-06-20 17:43:46 +0000
27+++ plugins/language/italian/italian.txt 2010-06-21 10:37:27 +0000
28@@ -204,7 +204,7 @@
29 293 Tipi unità di rete
30 294 Nomi sottoreti
31 295 Fai click per modificare
32-296 Uid
33+296 Id
34 297 Non è possibile scrivere nella directory
35 298 Tutti i campi devono essere riempiti
36 299 Indirizzo IP errato (deve essere: x.x.x.x)
37@@ -213,7 +213,7 @@
38 302 La rete è stata eliminata
39 303 Aggiungi una sottorete
40 304 Nome rete
41-305 Uid
42+305 Reparto
43 306 Elenco sotterete
44 307 Aggiungi un tipo
45 308 Nome tipo
46@@ -978,7 +978,8 @@
47 1083 Identificazione del perimetro
48 1084 Nome del gruppo per test
49 1085 Nome del gruppo per la restrizione del perimetro
50-1086 Valore dell'etichetta per test
51+1086 Nome dell'etichetta di definizione dei parametri
52+1087 Valore dell'etichetta per test
53 1088 Valore dell'etichetta per la restrizione del perimetro
54 1089 Nessuno stato è attivo. Inizia attivandone uno.
55 1090 E' stata modificata la richiesta n°
56@@ -1011,6 +1012,7 @@
57 1117 E-mail
58 1118 Modifica
59 1119 Seleziona
60+1120 Quantità
61
62 5000 [DEBUG]computers insertions request =>[DEBUG]
63 5001 [DEBUG]REQUEST MADE => [DEBUG]
64
65=== modified file 'plugins/main_sections/ms_admininfo/ms_admininfo.php'
66--- plugins/main_sections/ms_admininfo/ms_admininfo.php 2010-06-07 10:14:29 +0000
67+++ plugins/main_sections/ms_admininfo/ms_admininfo.php 2010-06-21 10:37:27 +0000
68@@ -145,7 +145,7 @@
69 <table width='60%'>
70 <tr>
71 <td align='right' width='50%'>
72- <font face='Verdana' size='-1'>".$l->g(228)." :&nbsp;&nbsp;&nbsp;&nbsp;</font>
73+ <font face='Verdana' size='-1'>".$l->g(228).":&nbsp;&nbsp;&nbsp;&nbsp;</font>
74 </td>
75 <td width='50%' align='left'><input size=40 name='nom'>
76 </td>
77
78=== modified file 'plugins/main_sections/ms_all_soft/ms_all_soft.php'
79--- plugins/main_sections/ms_all_soft/ms_all_soft.php 2009-11-13 10:57:00 +0000
80+++ plugins/main_sections/ms_all_soft/ms_all_soft.php 2010-06-21 10:37:27 +0000
81@@ -137,6 +137,8 @@
82 $list_col_cant_del=$default_fields;
83 $tab_options['LIEN_LBL']['nbre']='index.php?'.PAG_INDEX.'='.$pages_refs['ms_multi_search'].'&prov=allsoft&value=';
84 $tab_options['LIEN_CHAMP']['nbre']='name';
85+ $tab_options['LBL']['name']=$l->g(847);
86+ $tab_options['LBL']['nbre']=$l->g(1120);
87 //$tab_options['nbre'][]
88 $result_exist=tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$sql,$form_name,80,$tab_options);
89 }
90
91=== modified file 'plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php'
92--- plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php 2010-01-26 15:18:13 +0000
93+++ plugins/main_sections/ms_ipdiscover/ms_ipdiscover.php 2010-06-21 10:37:27 +0000
94@@ -29,7 +29,7 @@
95 foreach ($dpt as $key=>$value){
96 $list_index[$key]=$value;
97 }
98- echo $l->g(562).show_modif($list_index,'DPT_CHOISE',2,$form_name);
99+ echo $l->g(562)." ".show_modif($list_index,'DPT_CHOISE',2,$form_name);
100 }
101 if (isset($protectedPost['DPT_CHOISE']) and $protectedPost['DPT_CHOISE'] != ''){
102
103
104=== modified file 'plugins/main_sections/ms_multi_search/ms_multi_search.php'
105--- plugins/main_sections/ms_multi_search/ms_multi_search.php 2010-03-30 17:39:41 +0000
106+++ plugins/main_sections/ms_multi_search/ms_multi_search.php 2010-06-21 10:37:27 +0000
107@@ -866,7 +866,7 @@
108 }
109 }
110 $protectedPost['multiSearch']=$l->g(32);
111-$aff_field_search= $l->g(31).":".show_modif($optArray_trait,'multiSearch',2,$form_name,array('DEFAULT'=>'NO'));
112+$aff_field_search= $l->g(31).": ".show_modif($optArray_trait,'multiSearch',2,$form_name,array('DEFAULT'=>'NO'));
113 $aff_field_search.="<img src='image/delete_all.png' onclick='pag(\"ok\",\"reset\",\"".$form_name."\");' alt='".$l->g(41)."'>";
114 echo "<table border=1 class='mlt_bordure' WIDTH = '75%' ALIGN = 'Center' CELLPADDING='5'>";
115 echo "<tr><td colspan=100 align=center bgcolor='#FFFFFF'>".$aff_field_search."</td></tr>";
116
117=== modified file 'plugins/main_sections/ms_search_soft/ms_search_soft.php'
118--- plugins/main_sections/ms_search_soft/ms_search_soft.php 2010-05-19 06:42:36 +0000
119+++ plugins/main_sections/ms_search_soft/ms_search_soft.php 2010-06-21 10:37:27 +0000
120@@ -27,7 +27,7 @@
121
122 //echo "\n".'<body>';
123 //echo "\n".'<div id="en-tete"><p><img src="intranet.gif" alt="intranet" id="intranet" /></p></div>';
124-echo "\n".'<i>Logiciel : ';
125+echo "\n".'<i>'.$l->g(20).": ";
126 //echo "\n".'</i><select name="logiciel_select" >'."\n";
127
128 // voir fontion.php
129@@ -40,7 +40,7 @@
130 //echo "\n".'<form method="post" name="form-test" id="form-test" >';
131 //echo "\n".'<input type="hidden" name="ms_options" id="ms_options" value="index.php?function=search_soft_option&no_header=1">';
132 echo "\n".'<br><br><input type="text" name="logiciel_text" value="'.$protectedPost['logiciel_text'].'" id="champ-texte" size="15"/>';
133-echo "\n".'<br><input type="submit" id="bouton-submit" value="Afficher" name="bouton-submit">';
134+echo "\n".'<br><input type="submit" id="bouton-submit" value="'.$l->g(965).'" name="bouton-submit">';
135 //echo "\n".'</form>';
136
137
138@@ -66,7 +66,7 @@
139 if ((isset($protectedPost['logiciel_select']) and $protectedPost['logiciel_select'] != '')
140 or (isset($protectedPost['logiciel_text']) and $protectedPost['logiciel_text'] != '')) //logiciel du select name='logiciel'
141 {
142- echo "\n".'<input type="button" id="bouton-print" value="Imprimer" onclick="imprime_zone(\'tableau\',\'fr\');">';
143+ echo "\n".'<input type="button" id="bouton-print" value="'.$l->g(214).'" onclick="imprime_zone(\'tableau\',\'fr\');">';
144
145 if (isset($protectedPost['logiciel_select']) and $protectedPost['logiciel_select'] != '')
146 $logiciel=$protectedPost['logiciel_select'];
147@@ -97,6 +97,13 @@
148 $queryDetails.= " FROM hardware h ,softwares a
149 WHERE a.HARDWARE_ID =h.ID and a.NAME='".$logiciel."'";
150
151+ $tab_options['LBL']['NAME']=$l->g(478);
152+ $tab_options['LBL']['ip']=$l->g(176);
153+ $tab_options['LBL']['domaine']=$l->g(680);
154+ $tab_options['LBL']['snom']=$l->g(847);
155+ $tab_options['LBL']['sversion']=$l->g(848);
156+ $tab_options['LBL']['sfold']=$l->g(849);
157+
158 tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$queryDetails,$form_name,80,$tab_options);
159
160 //creerTableau($logiciel);
161
162=== modified file 'require/function_table_html.php'
163--- require/function_table_html.php 2010-06-20 17:43:46 +0000
164+++ require/function_table_html.php 2010-06-21 10:37:27 +0000
165@@ -560,7 +560,7 @@
166 echo "<table cellspacing='5' width='".$taille_cadre."%' BORDER='0' ALIGN = 'Center' CELLPADDING='0' BGCOLOR='".$bgcolor."' BORDERCOLOR='".$bordercolor."'><tr><td align=center>";
167 //$machNmb = array(5,10,15,20,50,100,200,300,500,800,1000);
168 $machNmb = array(5=>5,10=>10,15=>15,20=>20,50=>50,100=>100,200=>200);
169- $pcParPageHtml= $l->g(340).":".show_modif($machNmb,'pcparpage',2,$form_name,array('DEFAULT'=>'NO'));
170+ $pcParPageHtml= $l->g(340).": ".show_modif($machNmb,'pcparpage',2,$form_name,array('DEFAULT'=>'NO'));
171 $pcParPageHtml .= "</td></tr></table>
172 </td></tr><tr><td align=center>";
173 echo $pcParPageHtml;
174@@ -743,7 +743,7 @@
175
176 }
177 if (is_array ($list_rest)){
178- $select_restCol= $l->g(349).":".show_modif($list_rest,'restCol'.$tab_name,2,$form_name);
179+ $select_restCol= $l->g(349).": ".show_modif($list_rest,'restCol'.$tab_name,2,$form_name);
180 $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>
181 echo $select_restCol;
182 }else

Subscribers

People subscribed via source and target branches