ebl Can modify client list group for a specific client

     Disable use of Enabled flag in volume mgnt
     Add comment field to client_group

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6414 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index e8e704e7cec13ec2ab60065f9bb032af55ad4711..55a68d114890f2939d07029210e38e807a6efcb4 100755 (executable)
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -113,6 +113,12 @@ if ($action eq 'begin') {          # main display
 } elsif ($action eq 'client') {        
     $bweb->display_clients();
 
+} elsif ($action eq 'client_edit') {
+    $bweb->client_edit();
+
+} elsif ($action eq 'client_save') {
+    $bweb->client_save();
+
 } elsif ($action eq 'pool') {
     $bweb->display_pool();
 
@@ -266,7 +272,7 @@ if ($action eq 'begin') {           # main display
        $bweb->update_slots();
     }
     print "</div><div style='float: left;margin-left: 20px;'>";
-    $bweb->move_media('no');   # enabled = no
+    $bweb->move_media('yes');  # pb with enabled = no for restore
     print "</div>";
 
 } elsif ($action eq 'move_email') {

diff --git a/gui/bweb/lang/en/tpl/client_list.tpl b/gui/bweb/lang/en/tpl/client_list.tpl
index 7688b667bbaa292425691b84e5062be5bce88449..498db47df69d80798308ffe2e5ac34ae9c2fbf2a 100644 (file)
--- a/gui/bweb/lang/en/tpl/client_list.tpl
+++ b/gui/bweb/lang/en/tpl/client_list.tpl
@@ -12,8 +12,10 @@
 <!--        <h1>Actions</h1> -->       
        <button type="submit" class="bp" name='action' value='job' title="Show last job"> <img src='/bweb/zoom.png' alt=''>Last jobs</button>
        <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Show current job'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
+       <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Show client status'> <img src='/bweb/zoom.png' alt=''>Status </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Client stats'> <img src='/bweb/chart.png' alt=''>Stats </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit </button>
         </div>
 
 </form>

diff --git a/gui/bweb/lang/en/tpl/move_media.tpl b/gui/bweb/lang/en/tpl/move_media.tpl
index 9330febe52c21590e297b56a956919ab7028160a..08abfd0e9fec77455bffe34af6ec527139aa5aa5 100644 (file)
--- a/gui/bweb/lang/en/tpl/move_media.tpl
+++ b/gui/bweb/lang/en/tpl/move_media.tpl
@@ -14,11 +14,11 @@
 </select>
     </td></tr><tr><td> Enabled: </td><td>
 <select name='enabled' class='formulaire'>
-    <option value='no'>no</option>
     <option value='yes'>yes</option>
+    <option value='no'>no</option>
     <option value='archived'>archived</option>
 </select>
-    </td><tr><td> User: </td><td>
+    </td></tr><tr><td> User: </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
     </td></tr>
     </td></tr><tr><td> Comment: </td><td>
@@ -73,12 +73,12 @@ nrsTable.setup(
 }
 );
 <TMPL_IF enabled>
-ok=1;
-for (var i=0; ok && i < document.form1.enabled.length; ++i) {
-   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
-      document.form1.enabled[i].selected = true;
-      ok=0;
-   }
-}
+//ok=1;
+//for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+//   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+//      document.form1.enabled[i].selected = true;
+//      ok=0;
+//   }
+//}
 </TMPL_IF>
 </script>

diff --git a/gui/bweb/lang/es/tpl/client_list.tpl b/gui/bweb/lang/es/tpl/client_list.tpl
index 9fbb31e6aa6ecccf858a483eec20312acc6c207e..52f762ff5a24fd652615bff4d5d73ac1d90a8e64 100644 (file)
--- a/gui/bweb/lang/es/tpl/client_list.tpl
+++ b/gui/bweb/lang/es/tpl/client_list.tpl
@@ -12,8 +12,10 @@
 <!--        <h1>Acciones</h1> -->      
        <button type="submit" class="bp" name='action' value='job' title="Mostrar últimos jobs"> <img src='/bweb/zoom.png' alt=''>Últimos Jobs</button>
        <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Mostrar job actual'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
+       <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Mostrar estado del cliente'> <img src='/bweb/zoom.png' alt=''>Estado </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Estadísticas del Cliente'> <img src='/bweb/chart.png' alt=''>Estado </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Editar </button>
         </div>
 
 </form>

