ebl Adapt Location.Enabled to be like Media.Enabled

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5895 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index fe08902b62bedf6aee01adb4bb512ba29a6a9e8a..fabcea908ed7c2d4db7a9e14c13084bcccba8fef 100644 (file)
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -1,4 +1,7 @@
           Release Notes for bweb 2.2
+2007/11/10
+ - Adapt Location.Enabled to be the same as Media.Enabled
+
 2007/11/08
  - Add Prev/Next on job log output
 

diff --git a/gui/bweb/lang/es/tpl/config_edit.tpl b/gui/bweb/lang/es/tpl/config_edit.tpl
index fde3b6014976a024e19c516a62252503c9f05e2f..3c9b6900be99f072cf458419783a0183d150481e 100644 (file)
--- a/gui/bweb/lang/es/tpl/config_edit.tpl
+++ b/gui/bweb/lang/es/tpl/config_edit.tpl
@@ -46,10 +46,6 @@
      <tr><td>display_log_time :</td>
          <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
          </td></tr>
-     <tr><td>security :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enable_security' title='Use user managment in bweb. Read INSTALL first' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
-     <tr><td>security acl:</td> 
-         <td> <input class="formulaire" type='checkbox' name='enable_security_acl' title='Use user acl in bweb. Read INSTALL first' <TMPL_IF enable_security_acl> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/lang/es/tpl/config_view.tpl b/gui/bweb/lang/es/tpl/config_view.tpl
index dffc499e0ed33a9c140fd3147f5cb5db803f2b9b..7380b743d857aa316516fba8eb9ca6d9394941f9 100644 (file)
--- a/gui/bweb/lang/es/tpl/config_view.tpl
+++ b/gui/bweb/lang/es/tpl/config_view.tpl
@@ -18,8 +18,6 @@
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/a/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
     <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
-    <tr><td>security :</td> <td> <TMPL_VAR enable_security> </td></tr>
-    <tr><td title="user filter">security acl :</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Libreria</b></td>  <td/></tr>

diff --git a/gui/bweb/lang/es/tpl/location_edit.tpl b/gui/bweb/lang/es/tpl/location_edit.tpl
index 11856be10c43b993afb39fc574412147f325c97c..16cdde2ef3588e4b3ac9fd6b1b456ed6e15170eb 100644 (file)
--- a/gui/bweb/lang/es/tpl/location_edit.tpl
+++ b/gui/bweb/lang/es/tpl/location_edit.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> Ubicación : <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
-   <form action="?" method='get'>
+   <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
      <tr><td>Ubicación :</td>     
@@ -16,11 +16,24 @@
          </td>
      </tr>
      <tr><td>Activado :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enabled' <TMPL_IF enabled> checked </TMPL_IF> >
-         </td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>yes</option>
+           <option value='no'>no</option>
+           <option value='archived'>archived</option>
+           </select>
+        </td>
      </tr>
     </table>
     <input type="image" name='action' value='location_save'
      src='/bweb/save.png'>
    </form>
 </div>
+<script type="text/javascript" language='JavaScript'>
+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;
+   }
+}
+</script>

diff --git a/gui/bweb/lang/fr/tpl/config_edit.tpl b/gui/bweb/lang/fr/tpl/config_edit.tpl
index 98a562c88af5d60bf28220bf980327365ecb07ef..847c404059ad66ea4868737a867d066642c5b77a 100644 (file)
--- a/gui/bweb/lang/fr/tpl/config_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/config_edit.tpl
@@ -47,10 +47,6 @@
      <tr><td>display_log_time :</td>
          <td> <input class="formulaire" title="affiche les heures dans les logs" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
          </td></tr>
