baculum: Unify buttons view

diff --git a/gui/baculum/protected/Web/Pages/ClientView.page b/gui/baculum/protected/Web/Pages/ClientView.page
index 45b1007afe527b8e608f73119652f3e37fca8c3d..32c84c9e302d838dc3ae91f20d3a63dd1e195a1b 100644 (file)
--- 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);"
                >
-                       <prop:Text><%=Prado::localize('Status client')%> &nbsp;<i class="fa fa-file-medical-alt"></i></prop:Text>
+                       <i class="fa fa-file-medical-alt"></i> &nbsp;<%[ Status client ]%>
                </com:TActiveLinkButton>
                <com:Application.Web.Portlets.ComponentActionsMenu
                        ID="CompActions"

diff --git a/gui/baculum/protected/Web/Pages/Dashboard.page b/gui/baculum/protected/Web/Pages/Dashboard.page
index 83c264095c495b783ce3a30c0fac0c4be85fda97..4d10c8e077be35f2a0d7766465d57c6c470f3d64 100644 (file)
--- a/gui/baculum/protected/Web/Pages/Dashboard.page
+++ b/gui/baculum/protected/Web/Pages/Dashboard.page
@@ -83,7 +83,7 @@
                                        Style="text-decoration: none"
                                >
                                        <div class="w3-container w3-blue w3-block w3-center w3-padding-small w3-margin-right w3-margin-bottom">
-                                               <p style="margin: 3px 0"><%[ Run job ]%> &nbsp;<i class="fa fa-play w3-small"></i></p>
+                                               <p style="margin: 3px 0"><%[ Run job ]%> &nbsp;<i class="fa fa-cogs w3-small"></i></p>
                                        </div>
                                </com:TActiveLinkButton>
                                <a href="<%=$this->Service->constructUrl('RestoreWizard')%>" style="text-decoration: none">

diff --git a/gui/baculum/protected/Web/Pages/DirectorView.page b/gui/baculum/protected/Web/Pages/DirectorView.page
index f24b68a9f62cbe18b8a61b89db0f86c78d3aee68..c72dd575de070ea69640bf08809d88224ce11519 100644 (file)
--- 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 ]%> &nbsp;<i class="fa fa-file-medical-alt"></i>
+                       <i class="fa fa-file-medical-alt"></i> <%[ Status director ]%>
                </com:TActiveLinkButton>
                <com:Application.Web.Portlets.ComponentActionsMenu
                        ID="CompActions"

diff --git a/gui/baculum/protected/Web/Pages/JobHistoryView.page b/gui/baculum/protected/Web/Pages/JobHistoryView.page
index c0c513ceadc876e657ca51a41a38f4505c14ce1f..edd4f04bb6524ef6abb8737733ae28344b18db15 100644 (file)
--- a/gui/baculum/protected/Web/Pages/JobHistoryView.page
+++ b/gui/baculum/protected/Web/Pages/JobHistoryView.page
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-tasks"></i> <%[ Job history details ]%></b>
                </h5>
        </header>
