Changeset 193

Timestamp:

01/23/07 16:01:47 (2 years ago)

Author:

ludo

Message:

group menu changes must be confirmed (from r3937)

Files:

• trunk/webmin/lbs/cron/index.cgi (modified) (1 diff)
• trunk/webmin/lbs/debian/changelog (modified) (1 diff)
• trunk/webmin/lbs/details.cgi (modified) (2 diffs)
• trunk/webmin/lbs/lang/en (modified) (1 diff)
• trunk/webmin/lbs/lang/fr (modified) (1 diff)
• trunk/webmin/lbs/lbs.pl (modified) (5 diffs)
• trunk/webmin/lbs/log.cgi (modified) (5 diffs)
• trunk/webmin/lbs/module.info (modified) (1 diff)

trunk/webmin/lbs/cron/index.cgi

@@ -56 +56 @@
-                        $donehead = 1;
-                        }
+                if (!($job->{'command'} =~ /\/wake/)) { next; }
-                print "<tr $cb>\n";
-                if ($i == 0 && @ulist != 1) {

trunk/webmin/lbs/debian/changelog

@@ -1 @@
-7
+8
-
-  * New release.

trunk/webmin/lbs/details.cgi

@@ -52 +52 @@
-
-$conf =~ s/[^a-z0-9_\/-]//gi;
-conf =~ /imgbase/
-detail
+in{'full'} && $in{'full'} == 1
+log
-} else {
-
-
+
+
+
+
-}
-
-bootmenu_save_edit_conf($conf, $lbs_home);
-bootmenu_save_postinst($conf, $lbs_home);
-
-$conf =~ m|([^/]+)/?$|;
@@ -134 +133 @@
-                
-                if ($lrsgznbd) {
-
+ || $type eq "LVM"
-                        push @view, "<a href=\"mountpart.cgi?part=$in{conf}/$file\">View !</a>";
-                    } else {

trunk/webmin/lbs/lang/en

@@ -181 +181 @@
-msg_sync_ok=Synchronization or every client from the profile / group <b>$1</b> done.
-msg_synchro_warn=WARNING: the menu for every client of this profile / group will be reset !
+msg_menu_warn=WARNING: the menu for every client of this profile / group will be modified ! Are you sure to continue ?
-
-postinst_autogenerated=Auto-generated from the webmin interface on $1

trunk/webmin/lbs/lang/fr

@@ -182 +182 @@
-msg_synchro_ok=Synchronisation des machines du profil / groupe <b>$1</b> effectuée.
-msg_synchro_warn=ATTENTION: le menu de chaque machine de ce profil / groupe sera remis à zéro !
+msg_menu_warn=ATTENTION: le menu de chaque client de ce profil / groupe sera modifié ! Etes-vous sûr de vouloir continuer ?
-
-postinst_autogenerated=Auto-généré par l'interface webmin le $1

trunk/webmin/lbs/lbs.pl

@@ -87 +87 @@
-
-                $mvmac = "";
-
+ && $k ne "Postinst"
-                        $delicon = "trash.gif";
-                        $mvicon = "up1.gif";
@@ -107 +107 @@
-                }
-
-
+ && $k ne "Postinst"
-                        my $sname = $first;
-                        $sname =~ s/.*\///;
@@ -440 +440 @@
-        'border'    => "border=1 width='100%'",
-);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        print "<div id=\"tooltip\" style=\" position: absolute; visibility: hidden;\"></div>\n";
-        # Le tableau des menus  
@@ -494 +507 @@
-        print lbs_common::make_html_table( "", \@toprow, \@lol, \%tabattr );
-        
+        my $confirm = "";
-        if ($mac) {
-                print "<input type=hidden name=mac value=\"$mac\">\n";
@@ -499 +513 @@
-                print "<input type=hidden name=group value=\"$group\">\n";
-                print "<input type=hidden name=profile value=\"$profile\">\n";
+                $confirm = "onclick=\"return confirmSub()\">";
-        }
-        print "<input type=hidden name=form value=\"bootmenu\">\n";
->
+ $confirm
-        print "<input type=submit name=sync value=\"$text{'but_sync'}\">\n";
-        print "<input type=submit name=cancel value=\"$text{'but_return'}\">\n";

trunk/webmin/lbs/log.cgi

@@ -34 +34 @@
-lbs_common::InClean();
-
-
+ $last_st
-
-cookie_send_group(%in);
@@ -112 +112 @@
-        my $all = read_file_lines($file);
-        my $num = @$all;
+        $last_st = "";
-        my $last1 = &logfile2txt(@$all[$num-1]) if ($num >= 1);
-        my $last2 = &logfile2txt(@$all[$num-2]) if ($num >= 2);
@@ -153 +154 @@
-      $log .= " ".$text{'lab_partition'}." ".$$l[0];
-    }
+    if (-r $dir."/log.txt") {
+      $dir =~ s/$lbs_home//;
+      $log .= " <a href='details.cgi?mac=$mac&full=1&conf=$dir/'><img src='images/detail-small.gif'></a>";
+    }
-  }
-
@@ -183 +188 @@
-  foreach my $key (keys %trans) {
-    if ($log =~ /($key) ?(.*)/) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return $log;
-}
@@ -271 +287 @@
-      my $all = read_file_lines($file);
-      #my $num = @$all;
+      $last_st = "";
-
-      print "<h2>$text{lab_status}:</h2>";

trunk/webmin/lbs/module.info

@@ -7 +7 @@
-
-depends=0.94 lbs_common proc at
-7
+8