-     <tr><td>security :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enable_security' title='Active la gestion des utilisateurs dans bweb. Lire le manuel avant.' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
-     <tr><td>security acl:</td> 
-         <td> <input class="formulaire" type='checkbox' name='enable_security_acl' title='Use user acl in bweb. Read INSTALL first' <TMPL_IF enable_security_acl> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/lang/fr/tpl/config_view.tpl b/gui/bweb/lang/fr/tpl/config_view.tpl
index 3ca01a2ab3456a468db0becbe5a7f9d3099b1c11..c179d74b810a2a3abd09450987e46d21743b96aa 100644 (file)
--- a/gui/bweb/lang/fr/tpl/config_view.tpl
+++ b/gui/bweb/lang/fr/tpl/config_view.tpl
@@ -18,8 +18,6 @@
     <tr><td title="Vous pouvez utiliser une autre table que Job pour vos statistiques">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/chemin/vers/bconsole -n -c /chemin/vers/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
     <tr><td title="affiche les heures dans le log des jobs">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
-    <tr><td>security :</td> <td> <TMPL_VAR enable_security> </td></tr>
-    <tr><td title="user filter">security acl :</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Robotique (Autochanger)</b></td>  <td/></tr>

diff --git a/gui/bweb/lang/fr/tpl/location_edit.tpl b/gui/bweb/lang/fr/tpl/location_edit.tpl
index ef196866c61cb0dd0769f66504814029ccb7703e..117359e6b513bbecaeddfbe1b00574f14887fde5 100644 (file)
--- a/gui/bweb/lang/fr/tpl/location_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/location_edit.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> Localisation : <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
-   <form action="?" method='get'>
+   <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
      <tr><td>Localisation :</td>     
@@ -15,12 +15,25 @@
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Enabled :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enabled' <TMPL_IF enabled> checked </TMPL_IF> >
-         </td>
-     </tr>
+    <tr><td>Enabled:</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>yes</option>
+           <option value='no'>no</option>
+           <option value='archived'>archived</option>
+           </select>
+        </td>
+    </tr>
     </table>
     <input type="image" name='action' value='location_save'
      src='/bweb/save.png'>
    </form>
 </div>
+<script type="text/javascript" language='JavaScript'>
+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;
+   }
+}
+</script>

diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index e470d372b483337cd7567bb4a8414e6d84282852..c918cf29885afad17cc10ab0b76d6598c24ae707 100644 (file)
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -46,10 +46,6 @@
      <tr><td>display_log_time :</td> 
          <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
-     <tr><td>security :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enable_security' title='Use user managment in bweb. Read INSTALL first' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
-     <tr><td>security acl:</td> 
-         <td> <input class="formulaire" type='checkbox' name='enable_security_acl' title='Use user acl in bweb. Read INSTALL first' <TMPL_IF enable_security_acl> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/tpl/config_view.tpl b/gui/bweb/tpl/config_view.tpl
index ea3ccfff25b024e670cd73cc839ccb853d8d2a8f..5056458da267066bd9b71c9ad0b1ffc10ed21e56 100644 (file)
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -18,8 +18,6 @@
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/to/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
     <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
-    <tr><td title="user managment">security :</td> <td> <TMPL_VAR enable_security> </td></tr>
-    <tr><td title="user filter">security acl :</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Autochanger</b></td>  <td/></tr>

diff --git a/gui/bweb/tpl/location_edit.tpl b/gui/bweb/tpl/location_edit.tpl
index 75ad5b6e12402c5239be0d84e74da32da98f8d00..c7f28afe57375f6a0329d3e1f09092082e31cea7 100644 (file)
--- a/gui/bweb/tpl/location_edit.tpl
+++ b/gui/bweb/tpl/location_edit.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> Location : <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
-   <form action="?" method='get'>
+   <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
      <tr><td>Location :</td>     
@@ -15,12 +15,26 @@
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Enabled :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enabled' <TMPL_IF enabled> checked </TMPL_IF> >
-         </td>
-     </tr>
+    <tr><td>Enabled:</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>yes</option>
+           <option value='no'>no</option>
+           <option value='archived'>archived</option>
+           </select>
+        </td>
+    </tr>
     </table>
     <input type="image" name='action' value='location_save'
      src='/bweb/save.png'>
    </form>
 </div>
+
+<script type="text/javascript" language='JavaScript'>
+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;
+   }
+}
+</script>