diff --git a/gui/bweb/lang/es/tpl/extern.tpl b/gui/bweb/lang/es/tpl/extern.tpl
new file mode 100644 (file)
index 0000000..75b459d
--- /dev/null
+++ b/gui/bweb/lang/es/tpl/extern.tpl
@@ -0,0 +1,13 @@
+<br/>
+<div class='titlediv' style='width: 300'>
+ <h1 class='newstitle'> Help ejecting media</h1>
+</div>
+<div class='bodydiv' style='width: 300'>
+
+You want to:
+<form name='form1' action='?'>
+<label><input type='radio' name='action' value='safe_set'> Made a safe backup set </label><br>
+<label><input type='radio' name='action' value='help_extern'> Eject media <br>
+<button name='bp' class="bp" value='next'><img src='/bweb/next.png'>Siguiente</button></label>
+</form>
+</div>

diff --git a/gui/bweb/lang/es/tpl/move_media.tpl b/gui/bweb/lang/es/tpl/move_media.tpl
index f0171b1637c1f2dc1dcf25f99b26fca81249f593..baf5fa381fbe422b17d4d25f1935e49c972c375d 100644 (file)
--- a/gui/bweb/lang/es/tpl/move_media.tpl
+++ b/gui/bweb/lang/es/tpl/move_media.tpl
@@ -14,11 +14,11 @@
 </select>
     </td></tr><tr><td> Activado : </td><td>
 <select name='enabled' class='formulaire'>
-    <option value='no'>no</option>
     <option value='yes'>yes</option>
+    <option value='no'>no</option>
     <option value='archived'>archived</option>
 </select>
-    </td><tr><td> Usuario: </td><td>
+    </td></tr><tr><td> Usuario: </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
     </td></tr>
     </td></tr><tr><td> Comentario: </td><td>
@@ -73,12 +73,12 @@ nrsTable.setup(
 }
 );
 <TMPL_IF enabled>
-ok=1;
-for (var i=0; ok && i < document.form1.enabled.length; ++i) {
-   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
-      document.form1.enabled[i].selected = true;
-      ok=0;
-   }
-}
+//ok=1;
+//for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+//   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+//      document.form1.enabled[i].selected = true;
+//      ok=0;
+//   }
+//}
 </TMPL_IF>
 </script>

diff --git a/gui/bweb/lang/fr/tpl/client_list.tpl b/gui/bweb/lang/fr/tpl/client_list.tpl
index d1d8746c27ff3050c4b9053797b3c5c5c5186644..47d8e758d9296d902325330e3bc541ce4facfbf4 100644 (file)
--- a/gui/bweb/lang/fr/tpl/client_list.tpl
+++ b/gui/bweb/lang/fr/tpl/client_list.tpl
@@ -12,8 +12,10 @@
 <!--        <h1>Actions</h1> -->       
        <button type="submit" class="bp" name='action' value='job' title="Voir l'historique"> <img src='/bweb/zoom.png' alt=''>Historique</button>
        <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Jobs courants</button>
+       <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Statistiques'> <img src='/bweb/zoom.png' alt=''>Statut </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Statistiques'> <img src='/bweb/chart.png' alt=''>Stats </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Modifier </button>
         </div>
 
 </form>

diff --git a/gui/bweb/lang/fr/tpl/extern.tpl b/gui/bweb/lang/fr/tpl/extern.tpl
new file mode 100644 (file)
index 0000000..602334c
--- /dev/null
+++ b/gui/bweb/lang/fr/tpl/extern.tpl
@@ -0,0 +1,13 @@
+<br/>
+<div class='titlediv' style='width: 300'>
+ <h1 class='newstitle'> Help ejecting media</h1>
+</div>
+<div class='bodydiv' style='width: 300'>
+
+You want to:
+<form name='form1' action='?'>
+<label><input type='radio' name='action' value='safe_set'> Made a safe backup set </label><br>
+<label><input type='radio' name='action' value='help_extern'> Eject media <br>
+<button name='bp' class="bp" value='next'><img src='/bweb/next.png'>Suivant</button></label>
+</form>
+</div>

