ebl Add start date field and more options button to run_job

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

diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index 0da66765d6e64e38cf58b6ea7ee6093a28e11d37..3860eda61d7de76e1236d850dca83956f1f3ec72 100644 (file)
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -1,5 +1,8 @@
           Release Notes for bweb 1.39.28
 
+2006/12/12
+ - Add More options button to run_job and Start Date field
+
 2006/12/09
  - Update Copyright
 

diff --git a/gui/bweb/lang/fr/tpl/run_job_mod.tpl b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
index 5baa99d463379c38dfb6615b66533d001997d0ad..4bf8ea270366f3929eaa5e48531fe2c04534f972 100644 (file)
--- a/gui/bweb/lang/fr/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
@@ -58,14 +58,23 @@
      <option id='level_Full' value='Full'>Full</option>
      <option id='level_Differential' value='Differential'>Différentielle</option>
    </select>
+   </td></tr><tr id='more1' style="visibility:hidden"><td>Start Time: </td><td>
+   <input class='formulaire' 
+         type='text' title='YYYY-MM-DD HH:MM:SS'
+          size='17' name='when' value='<TMPL_VAR when>'>
 
-   </td></tr><tr><td>Priorité : </td><td>
+   </td></tr><tr id='more2' style="visibility:hidden"><td>Priorité : </td><td>
    <input class='formulaire' type='text' 
           size='3' name='priority' value='<TMPL_VAR priority>'>
 
    </td></tr>
    </table>
    <br/>
+  <label onclick='
+           document.getElementById("more1").style.visibility="visible";
+           document.getElementById("more2").style.visibility="visible";'>
+  <img title="Affiche plus d'options" src='/bweb/add.png'>Options</label>
+  <label>
   <label>
   <input type="image" name='action' value='run_job_now' title='Lancer maintenant'
    src='/bweb/R.png'>Lancer maintenant

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index e62f749f7f60cf527bf3820840647793bba6c28e..74bd1eee93ce38c96a53de1f60597f258da53286 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1436,6 +1436,13 @@ sub get_form
        }
     }
 
+    if ($what{when}) {
+       my $when = CGI::param('when') || '';
+       if ($when =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})$/) {
+           $ret{when} = $1;
+       }
+    }
+
     if ($what{db_clients}) {
        my $query = "
 SELECT Client.Name as clientname
@@ -3219,7 +3226,7 @@ sub run_job_now
     
     # TODO: check input (don't use pool, level)
 
-    my $arg = $self->get_form('pool', 'level', 'client', 'priority');
+    my $arg = $self->get_form('pool', 'level', 'client', 'priority', 'when');
     my $job = CGI::param('job') || '';
     my $storage = CGI::param('storage') || '';
 
@@ -3229,6 +3236,7 @@ sub run_job_now
                        level => $arg->{level},
                        storage => $storage,
                        pool => $arg->{pool},
+                       when => $arg->{when},
                        );
 
     print $jobid, $b->{error};    

diff --git a/gui/bweb/tpl/run_job_mod.tpl b/gui/bweb/tpl/run_job_mod.tpl
index 46f1764808c26b18692f799fcd124b4235197b44..5d6740c935e4ff99d825edd16559d3152dfa1bc6 100644 (file)
--- a/gui/bweb/tpl/run_job_mod.tpl
+++ b/gui/bweb/tpl/run_job_mod.tpl
@@ -59,13 +59,22 @@
      <option id='level_Differential' value='Differential'>Differential</option>
    </select>
 
-   </td></tr><tr><td>Priority: </td><td>
+   </td></tr><tr id='more1' style="visibility:hidden"><td>Start Time: </td><td>
+   <input class='formulaire' 
+         type='text' title='YYYY-MM-DD HH:MM:SS'
+          size='17' name='when' value='<TMPL_VAR when>'>
+
+   </td></tr><tr id='more2' style="visibility:hidden"><td>Priority: </td><td>
    <input class='formulaire' type='text' 
           size='3' name='priority' value='<TMPL_VAR priority>'>
 
    </td></tr>
    </table>
    <br/>
+  <label onclick='
+           document.getElementById("more1").style.visibility="visible";
+           document.getElementById("more2").style.visibility="visible";'>
+  <img title='Display more options' src='/bweb/add.png'>More options</label>
   <label>
   <input type="image" name='action' value='run_job_now' title='Run job'
    src='/bweb/R.png'>Run now