From: Marcin Haba Date: Sun, 7 Nov 2021 05:02:59 +0000 (+0100) Subject: baculum: Unify buttons view X-Git-Tag: Release-11.3.2~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35474f49c462c61cad29aa7f9356ab389a674816;p=thirdparty%2Fbacula.git baculum: Unify buttons view --- diff --git a/gui/baculum/protected/Web/Pages/ClientView.page b/gui/baculum/protected/Web/Pages/ClientView.page index 45b1007af..32c84c9e3 100644 --- a/gui/baculum/protected/Web/Pages/ClientView.page +++ b/gui/baculum/protected/Web/Pages/ClientView.page @@ -40,7 +40,7 @@ ClientSide.OnSuccess="$('#status_client_loading').hide();$('#show_client_container').hide();$('#status_client_container').show();oGraphicalClientStatus.set_refresh_timeout(document.getElementById('status_client_refresh_interval').value);" ClientSide.OnFailure="$('#status_client_loading').hide();status_client_show_error(parameter);" > - <%=Prado::localize('Status client')%>   +  <%[ Status client ]%>
-

<%[ Run job ]%>  

+

<%[ Run job ]%>  

diff --git a/gui/baculum/protected/Web/Pages/DirectorView.page b/gui/baculum/protected/Web/Pages/DirectorView.page index f24b68a9f..c72dd575d 100644 --- a/gui/baculum/protected/Web/Pages/DirectorView.page +++ b/gui/baculum/protected/Web/Pages/DirectorView.page @@ -23,7 +23,7 @@ ClientSide.OnSuccess="$('#status_director_loading').hide();$('#show_director_container').hide();$('#status_director_container').show();oGraphicalDirectorStatus.set_refresh_timeout(document.getElementById('status_director_refresh_interval').value);" ClientSide.OnFailure="$('#status_director_loading').hide();status_director_show_error(parameter);" > - <%[ Status director ]%>   + <%[ Status director ]%> <%[ Job history details ]%> -

[<%[ JobId ]%> <%=$this->getJobId()%>] <%[ Job: ]%> <%=$this->getJobName()%>  

+

[<%[ JobId ]%> <%=$this->getJobId()%>] <%[ Job: ]%> <%=$this->getJobName()%>  

@@ -40,17 +40,17 @@ Display="None" ClientSide.OnSuccess="job_callback_func(true);" > - <%=Prado::localize('Cancel job')%>   +  <%[ Cancel job ]%> - <%=Prado::localize('Run job again')%>   +  <%[ Run job again ]%> - <%[ Delete ]%>   +  <%[ Delete ]%> - <%[ Restore ]%>   +  <%[ Restore ]%>

<%[ Job: ]%> <%=$this->getJobUname()%>   @@ -577,7 +577,7 @@ $(function() { OnClick="delete" ClientSide.OnSuccess="document.location.href='<%=$this->Service->constructUrl('JobHistoryList')%>';" > - <%=Prado::localize('Delete')%>   +  <%[ Delete ]%>

diff --git a/gui/baculum/protected/Web/Pages/JobView.page b/gui/baculum/protected/Web/Pages/JobView.page index dc50c0b9f..4a5ea40da 100644 --- a/gui/baculum/protected/Web/Pages/JobView.page +++ b/gui/baculum/protected/Web/Pages/JobView.page @@ -45,7 +45,7 @@ OnClick="loadRunJobModal" Attributes.onclick="document.getElementById('run_job').style.display='block'" > - <%=Prado::localize('Run job')%>   +  <%[ Run job ]%>
diff --git a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page index a1da7fa45..da05a2546 100644 --- a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page +++ b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page @@ -127,7 +127,7 @@ CommandName="Complete" CssClass="w3-button w3-green" > - <%[ Create job ]%>   +  <%[ Create job ]%>
diff --git a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page index f2bb80b25..da5c3280e 100644 --- a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page +++ b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page @@ -127,7 +127,7 @@ CommandName="Complete" CssClass="w3-button w3-green" > - <%[ Create job ]%>   +  <%[ Create job ]%> diff --git a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page index f2c185084..af623502e 100644 --- a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page +++ b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page @@ -127,7 +127,7 @@ CommandName="Complete" CssClass="w3-button w3-green" > - <%[ Create job ]%>   +  <%[ Create job ]%> diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page index c87d77927..954ea7089 100644 --- a/gui/baculum/protected/Web/Pages/RestoreWizard.page +++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page @@ -110,13 +110,13 @@ CausesValidation="false" CssClass="w3-button w3-green" > - <%[ Previous ]%>  +  <%[ Previous ]%> - <%[ Run restore ]%>   +  <%[ Run restore ]%> diff --git a/gui/baculum/protected/Web/Pages/VolumeView.page b/gui/baculum/protected/Web/Pages/VolumeView.page index 82d4b6d7d..48f62d8ee 100644 --- a/gui/baculum/protected/Web/Pages/VolumeView.page +++ b/gui/baculum/protected/Web/Pages/VolumeView.page @@ -23,7 +23,7 @@  <%[ Prune ]%> diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl index 141ee5829..23bb3a80c 100644 --- a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl +++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl @@ -81,7 +81,7 @@ var oBaculaConfigResourceList<%=$this->ClientID%> = { edit_btn.className = 'w3-button w3-green w3-margin-right'; edit_btn.type = 'button'; var i = document.createElement('I'); - i.className = 'fa fa-list-ul'; + i.className = 'fa fa-edit'; var label = document.createTextNode(' <%[ Edit ]%>'); edit_btn.appendChild(i); edit_btn.innerHTML += ' '; diff --git a/gui/baculum/protected/Web/Portlets/Bconsole.tpl b/gui/baculum/protected/Web/Portlets/Bconsole.tpl index 661b0c22b..77c823ce6 100644 --- a/gui/baculum/protected/Web/Portlets/Bconsole.tpl +++ b/gui/baculum/protected/Web/Portlets/Bconsole.tpl @@ -16,9 +16,9 @@ document.getElementById('<%=$this->CommandLine->ClientID%>').readOnly = false; $('#<%=$this->CommandLine->ClientID%>').focus(); - <%[ Enter ]%>   +  <%[ Enter ]%> - +