diff --git a/gui/bweb/lang/fr/tpl/move_media.tpl b/gui/bweb/lang/fr/tpl/move_media.tpl
index ffe2a64b6c75a818dbd69d1ccc2e63189984ad0d..48c91dc742a837fe72ae48b3b70e372e1ca5b75d 100644 (file)
--- a/gui/bweb/lang/fr/tpl/move_media.tpl
+++ b/gui/bweb/lang/fr/tpl/move_media.tpl
@@ -14,11 +14,11 @@
 </select>
     </td></tr><tr><td> En ligne : </td><td>
 <select name='enabled' class='formulaire'>
-    <option value='no'>non</option>
     <option value='yes'>oui</option>
+    <option value='no'>non</option>
     <option value='archived'>archivé</option>
 </select>
-    </td><tr><td> Utilisateur : </td><td>
+    </td></tr><tr><td> Utilisateur : </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
     </td></tr>
     </td></tr><tr><td> Commentaire : </td><td>
@@ -73,12 +73,12 @@ nrsTable.setup(
 }
 );
 <TMPL_IF enabled>
-ok=1;
-for (var i=0; ok && i < document.form1.enabled.length; ++i) {
-   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
-      document.form1.enabled[i].selected = true;
-      ok=0;
-   }
-}
+//ok=1;
+//for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+//   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+//      document.form1.enabled[i].selected = true;
+//      ok=0;
+//   }
+//}
 </TMPL_IF>
 </script>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d0d994c4f311bfb979bcd0aeb27d9c12af6d7b86..fe6f7740621946af626a69fe6080d3d10d73fcda 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -93,6 +93,16 @@ sub debug
     }
 }
 
+sub fdebug
+{
+    my ($self, $what) = @_;
+
+    my $old = $self->{debug};
+    $self->{debug}=1;
+    $self->debug($what);
+    $self->{debug} = $old;
+}
+
 =head1 FUNCTION
 
     error - display an error to the user
@@ -1548,6 +1558,26 @@ sub display_end
     $self->display($self->{info}, "end.tpl");
 }
 
+sub client_edit
+{
+    my ($self) = @_;
+    my $arg = $self->get_form("qclient");
+    my $f1 = $self->get_client_group_filter();
+    my $f2 = $self->get_client_filter();
+ 
+    my $query = "
+SELECT client_group_name, here
+  FROM client_group $f1
+  LEFT JOIN (SELECT 1 AS here, client_group_id
+               FROM Client JOIN client_group_member USING (ClientId) $f2
+              WHERE Name = $arg->{qclient}) AS temp USING (client_group_id)
+";
+
+    my $all = $self->dbh_selectall_hashref($query, 'client_group_name');
+    
+    $self->display({ client_group => [ values %$all ], %$arg }, "client_edit.tpl");
+}
+
 sub display_clients
 {
     my ($self) = @_;
@@ -1845,7 +1875,7 @@ SELECT Client.Name as clientname
        }
 
        my $query = "
-SELECT client_group_name AS name 
+SELECT client_group_name AS name, comment AS comment
   FROM client_group $filter
 ";
        my $grps = $self->dbh_selectall_hashref($query, 'name');
