From 08604e22c803c7c790e337bfd419ec24ccfaa02c Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 11 Nov 2007 00:26:25 +0000
Subject: [PATCH] ebl  Replace <input type='image'> with button

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5898 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/tpl/ach_add.tpl              |  2 +-
 gui/bweb/tpl/ach_content.tpl          | 41 ++++++-------------
 gui/bweb/tpl/begin.tpl                |  2 +-
 gui/bweb/tpl/client_job_status.tpl    |  8 ++--
 gui/bweb/tpl/client_list.tpl          | 13 ++----
 gui/bweb/tpl/config_edit.tpl          |  2 +-
 gui/bweb/tpl/config_view.tpl          | 14 +++----
 gui/bweb/tpl/display_client_stats.tpl |  7 ++--
 gui/bweb/tpl/display_form_job.tpl     |  6 +--
 gui/bweb/tpl/display_form_media.tpl   |  2 +-
 gui/bweb/tpl/display_groups.tpl       | 19 ++++-----
 gui/bweb/tpl/display_job_zoom.tpl     | 58 +++++++++++----------------
 gui/bweb/tpl/display_location.tpl     |  9 ++---
 gui/bweb/tpl/display_media.tpl        | 12 +++---
 gui/bweb/tpl/display_media_zoom.tpl   | 10 ++---
 gui/bweb/tpl/display_pool.tpl         |  2 +-
 gui/bweb/tpl/display_user.tpl         |  4 +-
 gui/bweb/tpl/display_users.tpl        | 14 +++----
 gui/bweb/tpl/groups_add.tpl           |  3 +-
 gui/bweb/tpl/groups_edit.tpl          |  4 +-
 gui/bweb/tpl/help_extern.tpl          |  2 +-
 gui/bweb/tpl/help_extern_compute.tpl  |  4 +-
 gui/bweb/tpl/help_intern.tpl          |  3 +-
 gui/bweb/tpl/help_intern_compute.tpl  |  6 +--
 gui/bweb/tpl/location_add.tpl         | 15 ++++---
 gui/bweb/tpl/location_edit.tpl        |  4 +-
 gui/bweb/tpl/move_media.tpl           |  4 +-
 gui/bweb/tpl/run_job.tpl              | 15 ++-----
 gui/bweb/tpl/run_job_mod.tpl          | 12 ++----
 gui/bweb/tpl/running_job.tpl          | 11 ++---
 gui/bweb/tpl/scheduled_job.tpl        | 12 ++----
 gui/bweb/tpl/update_location.tpl      |  2 +-
 gui/bweb/tpl/update_media.tpl         | 16 +++-----
 33 files changed, 133 insertions(+), 205 deletions(-)

diff --git a/gui/bweb/tpl/ach_add.tpl b/gui/bweb/tpl/ach_add.tpl
index 8a8e131d2e..6c5912c621 100644
--- a/gui/bweb/tpl/ach_add.tpl
+++ b/gui/bweb/tpl/ach_add.tpl
@@ -42,7 +42,7 @@
     </tr>
     </TMPL_LOOP>
     </table>
-    <input type="image" name='action' value='ach_add' src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='ach_add'> <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
 
diff --git a/gui/bweb/tpl/ach_content.tpl b/gui/bweb/tpl/ach_content.tpl
index 08952b62a7..9092581298 100644
--- a/gui/bweb/tpl/ach_content.tpl
+++ b/gui/bweb/tpl/ach_content.tpl
@@ -18,38 +18,21 @@ Autochanger : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
      Tools
     </div>
     <div class='otherbox'>
-<label>
-<input type="image" name='action' value='label_barcodes'
-        title='run label barcodes' src='/bweb/label.png'>Label
-</label>
+<button type="submit" class="bp" name='action' value='label_barcodes'
+ title='run label barcodes'><img src='/bweb/label.png' alt=''>Label</button>
 <TMPL_IF nb_io>
-<label>
-<input type="image" name='action' value='eject'
-        title='put selected media on i/o' src='/bweb/extern.png'>
-Eject
-</label>
-<label>
-<input type="image" name='action' value='clear_io'
-        title='Clear i/o' src='/bweb/intern.png'>
-Clear I/O
-</label>
+<button type="submit" class="bp" name='action' value='eject'
+ title='put selected media on i/o'><img src='/bweb/extern.png' alt=''>Eject</button>
+<button type="submit" class="bp" name='action' value='clear_io'
+ title='Clear i/o'> <img src='/bweb/intern.png' alt=''>Clear I/O</button>
 </TMPL_IF>