-       <h3>[<%[ JobId ]%> <%=$this->getJobId()%>] <%[ Job: ]%> <%=$this->getJobName()%> &nbsp;</h3>
+       <h3 class="w3-margin-left">[<%[ JobId ]%> <%=$this->getJobId()%>] <%[ Job: ]%> <%=$this->getJobName()%> &nbsp;</h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('JobHistoryList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_job_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'job_actions'); job_callback_func(); oRunningJobStatus.init_refresh();"><%[ Actions ]%></button>
@@ -40,17 +40,17 @@
                        Display="None"
                        ClientSide.OnSuccess="job_callback_func(true);"
                >
-                       <prop:Text><%=Prado::localize('Cancel job')%> &nbsp;<i class="fa fa-stop"></i></prop:Text>
+                       <i class="fa fa-stop"></i> &nbsp;<%[ Cancel job ]%>
                </com:TActiveLinkButton>
                <com:TActiveLinkButton
                        CssClass="w3-button w3-green w3-margin-bottom"
                        OnClick="loadRunJobModal"
                        Attributes.onclick="document.getElementById('run_job').style.display='block'"
                >
-                       <prop:Text><%=Prado::localize('Run job again')%> &nbsp;<i class="fa fa-undo"></i></prop:Text>
+                       <i class="fa fa-undo"></i> &nbsp;<%[ Run job again ]%>
                </com:TActiveLinkButton>
                <com:TActiveLinkButton ID="DeleteBtn" CssClass="w3-button w3-red w3-margin-bottom" Attributes.onclick="$('#job_delete_confirm').show();">
-                       <%[ Delete ]%> &nbsp;<i class="fa fa-trash-alt"></i>
+                       <i class="fa fa-trash-alt"></i> &nbsp;<%[ Delete ]%>
                </com:TActiveLinkButton>
                <com:TActiveLinkButton
                        ID="RestoreBtn"
@@ -58,7 +58,7 @@
                        CssClass="w3-button w3-green w3-margin-bottom"
                        Display="None"
                >
-                       <%[ Restore ]%> &nbsp;<i class="fa fa-reply"></i>
+                       <i class="fa fa-reply"></i> &nbsp;<%[ Restore ]%>
                </com:TActiveLinkButton>
                <div class="w3-panel w3-card w3-light-grey">
                        <h3><%[ Job: ]%> <%=$this->getJobUname()%> &nbsp;
@@ -577,7 +577,7 @@ $(function() {
                                        OnClick="delete"
                                        ClientSide.OnSuccess="document.location.href='<%=$this->Service->constructUrl('JobHistoryList')%>';"
                                >
-                                       <prop:Text><%=Prado::localize('Delete')%> &nbsp;<i class="fa fa-trash-alt"></i></prop:Text>
+                                       <i class="fa fa-trash-alt"></i>  &nbsp;<%[ Delete ]%>
                                </com:TActiveLinkButton>
                        </div>
                </div>

diff --git a/gui/baculum/protected/Web/Pages/JobView.page b/gui/baculum/protected/Web/Pages/JobView.page
index dc50c0b9fc3e24dca305f223e7fd0d7019a13798..4a5ea40dae5dedc000b892a1e6a70c0db61cf18c 100644 (file)
--- 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'"
                >
-                       <prop:Text><%=Prado::localize('Run job')%> &nbsp;<i class="fa fa-undo"></i></prop:Text>
+                       <i class="fa fa-undo"></i> &nbsp;<%[ Run job ]%>
                </com:TActiveLinkButton>
                <com:Application.Web.Portlets.RunJob ID="RunJobModal" />
                <div id="job_graph_container">

diff --git a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page
index a1da7fa45a779ad6eeafb2a18f68d6d746aaf1cf..da05a25465b56ab4f4a4ffcf0a167c30fef9bcc4 100644 (file)
--- 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 ]%> &nbsp;<i class="fa fa-paper-plane"></i>
+                                       <i class="fa fa-paper-plane"></i> &nbsp;<%[ Create job ]%>
                                </com:TLinkButton>
                        </div>
                        </div>

diff --git a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page
index f2bb80b2596a906ee2cf401acb0b767c81a8ef35..da5c3280e18d36e7cf47ddd4845cb557a14e67e1 100644 (file)
--- 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 ]%> &nbsp;<i class="fa fa-paper-plane"></i>
+                                       <i class="fa fa-paper-plane"></i> &nbsp;<%[ Create job ]%>
                                </com:TLinkButton>
                        </div>
                        </div>

diff --git a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page
index f2c1850847f92226c64d8a86f1cc501a4ef1973d..af623502e8fcf1d67a4c98884cbc123712fba292 100644 (file)
--- 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 ]%> &nbsp;<i class="fa fa-paper-plane"></i>
+                                       <i class="fa fa-paper-plane"></i> &nbsp;<%[ Create job ]%>
                                </com:TLinkButton>
                        </div>
                        </div>

diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page
index c87d77927e7bbf4f4df1dd7bde5d281e7aebe4a5..954ea7089a5565e23b416fe111f6413407a8a50d 100644 (file)
--- 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 ]%>&nbsp; <i class="fa fa-angle-left"></i>
+                                       <i class="fa fa-angle-left"></i> &nbsp;<%[ Previous ]%>
                                </com:TLinkButton>
                                <com:TLinkButton
                                        CommandName="Complete"
                                        CssClass="w3-button w3-green"
                                >