@@ -1855,7 +1885,7 @@ SELECT client_group_name AS name
 
     if ($what{db_usernames}) {
        my $query = "
-SELECT username 
+SELECT username, comment
   FROM bweb_user
 ";
        my $users = $self->dbh_selectall_hashref($query, 'username');
@@ -1865,7 +1895,7 @@ SELECT username
 
     if ($what{db_roles}) {
        my $query = "
-SELECT rolename 
+SELECT rolename, comment
   FROM bweb_role
 ";
        my $r = $self->dbh_selectall_hashref($query, 'rolename');
@@ -2795,6 +2825,48 @@ sub update_location
 
 ###########################################################
 
+sub client_save
+{
+    my ($self) = @_;
+    my $arg = $self->get_form(qw/jclient_groups qclient/);
+
+    unless ($arg->{qclient}) {
+       return $self->error("Can't get client name");
+    }
+
+    $self->can_do('r_group_mgnt');
+
+    my $f1 = $self->get_client_filter();
+    my $f2 = $self->get_client_group_filter();
+
+    $self->{dbh}->begin_work();
+
+    my $query = "
+DELETE FROM client_group_member 
+      WHERE ClientId IN 
+           (SELECT ClientId 
+              FROM Client $f1
+             WHERE Client.Name = $arg->{qclient})
+";
+    $self->dbh_do($query);
+
+    if ($arg->{jclient_groups}) {
+       $query = "
+ INSERT INTO client_group_member (client_group_id, ClientId) 
+    (SELECT client_group_id, (SELECT ClientId
+                FROM Client $f1
+               WHERE Name = $arg->{qclient})
+       FROM client_group $f2 WHERE client_group_name IN ($arg->{jclient_groups})
+    )
+";
+       $self->dbh_do($query);
+    }
+
+    $self->{dbh}->commit() or $self->error($self->{dbh}->errstr);
+
+    $self->display_clients();
+}
+
 sub groups_edit
 {
     my ($self) = @_;
@@ -2815,7 +2887,7 @@ sub groups_edit
 
     my $query = "
 SELECT Name AS name 
-  FROM Client JOIN client_group_member using (clientid)
+  FROM Client JOIN client_group_member using (ClientId)
               JOIN client_group using (client_group_id)
 WHERE client_group_name = $grp->{qclient_group}
 ";
@@ -2834,12 +2906,12 @@ sub groups_save
     my ($self) = @_;
     $self->can_do('r_group_mgnt');
 
-    my $arg = $self->get_form(qw/qclient_group jclients qnewgroup/);
+    my $arg = $self->get_form(qw/qclient_group jclients qnewgroup qcomment/);
 
     if (!$arg->{qclient_group} and $arg->{qnewgroup}) {
        my $query = "
-INSERT INTO client_group (client_group_name) 
-VALUES ($arg->{qnewgroup})
+INSERT INTO client_group (client_group_name, comment) 
+VALUES ($arg->{qnewgroup}, $arg->{qcomment})
 ";
        $self->dbh_do($query);
        $arg->{qclient_group} = $arg->{qnewgroup};
@@ -2862,8 +2934,8 @@ DELETE FROM client_group_member
 
     if ($arg->{jclients}) {
        $query = "
-    INSERT INTO client_group_member (clientid, client_group_id) 
-       (SELECT  Clientid, 
+    INSERT INTO client_group_member (ClientId, client_group_id) 
+       (SELECT  ClientId, 
                 (SELECT client_group_id 
                    FROM client_group 
                   WHERE client_group_name = $arg->{qclient_group})
@@ -2875,7 +2947,7 @@ DELETE FROM client_group_member
     if ($arg->{qclient_group} ne $arg->{qnewgroup}) {
        $query = "
 UPDATE client_group 
-   SET client_group_name = $arg->{qnewgroup}
+   SET client_group_name = $arg->{qnewgroup}, comment = $arg->{qcomment}
  WHERE client_group_name = $arg->{qclient_group}
 ";
 
@@ -3534,7 +3606,7 @@ SELECT
     sum(Job.JobFiles)    AS nb_files,
     client_group.client_group_name  AS clientname
 FROM Job JOIN Client USING (ClientId) 
-         JOIN client_group_member ON (Client.ClientId = client_group_member.clientid) 
+         JOIN client_group_member ON (Client.ClientId = client_group_member.ClientId) 
          JOIN client_group USING (client_group_id)
 WHERE 
     client_group.client_group_name = $carg->{qclient_group}

diff --git a/gui/bweb/script/Form.pm.patch b/gui/bweb/script/Form.pm.patch
new file mode 100644 (file)
index 0000000..ccb9af1
--- /dev/null
+++ b/gui/bweb/script/Form.pm.patch
@@ -0,0 +1,30 @@
+--- Form-original.pm   2005-12-07 09:32:27.000000000 -0500
++++ Form.pm    2007-05-08 13:26:16.000000000 -0400
+@@ -18,5 +18,4 @@
+  textarea => "TextInput",
+ 
+- button   => "IgnoreInput",
+  "reset"  => "IgnoreInput",
+ 
+@@ -25,4 +24,5 @@
+  option   => "ListInput",
+ 
++ button   => "SubmitInput",
+  submit   => "SubmitInput",
+  image    => "ImageInput",
+@@ -118,5 +118,5 @@
+     eval {
+       # optimization
+-      $p->report_tags(qw(form input textarea select optgroup option keygen label));
++      $p->report_tags(qw(form input textarea select optgroup option keygen label button));
+     };
+ 
+@@ -184,4 +184,8 @@
+                   $f->push_input($type, $attr);
+               }
++        elsif ($tag eq "button") {
++            my $type = delete $attr->{type} || "submit";
++            $f->push_input($type, $attr);
++        }
+               elsif ($tag eq "textarea") {
+                   $attr->{textarea_value} = $attr->{value}

diff --git a/gui/bweb/script/bweb-mysql.sql b/gui/bweb/script/bweb-mysql.sql
index 36bfe48b6a5f8ed37adea2249e9480ab0a3cf3e2..430b011f931f47419c99c0ec597d2db346ad9d07 100644 (file)
--- a/gui/bweb/script/bweb-mysql.sql
+++ b/gui/bweb/script/bweb-mysql.sql
@@ -56,7 +56,7 @@ CREATE TABLE bweb_role
 (
         roleid       serial not null,
         rolename     text not null,
---      comment      text default '',
+        comment      text default '',
         primary key (roleid)
 );
 CREATE UNIQUE INDEX bweb_role_idx on bweb_role (rolename(255));
@@ -108,6 +108,7 @@ CREATE TABLE client_group
 (
     client_group_id             serial    not null,
     client_group_name           text      not null,
+    comment                     text default '',
     primary key (client_group_id)
 );
 
@@ -116,7 +117,7 @@ CREATE UNIQUE INDEX client_group_idx on client_group (client_group_name(255));
 CREATE TABLE client_group_member
 (
     client_group_id   integer     not null,
-    clientid          integer     not null,
+    ClientId          integer     not null,
     primary key (client_group_id, clientid)
 );
 

diff --git a/gui/bweb/script/bweb-postgresql.sql b/gui/bweb/script/bweb-postgresql.sql
index db725562f3ed6ba94239411820f5165c172c73a9..0fed9269d2287ba344dd19feb6fb44a5978519f6 100644 (file)
--- a/gui/bweb/script/bweb-postgresql.sql
+++ b/gui/bweb/script/bweb-postgresql.sql
@@ -78,7 +78,7 @@ CREATE TABLE bweb_role
 (
         roleid       serial not null,
         rolename     text not null,
---      comment      text default '',
+        comment      text default '',
         primary key (roleid)
 );
 CREATE UNIQUE INDEX bweb_role_idx on bweb_role (rolename);
@@ -131,6 +131,7 @@ CREATE TABLE client_group
 (
     client_group_id             serial    not null,
     client_group_name           text      not null,
+    comment                     text      default '',
     primary key (client_group_id)
 );
 

diff --git a/gui/bweb/script/upgrade-2.2_3.0_mysql.sql b/gui/bweb/script/upgrade-2.2_3.0_mysql.sql
index 96af27d4b62014df756c398ddb9998ff38c5dc2b..8af542387be5563cbd2ee06c44f241ef7307189f 100644 (file)
--- a/gui/bweb/script/upgrade-2.2_3.0_mysql.sql
+++ b/gui/bweb/script/upgrade-2.2_3.0_mysql.sql
@@ -2,6 +2,9 @@
 -- Upgrade from 2.2
 -- --------------------------------------------------
 
+ALTER TABLE client_group ADD COLUMN comment text;
+ALTER TABLE client_group_member RENAME COLUMN clientid TO ClientId;
+
 CREATE TABLE bweb_user
 (
        userid       serial not null,
@@ -18,7 +21,7 @@ CREATE TABLE bweb_role
 (
        roleid       serial not null,
        rolename     text not null,
---     comment      text default '',
+       comment      text default '',
        primary key (roleid)
 );
 CREATE UNIQUE INDEX bweb_role_idx on bweb_role (rolename(255));

diff --git a/gui/bweb/script/upgrade-2.2_3.0_postgresql.sql b/gui/bweb/script/upgrade-2.2_3.0_postgresql.sql
index 47ae2b31b625670a89a84e62bbb0b4e8aed3b832..a41b3157714088e09b48499bdf6e2c385b4cf8ee 100644 (file)
--- a/gui/bweb/script/upgrade-2.2_3.0_postgresql.sql
+++ b/gui/bweb/script/upgrade-2.2_3.0_postgresql.sql
@@ -22,6 +22,9 @@ initcond = ''
 );
 
 BEGIN;
+
+ALTER TABLE client_group ADD COLUMN comment text;
+
 CREATE TABLE bweb_user
 (
        userid       serial not null,
@@ -38,7 +41,7 @@ CREATE TABLE bweb_role
 (
        roleid       serial not null,
        rolename     text not null,
---     comment      text default '',
+       comment      text default '',
        primary key (roleid)
 );
 CREATE UNIQUE INDEX bweb_role_idx on bweb_role (rolename);

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index 9b6dc1be95a4ccb55d69f463ed76634ddb0fb002..776dde86be71f981db1d172175793e57b0149534 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,8 @@
+13Feb08
+ebl  Can modify client list group for a specific client
+ebl  Disable use of Enabled flag in volume mgnt
+ebl  Add comment field to client_group
+
 09Jan08
 ebl  Adapt btime for bacula 2.2.7
 

diff --git a/gui/bweb/tpl/client_list.tpl b/gui/bweb/tpl/client_list.tpl
index a452f4b164a54b877f6416bb10dd2c3d28c57a03..85b400f33117c18e7326cd5ba27847d9b56d430e 100644 (file)
--- a/gui/bweb/tpl/client_list.tpl
+++ b/gui/bweb/tpl/client_list.tpl
@@ -15,6 +15,7 @@
        <button type="submit" class="bp" name='action' value='groups' title='__View client groups__'> <img src='/bweb/zoom.png' alt=''>__View groups__</button>
        <button type="submit" class="bp" name='action' value='client_status' title='__Show client status__'> <img src='/bweb/zoom.png' alt=''>__Status__ </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='__Client stats__'> <img src='/bweb/chart.png' alt=''>__Stats__ </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='__Client groups__'> <img src='/bweb/edit.png' alt=''>__Edit__ </button>
         </div>
 
 </form>

diff --git a/gui/bweb/tpl/extern.tpl b/gui/bweb/tpl/extern.tpl
new file mode 100644 (file)
index 0000000..07126c5
--- /dev/null
+++ b/gui/bweb/tpl/extern.tpl
@@ -0,0 +1,13 @@
+<br/>
+<div class='titlediv' style='width: 300'>
+ <h1 class='newstitle'> __Help ejecting media__</h1>
+</div>
+<div class='bodydiv' style='width: 300'>
+
+__You want to:__
+<form name='form1' action='?'>
+<label><input type='radio' name='action' value='safe_set'> __Made a safe backup set__ </label><br>
+<label><input type='radio' name='action' value='help_extern'> __Eject media__ <br>
+<button name='bp' class="bp" value='next'><img src='/bweb/next.png'>__Next__</button></label>
+</form>
+</div>

diff --git a/gui/bweb/tpl/move_media.tpl b/gui/bweb/tpl/move_media.tpl
index ece6034542ce236357fd081e3b3ca26ad5712576..2a05209c252f6ef1ea635e408a92c95effd34370 100644 (file)
--- a/gui/bweb/tpl/move_media.tpl
+++ b/gui/bweb/tpl/move_media.tpl
@@ -14,11 +14,11 @@
 </select>
     </td></tr><tr><td> __Enabled:__ </td><td>
 <select name='enabled' class='formulaire'>
-    <option value='no'>__no__</option>
     <option value='yes'>__yes__</option>
+    <option value='no'>__no__</option>
     <option value='archived'>__archived__</option>
 </select>
-    </td><tr><td> __User:__ </td><td>
+    </td></tr><tr><td> __User:__ </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
     </td></tr>
     </td></tr><tr><td> __Comment:__ </td><td>
@@ -73,12 +73,12 @@ nrsTable.setup(
 }
 );
 <TMPL_IF enabled>
-ok=1;
-for (var i=0; ok && i < document.form1.enabled.length; ++i) {
-   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
-      document.form1.enabled[i].selected = true;
-      ok=0;
-   }
-}
+//ok=1;
+//for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+//   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+//      document.form1.enabled[i].selected = true;
+//      ok=0;
+//   }
+//}
 </TMPL_IF>
 </script>