-<label>
-<input type="image" name='action' value='update_slots'
-        title='run update slots' src='/bweb/update.png'>
-Update
-</label>
+<button type="submit" class="bp" name='action' value='update_slots'
+ title='run update slots'> <img src='/bweb/update.png' alt=''>Update</button>
 <br/><br/>
-<label>
-<input type="image" name='action' value='ach_load'
-	title='mount drive' src='/bweb/load.png'>
-Mount
-</label>
-<label>
-<input type="image" name='action' value='ach_unload'
-	title='umount drive' src='/bweb/unload.png'>
-Umount
-</label>
+<button type="submit" class="bp" name='action' value='ach_load'
+ title='mount drive'> <img src='/bweb/load.png' alt=''>Mount</button>
+<button type="submit" class="bp" name='action' value='ach_unload'
+ title='umount drive'> <img src='/bweb/unload.png' alt=''>Umount</button>
 
    </div>
     <td width='200'/>
diff --git a/gui/bweb/tpl/begin.tpl b/gui/bweb/tpl/begin.tpl
index 349c8fc105..25174b82f7 100644
--- a/gui/bweb/tpl/begin.tpl
+++ b/gui/bweb/tpl/begin.tpl
@@ -65,7 +65,7 @@ if (navigator.appName == 'Konqueror') {
  <li> <a href="bweb.pl?action=about"> About </a> </li>
  <li style="padding: 0.25em 2em;float: right;">&nbsp;Logged as <TMPL_VAR NAME=loginname> </li>
  <li style="float: right;white-space: nowrap;">
-<input type="image" class="button" title="Search media" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="Search client" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="Search media or client"></li>
+<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="Search media or client"></li> </button>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>
diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index c46ccc3b13..28b0024ad3 100644
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -24,13 +24,13 @@
  </tr>
 </table>
 <form name='form1' action='?' method='GET'>
-<input type="image" name='action' value='dsp_cur_job' 
- src='/bweb/update.png' title='refresh'>&nbsp;
+<button type="submit" class="bp" name='action' value='dsp_cur_job' 
+> <img src='/bweb/update.png' title='refresh' alt=''>Refresh</button>
 <input type='hidden' name='client' value='<TMPL_VAR Client>'>
 <input type='hidden' name='jobid' value='<TMPL_VAR JobId>'>
-<input type="image" name='action' value='cancel_job'
+<button type="submit" class="bp" name='action' value='cancel_job'
        onclick="return confirm('Do you want to cancel this job ?')"
-        title='Cancel job' src='/bweb/cancel.png'>&nbsp;
+        title='Cancel job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
 </form>
  </div>
 
diff --git a/gui/bweb/tpl/client_list.tpl b/gui/bweb/tpl/client_list.tpl
index c5da53edae..bf06fcb90c 100644
--- a/gui/bweb/tpl/client_list.tpl
+++ b/gui/bweb/tpl/client_list.tpl
@@ -10,15 +10,10 @@
         </div>
         <div class="otherbox">
 <!--        <h1>Actions</h1> -->	
-       <label>
-       <input type="image" name='action' value='job' title='Show last job' src='/bweb/zoom.png'>Last jobs</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='dsp_cur_job' title='Show current job' src='/bweb/zoom.png'>Current jobs</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='client_status' title='Show client status' src='/bweb/zoom.png'>Status</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='client_stats' title='Client stats' src='/bweb/chart.png'>Stats</label> &nbsp;
-       </label>
+       <button type="submit" class="bp" name='action' value='job' title='Show last job'> <img src='/bweb/zoom.png' alt=''>Last jobsView 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='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>
         </div>
 
 </form>
diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index e470d372b4..f607dd0bb1 100644
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -54,6 +54,6 @@
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
     </table>
-    <input type="image" name='action' value='apply_conf' src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='apply_conf'> <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
diff --git a/gui/bweb/tpl/config_view.tpl b/gui/bweb/tpl/config_view.tpl
index ea3ccfff25..7aa431006b 100644
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -39,9 +39,9 @@
     </table>
    <td>
   
-   <input type="image" name="action" value="ach_edit" title="edit" src='/bweb/edit.png'> 
-   <input type="image" name='action' value='ach_del' title='delete' src='/bweb/remove.png'>
-   <input type='image' name='action' value='ach_view' title='view' src='/bweb/zoom.png'>
+   <button type="submit" class="bp" name="action" value="ach_edit" title="edit"> <img src='/bweb/edit.png' alt=''>Edit</button>
+   <button type="submit" class="bp" name='action' value='ach_del' title='delete'> <img src='/bweb/remove.png' alt=''>Delete</button>
+   <button type="submit" class="bp" name='action' value='ach_view' title='view'> <img src='/bweb/zoom.png' alt=''>View</button>
     </form>
     </td>
    </tr>
@@ -52,12 +52,8 @@
   </table>
 
   <form action='?' method='GET'>
-   <label>
-   <input name='action' value='edit_conf' type="image" title='Edit' src='/bweb/edit.png'> Edit
-   </label>
-   <label>
-   <input name='action' value='ach_add' type="image" title='Add an autochanger' src='/bweb/add.png'> Add autochanger
-   </label>
+   <button name='action' value='edit_conf' type="submit" class="bp" title='Edit'> <img src='/bweb/edit.png' alt=''>Edit</button>
+   <button name='action' value='ach_add' type="submit" class="bp" title='Add an autochanger'> <img src='/bweb/add.png' alt=''>Add autochanger</button>
   </form>
 
   <TMPL_IF error>
diff --git a/gui/bweb/tpl/display_client_stats.tpl b/gui/bweb/tpl/display_client_stats.tpl
index bbd11b88d1..dc6dd46f8e 100644
--- a/gui/bweb/tpl/display_client_stats.tpl
+++ b/gui/bweb/tpl/display_client_stats.tpl
@@ -13,10 +13,9 @@
         </div>
         <div class="otherbox">
        <h1>Actions</h1> 
-       <input type="image" name='action' value='job' title='Show last job'
-        src='/bweb/zoom.png'> &nbsp;
-       <input type="image" name='action' value='dsp_cur_job' title='Show current job' src='/bweb/zoom.png'> &nbsp;
-       <input type="image" name='action' value='client_stat' title='Client stats' src='/bweb/zoom.png'> &nbsp;
+       <button type="submit" class="bp" name='action' value='job' title='Show last job'> <img src='/bweb/zoom.png' alt=''>View last jobs</button>
+       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Show current job'> <img src='/bweb/zoom.png' alt=''>View current jobs</button>
+       <button type="submit" class="bp" name='action' value='client_stat' title='Client stats'> <img src='/bweb/zoom.png' alt=''>View stats</button>
         </div>
 -->
 </form>
diff --git a/gui/bweb/tpl/display_form_job.tpl b/gui/bweb/tpl/display_form_job.tpl
index 3840ee7a4c..b402d3d90a 100644
--- a/gui/bweb/tpl/display_form_job.tpl
+++ b/gui/bweb/tpl/display_form_job.tpl
@@ -109,9 +109,9 @@
 </tr>
 -->
 </table>
-  <input type="image" name='action' 
-         value='<TMPL_IF action><TMPL_VAR action><TMPL_ELSE>job</TMPL_IF>'
-         src='/bweb/update.png'>
+  <button type="submit" class="bp" name='action' 
+    value='<TMPL_IF action><TMPL_VAR action><TMPL_ELSE>job</TMPL_IF>'>
+     <img src='/bweb/update.png' alt=''> </button>
 
 </form>
 </div>
diff --git a/gui/bweb/tpl/display_form_media.tpl b/gui/bweb/tpl/display_form_media.tpl
index 6944073b4d..f343a474d2 100644
--- a/gui/bweb/tpl/display_form_media.tpl
+++ b/gui/bweb/tpl/display_form_media.tpl
@@ -76,7 +76,7 @@
 </tr>
 
 </table>
-  <input type="image" name='action' value='media' src='/bweb/update.png'>
+  <button type="submit" class="bp" name='action' value='media'> <img src='/bweb/update.png' alt=''>Update</button>
 
 </form>
 </div>
diff --git a/gui/bweb/tpl/display_groups.tpl b/gui/bweb/tpl/display_groups.tpl
index f678ce8e88..c0ad0e14c9 100644
--- a/gui/bweb/tpl/display_groups.tpl
+++ b/gui/bweb/tpl/display_groups.tpl
@@ -5,22 +5,19 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' value='groups_add' title='Add' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='groups_del' 
+    <button type="submit" class="bp" name='action' value='groups_add' title='Add'> <img src='/bweb/add.png' alt=''>Add</button>
+    <button type="submit" class="bp" name='action' value='groups_del' 
      onclick="return confirm('Do you want to delete this group ?');" 
-     title='Supprimer' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='groups_edit' title='Modify' src='/bweb/edit.png'>&nbsp;
+     title='Supprimer'> <img src='/bweb/remove.png' alt=''>Remove</button>
+    <button type="submit" class="bp" name='action' value='groups_edit' title='Modify'> <img src='/bweb/edit.png' alt=''>Edit</button>
 
-    <input type="image" name='action' value='client' title='View members'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='job' title='View jobs'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='group_stats' title='Statistics' src='/bweb/chart.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='client' title='View members'> <img src='/bweb/zoom.png' alt=''>View members</button>
+    <button type="submit" class="bp" name='action' value='job' title='View jobs'> <img src='/bweb/zoom.png' alt=''>View jobs</button>
+    <button type="submit" class="bp" name='action' value='group_stats' title='Statistics'> <img src='/bweb/chart.png' alt=''>View stats</button>
    </form>
    <form action='?' method='get'>
     <input type='hidden' name='action' value='client'>
-    <input type="image" name='notingroup' value='yes' title='View non-members'
-     src='/bweb/zoom.png'>&nbsp;
+    <button type="submit" class="bp" name='notingroup' value='yes' title='View non-members'> <img src='/bweb/zoom.png' alt=''>View others</button>
    </form>
  </div>
 
diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index 78f1505892..c367f9c907 100644
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -4,77 +4,65 @@
  <div class="bodydiv">
  <table id='id0'></table>
  <table><td>
- <form action='bweb.pl?'>
+ <form name="delete" action='bweb.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
-  <label>
-  <input type="image" name='action' value='delete' title='delete this job'
- onclick="return confirm('Do you want to delete this job from the catalog ?');"
-   src='/bweb/purge.png'> Delete
-  </label>
+  <button type="submit" name='action' class="bp" value='delete' title='delete this job'
+ onclick="return confirm('Do you want to delete this job from the catalog ?');">
+   <img src='/bweb/purge.png' alt=''> Delete </button>
  </form>
  </td><td>
- <form action='bweb.pl?'>
+ <form name="media" action='bweb.pl?'>
   <TMPL_LOOP volumes>
    <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
   </TMPL_LOOP>   
-  <label>
-  <input type="image" name='action' value='media' title='view media' 
-   src='/bweb/zoom.png'>View media
-  </label>
+  <button type="submit" name='action' value='media' title='view media' class="bp">
+   <img src='/bweb/zoom.png'alt=''>View media </button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="job" action='bweb.pl?'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
-  <label>
-  <input type="image" name='action' value='job' title='view <TMPL_VAR Client> jobs' src='/bweb/zoom.png'>View jobs
-  </label>
+  <button type="submit" class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>View jobs</button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="graph" action='bweb.pl?'>
   <input type='hidden' name='age' value='2678400'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
   <input type='hidden' name='jobname' value='<TMPL_VAR jobname>'>
-  <label>
-  <input type="image" name='action' value='graph' title='view trends'
-   src='/bweb/chart.png'> View stats
-  </label>
+  <button type="submit" class="bp" name='action' value='graph' title='view trends'>
+   <img src='/bweb/chart.png' alt=''> View stats </button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="fileset_view" action='bweb.pl?'>
   <input type='hidden' name='fileset' value='<TMPL_VAR FileSet>'>
-  <label>
-  <input type="image" name='action' value='fileset_view' title='view fileset'
-   src='/bweb/zoom.png'> View FileSet
-  </label>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='view fileset'> 
+ <img src='/bweb/zoom.png' alt=''> View FileSet</button>
  </form>
  </td>
 <!-- Remove this to activate bfileview 
  <td>
- <form action='bfileview.pl?'>
+ <form name="bfileview" action='bfileview.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
   <input type='hidden' name='where' value='/'>
-  <label>
-  <input type="image" name='action' value='bfileview' title='view file usage'
-   src='/bweb/colorscm.png' onclick='if (<TMPL_VAR JobFiles> > 50000) { return confirm("It could take long time, do you want to continue ?")} else { return 1; }'> View file usage
-  </label>
+  <button type="submit" class="bp" name='action' value='bfileview' 
+   title='view file usage' 
+   onclick='if (<TMPL_VAR JobFiles> > 50000) { return confirm("It could take long time, do you want to continue ?")} else { return 1; }'>
+   <img src='/bweb/colorscm.png' alt=''> View file usage </button>
  </form>
  </td>
 -->
  <td>
- <form action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
+ <form name="rerun" action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
   <input type='hidden' name='storage' value='<TMPL_VAR storage>'>
   <input type='hidden' name='fileset' value='<TMPL_VAR fileset>'>
   <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
   <input type='hidden' name='client' value='<TMPL_VAR client>'>
   <input type='hidden' id="rerun_level" name='level'>
   <input type='hidden' name='job' value='<TMPL_VAR jobname>'>
-  <label>
-  <input type="image" name='action' value='run_job_mod' title='run this job again'
-   src='/bweb/R.png'> Run this job
-  </label>
+  <button type="submit" class="bp" name='action' value='run_job_mod' title='run this job again'>
+   <img src='/bweb/R.png'> Run this job </button>
  </form>
  </td>
 <TMPL_IF joberrors>
diff --git a/gui/bweb/tpl/display_location.tpl b/gui/bweb/tpl/display_location.tpl
index b00075877b..18caefea9f 100644
--- a/gui/bweb/tpl/display_location.tpl
+++ b/gui/bweb/tpl/display_location.tpl
@@ -5,12 +5,11 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' value='location_add' title='Add a location' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='location_del' title='Remove a location' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='location_edit' title='Edit a location' src='/bweb/edit.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='location_add' title='Add a location'> <img src='/bweb/add.png' alt=''>Add</button>
+    <button type="submit" class="bp" name='action' value='location_del' title='Remove a location'> <img src='/bweb/remove.png' alt=''>Remove</button>
+    <button type="submit" class="bp" name='action' value='location_edit' title='Edit a location'> <img src='/bweb/edit.png' alt=''>Edit</button>
 
-    <input type="image" name='action' value='media' title='Show content'
-     src='/bweb/zoom.png'>
+    <button type="submit" class="bp" name='action' value='media' title='Show content'> <img src='/bweb/zoom.png' alt=''>View content</button>
    </form>
  </div>
 
diff --git a/gui/bweb/tpl/display_media.tpl b/gui/bweb/tpl/display_media.tpl
index cad256d73b..19ef23920e 100644
--- a/gui/bweb/tpl/display_media.tpl
+++ b/gui/bweb/tpl/display_media.tpl
@@ -20,14 +20,14 @@ Location : <TMPL_VAR location>
 
    <form action='?action=test' method='get'>
     <table id='id_pool_<TMPL_VAR ID>'></table>
-      <input type="image" name='action' value='extern' title='Move out' src='/bweb/extern.png' onclick='return confirm("Do you want to eject selected media ?");'>&nbsp;
-      <input type="image" name='action' value='intern' title='Move in' src='/bweb/intern.png'>&nbsp;
-      <input type="image" name='action' value='update_media' title='Update medium' src='/bweb/edit.png'>&nbsp;
-      <input type="image" name='action' value='media_zoom' title='Information' src='/bweb/zoom.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='extern' title='Move out'> <img src='/bweb/extern.png' onclick='return confirm("Do you want to eject selected media ?");' alt=''>Eject</button>
+      <button type="submit" class="bp" name='action' value='intern' title='Move in'> <img src='/bweb/intern.png' alt=''>Load</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='Update medium'> <img src='/bweb/edit.png' alt=''>Edit</button>
+      <button type="submit" class="bp" name='action' value='media_zoom' title='Information'> <img src='/bweb/zoom.png' alt=''>View</button>
 <!--
-      <input type="image" name='action' value='purge' title='Purge' src='/bweb/purge.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' alt=''>Purge</button>
 -->
-      <input type="image" name='action' value='prune' title='Prune' src='/bweb/prune.png'>
+      <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
    </form>
  </div>
 
diff --git a/gui/bweb/tpl/display_media_zoom.tpl b/gui/bweb/tpl/display_media_zoom.tpl
index 6f8a53a5cb..94d9d4ecbf 100644
--- a/gui/bweb/tpl/display_media_zoom.tpl
+++ b/gui/bweb/tpl/display_media_zoom.tpl
@@ -14,13 +14,13 @@
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>&nbsp;
-      <input type="image" name='action' value='extern' onclick='return confirm("Do you want to eject this medium ?");' title='move out' src='/bweb/extern.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='extern' onclick='return confirm("Do you want to eject this volume ?");' title='move out'> <img src='/bweb/extern.png' alt=''>Eject</button>
 <TMPL_ELSE>
-      <input type="image" name='action' value='intern' title='move in' src='/bweb/intern.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='intern' title='move in'> <img src='/bweb/intern.png' alt=''>Load</button>
 </TMPL_IF>
-      <input type="image" name='action' value='update_media' title='Update' src='/bweb/edit.png'>&nbsp;
-      <input type="image" name='action' value='purge' title='Purge' src='/bweb/purge.png' onclick="return confirm('Do you want to purge this volume ?')">&nbsp;
-      <input type="image" name='action' value='prune' title='Prune' src='/bweb/prune.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='update_media' title='Update'><img src='/bweb/edit.png' alt=''>Edit</button>
+      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' onclick="return confirm('Do you want to purge this volume ?')" alt=''>Purge</button>
+      <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
 <TMPL_IF Locationlog>
       <a href='#' onclick='document.getElementById("locationlog").style.visibility="visible";'><img title='View location log' src='/bweb/zoom.png'></a>
 </TMPL_IF>
diff --git a/gui/bweb/tpl/display_pool.tpl b/gui/bweb/tpl/display_pool.tpl
index cda70330f9..852f2cd5e2 100644
--- a/gui/bweb/tpl/display_pool.tpl
+++ b/gui/bweb/tpl/display_pool.tpl
@@ -5,7 +5,7 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" type='submit' name='action' value='media' title='Show content' src='/bweb/zoom.png'>
+    <button type="submit" class="bp" type='submit' name='action' value='media' title='Show content'> <img src='/bweb/zoom.png' alt=''>View</button>
     <input id="mediatype" type='hidden' name='mediatype' value=''>
    </form>
    <br/>
diff --git a/gui/bweb/tpl/display_user.tpl b/gui/bweb/tpl/display_user.tpl
index 5c8d273764..435de7d873 100644
--- a/gui/bweb/tpl/display_user.tpl
+++ b/gui/bweb/tpl/display_user.tpl
@@ -50,8 +50,8 @@
  </td>
 </tr>
 </table>
-    <input type="image" name='action' value='user_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='user_save'>
+     <img src='/bweb/save.png' alt=''> </button>
 </form>
 </div>
 
diff --git a/gui/bweb/tpl/display_users.tpl b/gui/bweb/tpl/display_users.tpl
index 7a477a9852..e34163ac22 100644
--- a/gui/bweb/tpl/display_users.tpl
+++ b/gui/bweb/tpl/display_users.tpl
@@ -5,16 +5,14 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' value='user_add' title='Add' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='user_del' 
+    <button type="submit" class="bp" name='action' value='user_add' title='Add'> <img src='/bweb/add.png' alt=''>Add</button>
+    <button type="submit" class="bp" name='action' value='user_del' 
      onclick="return confirm('Do you want to delete this user ?');" 
-     title='Supprimer' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='user_edit' title='Modify' src='/bweb/edit.png'>&nbsp;
+     title='Remove'> <img src='/bweb/remove.png' alt=''>Remove </button>
+    <button type="submit" class="bp" name='action' value='user_edit' title='Modify'> <img src='/bweb/edit.png' alt=''>Edit </button>
 
-    <input type="image" name='action' value='client' title='View clients'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='job' title='View jobs'
-     src='/bweb/zoom.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='client' title='View clients'> <img src='/bweb/zoom.png' alt=''>View clients</button>
+    <button type="submit" class="bp" name='action' value='job' title='View jobs'> <img src='/bweb/zoom.png' alt=''>View jobs</button>
    </form>
  </div>
 
diff --git a/gui/bweb/tpl/groups_add.tpl b/gui/bweb/tpl/groups_add.tpl
index f19ab68153..ca94cfa599 100644
--- a/gui/bweb/tpl/groups_add.tpl
+++ b/gui/bweb/tpl/groups_add.tpl
@@ -10,7 +10,6 @@
          </td>
      </tr>
     </table>
-    <input type="image" name='action' value='groups_add' title="Save"
-      src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='groups_add' title="Save"> <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
diff --git a/gui/bweb/tpl/groups_edit.tpl b/gui/bweb/tpl/groups_edit.tpl
index 88a2612488..ffa3ee9ba3 100644
--- a/gui/bweb/tpl/groups_edit.tpl
+++ b/gui/bweb/tpl/groups_edit.tpl
@@ -21,8 +21,8 @@
          </td>
      </tr>
     </table>
-    <input type="image" name='action' value='groups_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='groups_save'>
+     <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
 
diff --git a/gui/bweb/tpl/help_extern.tpl b/gui/bweb/tpl/help_extern.tpl
index 465a86c42e..5e543c6918 100644
--- a/gui/bweb/tpl/help_extern.tpl
+++ b/gui/bweb/tpl/help_extern.tpl
@@ -37,7 +37,7 @@ be asked to make your selection on the next screen.
               value='10'> </td>
     </tr>
     <tr>
-        <td><input type="image" name='action' value='compute_extern_media' title='Next' src='/bweb/next.png'>
+        <td><button type="submit" class="bp" name='action' value='compute_extern_media' title='Next'> <img src='/bweb/next.png' alt=''> </button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/tpl/help_extern_compute.tpl b/gui/bweb/tpl/help_extern_compute.tpl
index 906e6c332e..5809395f83 100644
--- a/gui/bweb/tpl/help_extern_compute.tpl
+++ b/gui/bweb/tpl/help_extern_compute.tpl
@@ -8,9 +8,9 @@
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <input type="image" onclick='javascript:window.history.go(-2);' title='Back' src='/bweb/prev.png'>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
     </td><td style='align: right;'>
-    <input type="image" name='action' value='extern' src='/bweb/extern.png' title='Eject selection'>
+    <button type="submit" class="bp" name='action' value='extern' title='Eject selection'> <img src='/bweb/extern.png' alt=''>Eject</button>
    </td></tr>
    </form>
  </div>
diff --git a/gui/bweb/tpl/help_intern.tpl b/gui/bweb/tpl/help_intern.tpl
index e8a1edc6bc..f4ac188c70 100644
--- a/gui/bweb/tpl/help_intern.tpl
+++ b/gui/bweb/tpl/help_intern.tpl
@@ -43,8 +43,7 @@ be asked to make your selection on the next screen.
                 size='3' value='10'> </td>
     </tr>
     <tr>
-        <td><input type="image" name='action' value='compute_intern_media' 
-                title='Next' src='/bweb/next.png'>
+        <td><button type="submit" class="bp" name='action' value='compute_intern_media' title='Next'> <img src='/bweb/next.png' alt=''>Next</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/tpl/help_intern_compute.tpl b/gui/bweb/tpl/help_intern_compute.tpl
index cd4aa6db94..2f2de98d6a 100644
--- a/gui/bweb/tpl/help_intern_compute.tpl
+++ b/gui/bweb/tpl/help_intern_compute.tpl
@@ -8,11 +8,11 @@
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <input type="image" onclick='javascript:window.history.go(-2);' title='Back' src='/bweb/prev.png'>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
     </td><td style='align: right;'>
     <input type="hidden" name='enabled' value="yes">
-    <input type="image" name='action' value='move_media'
-     src='/bweb/intern.png'>
+    <button type="submit" class="bp" name='action' value='move_media'> 
+     <img src='/bweb/intern.png' alt=''></button>
    </td></tr>
    </form>
  </div>
diff --git a/gui/bweb/tpl/location_add.tpl b/gui/bweb/tpl/location_add.tpl
index 8dd702600e..5fb28d02f4 100644
--- a/gui/bweb/tpl/location_add.tpl
+++ b/gui/bweb/tpl/location_add.tpl
@@ -14,13 +14,16 @@
          <td> <input class="formulaire" type='text' value='10' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Enabled :</td> 
-         <td> <input class="formulaire" type='checkbox' value='10' name='enabled'>
-         </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_add' title="save"
-      src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='location_add' title="save" ><img src='/bweb/save.png' alt=''>Save</button>
    </form>
 
 Tips: It's a good idea to have a location per autochanger. 
diff --git a/gui/bweb/tpl/location_edit.tpl b/gui/bweb/tpl/location_edit.tpl
index c7f28afe57..fa11cb14d0 100644
--- a/gui/bweb/tpl/location_edit.tpl
+++ b/gui/bweb/tpl/location_edit.tpl
@@ -24,8 +24,8 @@
         </td>
     </tr>
     </table>
-    <input type="image" name='action' value='location_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='location_save'>
+      <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
 
diff --git a/gui/bweb/tpl/move_media.tpl b/gui/bweb/tpl/move_media.tpl
index 3c5c66cd61..78b75664e0 100644
--- a/gui/bweb/tpl/move_media.tpl
+++ b/gui/bweb/tpl/move_media.tpl
@@ -25,9 +25,7 @@
 <textarea name="comment" class='formulaire'></textarea>
     </td></tr>
     </table>
-    <label>
-    <input type="image" type='submit' name='action' value='change_location' src='/bweb/apply.png'> Move
-    </label>
+    <button type="submit" class="bp" type='submit' name='action' value='change_location'> <img src='/bweb/apply.png' alt=''> Move </button>
    </form>
  </div>
 
diff --git a/gui/bweb/tpl/run_job.tpl b/gui/bweb/tpl/run_job.tpl
index 85eb1f79eb..9f333617a5 100644
--- a/gui/bweb/tpl/run_job.tpl
+++ b/gui/bweb/tpl/run_job.tpl
@@ -17,17 +17,8 @@
    </td></tr>
    </table>
    <br/>
-   <label>
-   <input type="image" name='action' value='enable_job' title='Enable'
-    src='/bweb/inflag1.png'> Enable
-   </label>
-   <label>
-   <input type="image" name='action' value='disable_job' title='Disable'
-    src='/bweb/inflag0.png'> Disable
-   </label>
-   <label>
-   <input type="image" name='action' value='run_job_mod' title='Run now'
-    src='/bweb/R.png'> Run now 
-   </label>
+   <button type="submit" class="bp" name='action' value='enable_job' title='Enable'> <img src='/bweb/inflag1.png' alt=''> Enable </button>
+   <button type="submit" class="bp" name='action' value='disable_job' title='Disable' > <img src='/bweb/inflag0.png' alt=''> Disable </button>
+   <button type="submit" class="bp" name='action' value='run_job_mod' title='Run now' > <img src='/bweb/R.png' alt=''> Run now  </button>
   </form>
  </div>
diff --git a/gui/bweb/tpl/run_job_mod.tpl b/gui/bweb/tpl/run_job_mod.tpl
index e3c0cd0e1a..db11dbb65e 100644
--- a/gui/bweb/tpl/run_job_mod.tpl
+++ b/gui/bweb/tpl/run_job_mod.tpl
@@ -70,18 +70,14 @@
    </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
-  </label>
-  <label>
-  <input type="image" name='action' value='fileset_view' title='View FileSet'
-   src='/bweb/zoom.png'>View FileSet
-  </label>
+
+  <button type="submit" class="bp" name='action' value='run_job_now' title='Run job'><img src='/bweb/R.png' alt=''>Run now</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='View FileSet'><img src='/bweb/zoom.png' alt=''>View FileSet</button>
   </form>
  </div>
 
diff --git a/gui/bweb/tpl/running_job.tpl b/gui/bweb/tpl/running_job.tpl
index cf3655d66d..c8d194deb4 100644
--- a/gui/bweb/tpl/running_job.tpl
+++ b/gui/bweb/tpl/running_job.tpl
@@ -7,14 +7,11 @@
    <table id='id<TMPL_VAR NAME=ID>'></table>
    <br/>
 <label>
-<input type='image' name='action' value='dsp_cur_job' 
- title='View job' src='/bweb/zoom.png'>
-</label>
-<label>
-<input type="image" type='submit' name='action' value='cancel_job'
+<button type="submit" class="bp" name='action' value='dsp_cur_job' 
+ title='View job'> <img src='/bweb/zoom.png' alt=''>View</button>
+<button type="submit" class="bp" type='submit' name='action' value='cancel_job'
  onclick="return confirm('Do you want to cancel the selected job?')"
- title='Cancel job' src='/bweb/cancel.png'>
-</label>
+ title='Cancel job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
    </form>
 
  </div>
diff --git a/gui/bweb/tpl/scheduled_job.tpl b/gui/bweb/tpl/scheduled_job.tpl
index 8bf1fd40a1..a63ba2ef6f 100644
--- a/gui/bweb/tpl/scheduled_job.tpl
+++ b/gui/bweb/tpl/scheduled_job.tpl
@@ -5,14 +5,10 @@
  <div class='bodydiv'>
     <form action='<TMPL_VAR cginame>?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
-     <label>
-     <input type="image" name='action' value='run_job_mod'
-      src='/bweb/R.png' title='Run now'>  Run now
-     </label>
-     <label>
-      <input type="image" name='action' value='disable_job'
-       src='/bweb/inflag0.png' title='Disable'> Disable
-      </label>
+     <button type="submit" class="bp" name='action' title='Run now' value='run_job_mod'>
+       <img src='/bweb/R.png' alt=''>  Run now </button>
+      <button type="submit" class="bp" name='action' title='Disable' value='disable_job'>
+       <img src='/bweb/inflag0.png' alt=''> Disable </button>
     </form>
  </div>
 
diff --git a/gui/bweb/tpl/update_location.tpl b/gui/bweb/tpl/update_location.tpl
index 93fc9eabf3..90bcacdf8d 100644
--- a/gui/bweb/tpl/update_location.tpl
+++ b/gui/bweb/tpl/update_location.tpl
@@ -10,7 +10,7 @@
       <option id='loc_<TMPL_VAR NAME=location>' value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
    </TMPL_LOOP>
   </select>
-  <input type="image" name='action' value='save_location' src='/bweb/apply.png'>
+  <button type="submit" class="bp" name='action' value='save_location'> <img src='/bweb/apply.png' alt=''>Apply</button>
    </form>
  </div>
 
diff --git a/gui/bweb/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index f09db42d7a..cf4269799a 100644
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -112,22 +112,16 @@
     </table>
 <table>
  <td>
- <label>
-  <input type="image" name='action' value='do_update_media' src='/bweb/apply.png'> Apply
-  </label>
-  <label>
-  <input type="image" name='action' title='Update from pool'
-    value='update_from_pool' src='/bweb/update.png'> Update from pool
-  </label>
+  <button type="submit" class="bp" name='action' value='do_update_media'> <img src='/bweb/apply.png' alt=''> Apply </button>
+  <button type="submit" class="bp" name='action' title='Update from pool'
+    value='update_from_pool'> <img src='/bweb/update.png' alt=''> Update from pool </button>
  </form>
  </td>
  <td>
   <form action='?' method='GET'>
    <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
-   <label>
-    <input type="image" name='action' value='media'
-     src='/bweb/zoom.png'>View Pool
-   </label>
+    <button type="submit" class="bp" name='action' value='media'>
+     <img src='/bweb/zoom.png' alt=''>View Pool </button>
   </form>
  </td>
 </table>
-- 
2.39.5