-                                       <%[ Run restore ]%> &nbsp;<i class="fa fa-paper-plane"></i>
+                                       <i class="fa fa-paper-plane"></i> &nbsp;<%[ Run restore ]%>
                                </com:TLinkButton>
                        </div>
                </prop:FinishNavigationTemplate>

diff --git a/gui/baculum/protected/Web/Pages/VolumeView.page b/gui/baculum/protected/Web/Pages/VolumeView.page
index 82d4b6d7d9e3f3a3133be8298d6322de01e1799b..48f62d8eecb2c58633aca9d40ae17e6f7abfd275 100644 (file)
--- a/gui/baculum/protected/Web/Pages/VolumeView.page
+++ b/gui/baculum/protected/Web/Pages/VolumeView.page
@@ -23,7 +23,7 @@
                                <i class="fa fa-shower"></i> &nbsp;<%[ Prune ]%>
                        </com:TActiveLinkButton>
                        <com:TActiveLinkButton
-                               CssClass="w3-button w3-green"
+                               CssClass="w3-button w3-red"
                                OnClick="purge"
                                Attributes.onclick="document.getElementById('volume_action_log').style.display='block'"
                        >

diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl
index 141ee582987d3bcf4a5d46105c43e83838236661..23bb3a80c05c811c803d22f5c171e801fad0c1f6 100644 (file)
--- 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 += '&nbsp';

diff --git a/gui/baculum/protected/Web/Portlets/Bconsole.tpl b/gui/baculum/protected/Web/Portlets/Bconsole.tpl
index 661b0c22b3f9e2c31be8dcc1de05a2972ec3e8f5..77c823ce667d5ce482bb1167738ccd34c25ea332 100644 (file)
--- 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();
                                </prop:ClientSide.OnComplete>
-                               <%[ Enter ]%> &nbsp;<i class="fa fa-play"></i>
+                               <i class="fa fa-play"></i> &nbsp;<%[ Enter ]%>
                        </com:TActiveLinkButton>
-                       <button class="w3-button w3-green" type="button" onclick="document.getElementById('<%=$this->OutputListing->ClientID%>').value = '';"><%[ Clear ]%> &nbsp;<i class="fa fa-times"></i></button>
+                       <button class="w3-button w3-red" type="button" onclick="document.getElementById('<%=$this->OutputListing->ClientID%>').value = '';"><i class="fa fa-times"></i> &nbsp;<%[ Clear ]%></button>
                </div>
        </div>
        <script type="text/javascript">

diff --git a/gui/baculum/protected/Web/Portlets/RunJob.tpl b/gui/baculum/protected/Web/Portlets/RunJob.tpl
index cd5511d2f1035c6654fa4d19687b187e2db42e87..30852e0ee35acdd49152250fde82db87c76eef4c 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/RunJob.tpl
+++ b/gui/baculum/protected/Web/Portlets/RunJob.tpl
@@ -177,7 +177,6 @@
                <footer class="w3-container w3-center">
                        <com:TActiveLinkButton
                                ID="Estimate"
-                               Text="<%[ Estimate job ]%>"
                                OnClick="estimate"
                                CssClass="w3-button w3-section w3-teal w3-padding"
                        >
@@ -194,10 +193,10 @@
                                        show_job_log(true);
                                        scroll_down_job_log();
                                </prop:ClientSide.OnComplete>
+                               <i class="fas fa-weight"></i> &nbsp;<%[ Estimate job ]%>
                        </com:TActiveLinkButton>
                        <com:TActiveLinkButton
                                ID="Run"
-                               Text="<%[ Run job ]%>"
                                ValidationGroup="JobGroup"
                                CausesValidation="true"
                                OnClick="runJobAgain"
@@ -207,6 +206,7 @@
                                        var mainForm = Prado.Validation.getForm();
                                        return Prado.Validation.validate(mainForm, 'JobGroup');
                                </prop:Attributes.onclick>
+                               <i class="fas fa-paper-plane"></i> &nbsp;<%[ Run job ]%>
                        </com:TActiveLinkButton>
                        <script>
                                var run_job_go_to_running_job = function(jobid) {