From: Eric Bollengier Date: Mon, 11 Apr 2011 16:03:24 +0000 (+0200) Subject: bweb: update tpls X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=916d40993aa0e3fd8da7e5f457f950054628c045;p=bacula%2Fbacula bweb: update tpls --- diff --git a/gui/bweb/lang/en/tpl/ach_content.tpl b/gui/bweb/lang/en/tpl/ach_content.tpl index afe7bfa830..79e0517b19 100644 --- a/gui/bweb/lang/en/tpl/ach_content.tpl +++ b/gui/bweb/lang/en/tpl/ach_content.tpl @@ -24,7 +24,7 @@ Autochanger: ( Drives + title='clear I/O'> Clear I/O @@ -72,7 +72,7 @@ human_size(), "", "", "", -"", +timestamp_to_iso(""), chkbox ) ); diff --git a/gui/bweb/lang/en/tpl/add_media.tpl b/gui/bweb/lang/en/tpl/add_media.tpl index dd55c52891..2d4630aeaa 100644 --- a/gui/bweb/lang/en/tpl/add_media.tpl +++ b/gui/bweb/lang/en/tpl/add_media.tpl @@ -34,7 +34,7 @@ diff --git a/gui/bweb/lang/en/tpl/begin.tpl b/gui/bweb/lang/en/tpl/begin.tpl index 728b8184f6..25b1c272d7 100644 --- a/gui/bweb/lang/en/tpl/begin.tpl +++ b/gui/bweb/lang/en/tpl/begin.tpl @@ -76,9 +76,12 @@ if ('Main' == ('_' + '_Main_' + '_')) {
  • About
    • -
  •  Logged as
    • +
  •   +Logged as +on +
  • -
    • +
    diff --git a/gui/bweb/lang/en/tpl/display_job.tpl b/gui/bweb/lang/en/tpl/display_job.tpl index 7258064596..4e76c2027a 100644 --- a/gui/bweb/lang/en/tpl/display_job.tpl +++ b/gui/bweb/lang/en/tpl/display_job.tpl @@ -14,14 +14,15 @@ document.getElementById('status_').checked = true; var header = new Array("JobId", "Client", - "Job Name", + "Job Name", + "Comment", "FileSet", // "Pool", "Level", "StartTime", "Duration", "JobFiles", - "JobBytes", + "JobBytes", "Errors", "Status"); @@ -42,12 +43,13 @@ a.appendChild(img); data.push( new Array( "", "", -"", +"", +"", "", //"", "", "", -"", +human_duration(""), "", human_size(), "", diff --git a/gui/bweb/lang/en/tpl/display_job_zoom.tpl b/gui/bweb/lang/en/tpl/display_job_zoom.tpl index 44eee8c217..8b38bc74dc 100644 --- a/gui/bweb/lang/en/tpl/display_job_zoom.tpl +++ b/gui/bweb/lang/en/tpl/display_job_zoom.tpl @@ -1,5 +1,6 @@
    -

    Information about job

    +

    Information about job + ()

    @@ -88,6 +89,7 @@ var header = new Array("JobId", "Duration", "JobFiles", "JobBytes", +// "Comp", "Errors", "Pool", "Volume Name", @@ -108,9 +110,10 @@ data.push( new Array( "", "", "", -"", +human_duration(""), "", human_size(), +//parseInt(100-100*/(+0.00001), 10) + "%", "", "", "\n", diff --git a/gui/bweb/lang/en/tpl/display_media.tpl b/gui/bweb/lang/en/tpl/display_media.tpl index b44fdc8505..89d20277e9 100644 --- a/gui/bweb/lang/en/tpl/display_media.tpl +++ b/gui/bweb/lang/en/tpl/display_media.tpl @@ -62,7 +62,7 @@ d, "", "", "", -"", +timestamp_to_iso(""), chkbox ) ); diff --git a/gui/bweb/lang/en/tpl/display_media_zoom.tpl b/gui/bweb/lang/en/tpl/display_media_zoom.tpl index fc4d0119c0..a79ee10319 100644 --- a/gui/bweb/lang/en/tpl/display_media_zoom.tpl +++ b/gui/bweb/lang/en/tpl/display_media_zoom.tpl @@ -56,7 +56,7 @@ human_enabled(""), "", "", human_size(), -"", +timestamp_to_iso(""), human_sec(), human_sec(), "" diff --git a/gui/bweb/lang/en/tpl/help_extern_compute.tpl b/gui/bweb/lang/en/tpl/help_extern_compute.tpl index 08a95453cd..ef7d51f3c8 100644 --- a/gui/bweb/lang/en/tpl/help_extern_compute.tpl +++ b/gui/bweb/lang/en/tpl/help_extern_compute.tpl @@ -37,7 +37,7 @@ data.push( new Array( "", "", "", -"", +timestamp_to_iso(""), chkbox ) ); diff --git a/gui/bweb/lang/en/tpl/help_intern_compute.tpl b/gui/bweb/lang/en/tpl/help_intern_compute.tpl index 799ee2fdcc..a3c29409ab 100644 --- a/gui/bweb/lang/en/tpl/help_intern_compute.tpl +++ b/gui/bweb/lang/en/tpl/help_intern_compute.tpl @@ -39,7 +39,7 @@ data.push( new Array( "", "", "", -"", +timestamp_to_iso(""), chkbox ) ); diff --git a/gui/bweb/lang/en/tpl/run_job_mod.tpl b/gui/bweb/lang/en/tpl/run_job_mod.tpl index 6652800aff..5c555c1a6e 100644 --- a/gui/bweb/lang/en/tpl/run_job_mod.tpl +++ b/gui/bweb/lang/en/tpl/run_job_mod.tpl @@ -57,7 +57,11 @@ + + Comment: + Start Time: ", joblevel[''], "", -"", +human_sec2(""), //"", //"", a, diff --git a/gui/bweb/lang/en/tpl/scheduled_job.tpl b/gui/bweb/lang/en/tpl/scheduled_job.tpl index 165c2e42fe..43f873ddc8 100644 --- a/gui/bweb/lang/en/tpl/scheduled_job.tpl +++ b/gui/bweb/lang/en/tpl/scheduled_job.tpl @@ -3,7 +3,7 @@

    Next Jobs

    - +
    diff --git a/gui/bweb/lang/es/tpl/ach_content.tpl b/gui/bweb/lang/es/tpl/ach_content.tpl index 228cfa010b..79e0517b19 100644 --- a/gui/bweb/lang/es/tpl/ach_content.tpl +++ b/gui/bweb/lang/es/tpl/ach_content.tpl @@ -1,14 +1,14 @@

    -Autochanger : ( Drives +Autochanger: ( Drives IMPORT/EXPORT)

    - Debe ejecutar el comando update slot, El estado del Autochanger es diferente al de las slots de bacula + You must run update slot, Autochanger status is different from bacula slots
    @@ -24,10 +24,10 @@ Autochanger : ( Drives + title='clear I/O'> Clear I/O + title='run update slots'> Update

    @@ -42,16 +42,16 @@ Autochanger : ( Drives
    - Contenido:
    + Content:
    -
  • Estadísticas +
  • Statistics
    • -
  • Configuración +
  • Configuration -
    diff --git a/gui/bweb/lang/es/tpl/display_job.tpl b/gui/bweb/lang/es/tpl/display_job.tpl index e3e068c195..4e76c2027a 100644 --- a/gui/bweb/lang/es/tpl/display_job.tpl +++ b/gui/bweb/lang/es/tpl/display_job.tpl @@ -1,5 +1,5 @@
    -

    Últimos Jobs ()

    +

    Last Jobs ()

    @@ -13,17 +13,18 @@ document.getElementById('status_').checked = true; var header = new Array("JobId", - "Cliente", - "Nombre Job", + "Client", + "Job Name", + "Comment", "FileSet", // "Pool", - "Nivel", - "Inicio", - "Archivos Job", - "Bytes Job", - "JobBytes", - "Errores", - "Estado"); + "Level", + "StartTime", + "Duration", + "JobFiles", + "JobBytes", + "Errors", + "Status"); var data = new Array(); @@ -42,12 +43,13 @@ a.appendChild(img); data.push( new Array( "", "", -"", +"", +"", "", //"", "", "", -"", +human_duration(""), "", human_size(), "", diff --git a/gui/bweb/lang/es/tpl/display_job_zoom.tpl b/gui/bweb/lang/es/tpl/display_job_zoom.tpl index 1dc53248ae..8b38bc74dc 100644 --- a/gui/bweb/lang/es/tpl/display_job_zoom.tpl +++ b/gui/bweb/lang/es/tpl/display_job_zoom.tpl @@ -1,5 +1,6 @@
    -

    Información acerca jobs

    +

    Information about job + ()

    @@ -8,21 +9,21 @@ + Delete
    - +
    - +
    @@ -31,14 +32,14 @@ + View stats
    - +
    @@ -80,18 +81,19 @@ @@ -14,42 +14,42 @@
    • -
  • Statistiques +
  • Statistics
    • @@ -75,10 +75,13 @@ if ('Accueil' == ('_' + '_Main_' + '_')) { -
  • A propos
    • -
  •  Logged as
    • +
  • About
    • +
  •   +Logged as +on +
  • -
    • +
    diff --git a/gui/bweb/lang/fr/tpl/display_job.tpl b/gui/bweb/lang/fr/tpl/display_job.tpl index 3ebe6fd002..4e76c2027a 100644 --- a/gui/bweb/lang/fr/tpl/display_job.tpl +++ b/gui/bweb/lang/fr/tpl/display_job.tpl @@ -1,5 +1,5 @@
    -

    Historique ()

    +

    Last Jobs ()

    @@ -14,16 +14,17 @@ document.getElementById('status_').checked = true; var header = new Array("JobId", "Client", - "Nom du Job", + "Job Name", + "Comment", "FileSet", // "Pool", - "Niveau", - "Début", - "Durée", - "Fichiers", - "Taille", - "Erreurs", - "Statut"); + "Level", + "StartTime", + "Duration", + "JobFiles", + "JobBytes", + "Errors", + "Status"); var data = new Array(); @@ -42,12 +43,13 @@ a.appendChild(img); data.push( new Array( "", "", -"", +"", +"", "", //"", "", "", -"", +human_duration(""), "", human_size(), "", diff --git a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl index 6c7d212c15..8b38bc74dc 100644 --- a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl +++ b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl @@ -1,28 +1,29 @@
    -

    Information sur un job

    +

    Information about job + ()

    - +
    - +
    - +
    		@@ -30,15 +31,15 @@ - +
    - +
    		@@ -46,14 +47,14 @@ + title='View file usage' + onclick='if ( > 50000) { return confirm("It could take long time, do you want to continue?")} else { return 1; }'> + View file usage - DocumentationDocumentation + View docView doc @@ -64,15 +65,15 @@ - + - View errors Voir les erreurs + title="View only errors"> + View errors View only errors
    @@ -81,17 +82,18 @@