/[smecontribs]/rpms/smeserver-dar2/contribs7/smeserver-dar2-0.0.1-add2general.patch
ViewVC logotype

Contents of /rpms/smeserver-dar2/contribs7/smeserver-dar2-0.0.1-add2general.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Fri Apr 25 00:11:07 2008 UTC (16 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-dar2-0_0_1-11_el4_sme, smeserver-dar2-0_0_1-14_el4_sme, smeserver-dar2-0_0_1-16_el4_sme, smeserver-dar2-0_0_1-15_el4_sme, smeserver-dar2-0_0_1-19_el4_sme, smeserver-dar2-0_0_1-10_el4_sme, smeserver-dar2-0_0_1-17_el4_sme, smeserver-dar2-0_0_1-18_el4_sme
Changes since 1.1: +169 -1488 lines 
Fix patch
1 --- smeserver-dar2-0.0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/dar2.pm.add2general 2008-04-24 22:10:39.000000000 +0200
2 +++ smeserver-dar2-0.0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/dar2.pm 2008-04-24 23:02:27.000000000 +0200
3 @@ -217,10 +217,10 @@
4 print " <tr>\n <td colspan=\"2\">\n ";
5 print $q->start_table ({-CLASS => "sme-border"}),"\n ";
6 print $q->Tr(
7 - esmith::cgi::genSmallCell($q, $self->localise('LABEL_JOBNAME'),"header"),
8 - esmith::cgi::genSmallCell($q, $self->localise('LABEL_DESCRIPTION'),"header"),
9 - esmith::cgi::genSmallCell($q, $self->localise('LABEL_TARGET'), "header"),
10 - esmith::cgi::genSmallCell($q, $self->localise('LABEL_ACTION'),"header",4));
11 + esmith::cgi::genSmallCell($q, $self->localise('JOBNAME'),"header"),
12 + esmith::cgi::genSmallCell($q, $self->localise('DESCRIPTION'),"header"),
13 + esmith::cgi::genSmallCell($q, $self->localise('TARGET'), "header"),
14 + esmith::cgi::genSmallCell($q, $self->localise('ACTION'),"header",4));
15
16 my $scriptname = basename($0);
17 my $index=0;
18 @@ -233,7 +233,7 @@
19 my $Target = $rec->prop("Target");
20 my $modify = $self->localise('MODIFY');
21 my $backup = $self->localise('BACKUP');
22 - my $restore = $self->localise('LABEL_RESTORE');
23 + my $restore = $self->localise('RESTORE');
24 my $remove = $self->localise('REMOVE');
25 my $href = "$scriptname?page=0&page_stack=&Next=Next&wherenext";
26
27 --- smeserver-dar2-0.0.1/root/etc/e-smith/web/functions/dar2.add2general 2006-10-11 21:21:00.000000000 +0200
28 +++ smeserver-dar2-0.0.1/root/etc/e-smith/web/functions/dar2 2008-04-24 23:01:04.000000000 +0200
29 @@ -40,7 +40,7 @@
30 size="25"
31 value=""
32 validation="nonblank">
33 - <label>LABEL_JOBNAME</label>
34 + <label>JOBNAME</label>
35 <description>DESCRIPTION_JOBNAME</description>
36 </field>
37
38 @@ -50,7 +50,7 @@
39 size="50"
40 value=""
41 validation="nonblank">
42 - <label>LABEL_DESCRIPTION</label>
43 + <label>DESCRIPTION</label>
44 <description>DESCRIPTION_DESC</description>
45 </field>
46
47 @@ -59,7 +59,7 @@
48 id="backup"
49 value="get_drbackup()"
50 validation="nonblank">
51 - <label>LABEL_BACKUP</label>
52 + <label>BACKUP</label>
53 <description>DESCRIPTION_BACKUP</description>
54 </field>
55
56 @@ -68,7 +68,7 @@
57 id="prune"
58 value=""
59 validation="">
60 - <label>LABEL_PRUNE</label>
61 + <label>PRUNE</label>
62 <description>DESCRIPTION_PRUNE</description>
63 </field>
64
65 @@ -77,7 +77,7 @@
66 id="exclude"
67 value=""
68 validation="">
69 - <label>LABEL_EXCLUDE</label>
70 + <label>EXCLUDE</label>
71 <description>DESCRIPTION_EXCLUDE</description>
72 </field>
73
74 @@ -87,7 +87,7 @@
75 size="50"
76 value=""
77 validation="">
78 - <label>LABEL_TARGET</label>
79 + <label>TARGET</label>
80 <description>DESCRIPTION_TARGET</description>
81 </field>
82
83 @@ -97,7 +97,7 @@
84 size="25"
85 value=""
86 validation="">
87 - <label>LABEL_USERNAME</label>
88 + <label>USERNAME</label>
89 </field>
90
91 <field
92 @@ -106,7 +106,7 @@
93 size="25"
94 value=""
95 validation="">
96 - <label>LABEL_PASSWORD</label>
97 + <label>PASSWORD</label>
98 </field>
99
100 <field
101 @@ -117,7 +117,7 @@
102 'smbfs' => 'smbfs'"
103 value="smbfs"
104 validation="nonblank">
105 - <label>LABEL_VFSTYPE</label>
106 + <label>VFSTYPE</label>
107 <description>DESCRIPTION_VFSTYPE</description>
108 </field>
109
110 @@ -127,7 +127,7 @@
111 size="3"
112 value="650"
113 validation="zero_or_positive()">
114 - <label>LABEL_SLICE</label>
115 + <label>SLICE</label>
116 <description>DESCRIPTION_SLICE</description>
117 </field>
118
119 @@ -137,7 +137,7 @@
120 options="0,1,2,3,4,5,6,7,8,9"
121 value="0"
122 validation="zero_or_positive()">
123 - <label>LABEL_COMPRESSION</label>
124 + <label>COMPRESSION</label>
125 <description>DESCRIPTION_COMPRESSION</description>
126 </field>
127
128 @@ -147,7 +147,7 @@
129 size="3"
130 value="0"
131 validation="zero_or_positive()">
132 - <label>LABEL_EXPIRY</label>
133 + <label>EXPIRY</label>
134 <description>DESCRIPTION_EXPIRY</description>
135 </field>
136
137 @@ -157,7 +157,7 @@
138 options="'on','off'"
139 value="off"
140 validation="nonblank">
141 - <label>LABEL_VERBOSE</label>
142 + <label>VERBOSE</label>
143 <description>DESCRIPTION_VERBOSE</description>
144 </field>
145
146 @@ -167,7 +167,7 @@
147 options="'manual','*','MON','TUE','WED','THU','FRI','SAT','SUN'"
148 value="manual"
149 validation="nonblank">
150 - <label>LABEL_BACKUP_DAY</label>
151 + <label>BACKUP_DAY</label>
152 <description>DESCRIPTION_BACKUP_DAY</description>
153 </field>
154
155 @@ -177,7 +177,7 @@
156 size="5"
157 value="23:30"
158 validation="">
159 - <label>LABEL_BACKUP_TIME</label>
160 + <label>BACKUP_TIME</label>
161 <description>DESCRIPTION_BACKUP_TIME</description>
162 </field>
163
164 @@ -193,7 +193,7 @@
165 <field
166 type="literal"
167 id="jobname">
168 - <label>LABEL_JOBNAME</label>
169 + <label>JOBNAME</label>
170 </field>
171
172 <field
173 @@ -202,7 +202,7 @@
174 size="50"
175 value="get_description_value()"
176 validation="nonblank">
177 - <label>LABEL_DESCRIPTION</label>
178 + <label>DESCRIPTION</label>
179 </field>
180
181 <field
182 @@ -210,7 +210,7 @@
183 id="backup"
184 value="get_backup_value()"
185 validation="nonblank">
186 - <label>LABEL_BACKUP</label>
187 + <label>BACKUP</label>
188 </field>
189
190 <field
191 @@ -218,7 +218,7 @@
192 id="prune"
193 value="get_prune_value()"
194 validation="">
195 - <label>LABEL_PRUNE</label>
196 + <label>PRUNE</label>
197 </field>
198
199 <field
200 @@ -226,7 +226,7 @@
201 id="exclude"
202 value="get_exclude_value()"
203 validation="">
204 - <label>LABEL_EXCLUDE</label>
205 + <label>EXCLUDE</label>
206 </field>
207
208
209 @@ -236,7 +236,7 @@
210 size="50"
211 value="get_target_value()"
212 validation="">
213 - <label>LABEL_TARGET</label>
214 + <label>TARGET</label>
215 </field>
216
217 <field
218 @@ -245,7 +245,7 @@
219 size="25"
220 value="get_username_value()"
221 validation="">
222 - <label>LABEL_USERNAME</label>
223 + <label>USERNAME</label>
224 </field>
225
226 <field
227 @@ -254,7 +254,7 @@
228 size="25"
229 value="get_password_value()"
230 validation="">
231 - <label>LABEL_PASSWORD</label>
232 + <label>PASSWORD</label>
233 </field>
234
235 <field
236 @@ -265,7 +265,7 @@
237 'smbfs' => 'smbfs'"
238 value="get_vfstype_value()"
239 validation="nonblank">
240 - <label>LABEL_VFSTYPE</label>
241 + <label>VFSTYPE</label>
242 </field>
243
244 <field
245 @@ -274,7 +274,7 @@
246 size="3"
247 value="get_slice_value()"
248 validation="zero_or_positive()">
249 - <label>LABEL_SLICE</label>
250 + <label>SLICE</label>
251 </field>
252
253 <field
254 @@ -283,7 +283,7 @@
255 options="0,1,2,3,4,5,6,7,8,9"
256 value="get_compression_value()"
257 validation="zero_or_positive()">
258 - <label>LABEL_COMPRESSION</label>
259 + <label>COMPRESSION</label>
260 </field>
261
262 <field
263 @@ -292,7 +292,7 @@
264 size="3"
265 value="get_expiry_value()"
266 validation="zero_or_positive()">
267 - <label>LABEL_EXPIRY</label>
268 + <label>EXPIRY</label>
269 </field>
270
271 <field
272 @@ -301,7 +301,7 @@
273 options="'on','off'"
274 value="get_verbose_value()"
275 validation="nonblank">
276 - <label>LABEL_VERBOSE</label>
277 + <label>VERBOSE</label>
278 </field>
279
280 <field
281 @@ -310,7 +310,7 @@
282 options="'manual','*','MON','TUE','WED','THU','FRI','SAT','SUN'"
283 value="get_backupday_value()"
284 validation="nonblank">
285 - <label>LABEL_BACKUP_DAY</label>
286 + <label>BACKUP_DAY</label>
287 </field>
288
289 <field
290 @@ -319,7 +319,7 @@
291 size="5"
292 value="get_backuptime_value()"
293 validation="nonblank">
294 - <label>LABEL_BACKUP_TIME</label>
295 + <label>BACKUP_TIME</label>
296 </field>
297
298 <subroutine src="print_button('SAVE')" />
299 @@ -334,7 +334,7 @@
300 <field
301 type="literal"
302 id="jobname">
303 - <label>LABEL_JOBNAME</label>
304 + <label>JOBNAME</label>
305 </field>
306
307 <field
308 @@ -343,7 +343,7 @@
309 size="10"
310 value=""
311 validation="nonblank">
312 - <label>LABEL_RESTORE_DATE</label>
313 + <label>RESTORE_DATE</label>
314 <description>DESCRIPTION_RESTORE_DATE</description>
315 </field>
316
317 @@ -353,7 +353,7 @@
318 options="'Enabled','Disabled'"
319 value="Disabled"
320 validation="nonblank">
321 - <label>LABEL_RESTORE_DR</label>
322 + <label>RESTORE_DR</label>
323 <description>DESCRIPTION_RESTORE_DR</description>
324 </field>
325
326 @@ -362,7 +362,7 @@
327 id="restore"
328 value=""
329 validation="nonblank">
330 - <label>LABEL_RESTORE</label>
331 + <label>RESTORE</label>
332 </field>
333
334 <field
335 @@ -371,7 +371,7 @@
336 size="25"
337 value=""
338 validation="nonblank">
339 - <label>LABEL_RESTORE_RESTORETO</label>
340 + <label>RESTORE_RESTORETO</label>
341 </field>
342
343 <subroutine src="print_button('PERFORM')" />
344 @@ -386,21 +386,21 @@
345 <field
346 type="literal"
347 id="jobname">
348 - <label>LABEL_JOBNAME</label>
349 + <label>JOBNAME</label>
350 </field>
351
352 <field
353 type="literal"
354 id="description"
355 value="get_description_value()">
356 - <label>LABEL_DESCRIPTION</label>
357 + <label>DESCRIPTION</label>
358 </field>
359
360 <field
361 type="literal"
362 id="target"
363 value="get_target_value()">
364 - <label>LABEL_TARGET</label>
365 + <label>TARGET</label>
366 </field>
367
368 <subroutine src="print_button('PERFORM')" />
369 @@ -415,21 +415,21 @@
370 <field
371 type="literal"
372 id="jobname">
373 - <label>LABEL_JOBNAME</label>
374 + <label>JOBNAME</label>
375 </field>
376
377 <field
378 type="literal"
379 id="description"
380 value="get_description_value()">
381 - <label>LABEL_DESCRIPTION</label>
382 + <label>DESCRIPTION</label>
383 </field>
384
385 <field
386 type="literal"
387 id="target"
388 value="get_target_value()">
389 - <label>LABEL_TARGET</label>
390 + <label>TARGET</label>
391 </field>
392
393 <subroutine src="print_button('PERFORM')" />
394 --- smeserver-dar2-0.0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/dar2.fix 2008-04-24 18:03:29.000000000 -0600
395 +++ smeserver-dar2-0.0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/dar2 2008-04-24 18:09:38.000000000 -0600
396 @@ -1,23 +1,9 @@
397 <lexicon lang="en-us">
398 <entry>
399 - <base>SAVE</base>
400 - <trans>Save</trans>
401 - </entry>
402 - <entry>
403 - <base>PERFORM</base>
404 - <trans>Perform</trans>
405 - </entry>
406 - <entry>
407 <base>FORM_TITLE</base>
408 <trans>Disk ARchive</trans>
409 </entry>
410 <entry>
411 - <base>OPERATION_STATUS_REPORT</base>
412 - <trans>
413 - Operation status report
414 - </trans>
415 - </entry>
416 - <entry>
417 <base>FORM_DESCRIPTION</base>
418 <trans>
419 <![CDATA[
420 @@ -34,22 +20,10 @@
421 <trans>There are no backup jobs in the system.</trans>
422 </entry>
423 <entry>
424 - <base>LABEL_ACTION</base>
425 - <trans>Action</trans>
426 - </entry>
427 - <entry>
428 <base>MODIFY</base>
429 <trans>View/Modify</trans>
430 </entry>
431 <entry>
432 - <base>BACKUP</base>
433 - <trans>Backup</trans>
434 - </entry>
435 - <entry>
436 - <base>REMOVE</base>
437 - <trans>Remove</trans>
438 - </entry>
439 - <entry>
440 <base>CREATE_TITLE</base>
441 <trans>Create backup job</trans>
442 </entry>
443 @@ -70,79 +44,59 @@
444 <trans>Remove backup job</trans>
445 </entry>
446 <entry>
447 - <base>LABEL_JOBNAME</base>
448 + <base>JOBNAME</base>
449 <trans>Job name</trans>
450 </entry>
451 <entry>
452 - <base>LABEL_DESTINATION</base>
453 - <trans>Destination</trans>
454 - </entry>
455 - <entry>
456 - <base>LABEL_BACKUP</base>
457 + <base>BACKUP</base>
458 <trans>Backup selections</trans>
459 </entry>
460 <entry>
461 - <base>LABEL_EXCLUDE</base>
462 + <base>EXCLUDE</base>
463 <trans>Exclude files</trans>
464 </entry>
465 <entry>
466 - <base>LABEL_PRUNE</base>
467 + <base>PRUNE</base>
468 <trans>Prune directories</trans>
469 </entry>
470 <entry>
471 - <base>LABEL_TARGET</base>
472 + <base>TARGET</base>
473 <trans>Target</trans>
474 </entry>
475 <entry>
476 - <base>LABEL_SLICE</base>
477 + <base>SLICE</base>
478 <trans>Slice size</trans>
479 </entry>
480 <entry>
481 - <base>LABEL_VFSTYPE</base>
482 + <base>VFSTYPE</base>
483 <trans>File system</trans>
484 </entry>
485
486 <entry>
487 - <base>LABEL_COMPRESSION</base>
488 + <base>COMPRESSION</base>
489 <trans>Compression</trans>
490 </entry>
491 <entry>
492 - <base>LABEL_USERNAME</base>
493 + <base>USERNAME</base>
494 <trans>Username</trans>
495 </entry>
496 <entry>
497 - <base>LABEL_PASSWORD</base>
498 - <trans>Password</trans>
499 - </entry>
500 - <entry>
501 - <base>LABEL_DESCRIPTION</base>
502 - <trans>Description</trans>
503 - </entry>
504 - <entry>
505 - <base>LABEL_EXPIRY</base>
506 + <base>EXPIRY</base>
507 <trans>Expiry</trans>
508 </entry>
509 <entry>
510 - <base>LABEL_VERBOSE</base>
511 + <base>VERBOSE</base>
512 <trans>Verbose</trans>
513 </entry>
514 <entry>
515 - <base>LABEL_BACKUP_DAY</base>
516 + <base>BACKUP_DAY</base>
517 <trans>Backup day</trans>
518 </entry>
519 <entry>
520 - <base>LABEL_BACKUP_TIME</base>
521 + <base>BACKUP_TIME</base>
522 <trans>Backup time</trans>
523 </entry>
524 <entry>
525 - <base>DISABLED</base>
526 - <trans>Disabled</trans>
527 - </entry>
528 - <entry>
529 - <base>ENABLED</base>
530 - <trans>Enabled</trans>
531 - </entry>
532 - <entry>
533 <base>LOCALDRIVE</base>
534 <trans>Local drive</trans>
535 </entry>
536 @@ -165,7 +119,7 @@
537 </trans>
538 </entry>
539 <entry>
540 - <base>LABEL_RESTORE_DATE</base>
541 + <base>RESTORE_DATE</base>
542 <trans>Date</trans>
543 </entry>
544 <entry>
545 @@ -185,15 +139,11 @@
546 </trans>
547 </entry>
548 <entry>
549 - <base>LABEL_RESTORE_DR</base>
550 + <base>RESTORE_DR</base>
551 <trans>Disaster Recovery</trans>
552 </entry>
553 <entry>
554 - <base>LABEL_RESTORE</base>
555 - <trans>Restore</trans>
556 - </entry>
557 - <entry>
558 - <base>LABEL_RESTORE_RESTORETO</base>
559 + <base>RESTORE_RESTORETO</base>
560 <trans>Restore to</trans>
561 </entry>
562 <entry>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed