]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Make job status pie chart smaller - idea proposed by Sergey Zhidkov
authorMarcin Haba <marcin.haba@bacula.pl>
Fri, 9 Jul 2021 04:11:06 +0000 (06:11 +0200)
committerEric Bollengier <eric@baculasystems.com>
Thu, 24 Mar 2022 08:03:25 +0000 (09:03 +0100)
Also improve responsive view of header boxes on dashboard page

gui/baculum/protected/Web/Pages/Dashboard.page
gui/baculum/themes/Baculum-v2/css/baculum.css

index b8cdb239e66b9fadd242eef4dbadeaf83af25a12..6b8f4de6cee779c3ae2a85a66c8b436bb9dfed79 100644 (file)
@@ -8,12 +8,12 @@
        </header>
        <div class="w3-row-padding w3-margin-bottom">
                <div class="w3-quarter">
-                       <div class="w3-container w3-card-4 w3-red w3-padding-16 w3-tooltip w3-animate-top usage_box">
-                               <div class="w3-left"><i class="fa fa-desktop w3-xxxlarge"></i></div>
+                       <div class="w3-container w3-card-4 w3-red w3-padding-24 w3-tooltip w3-animate-top usage_box">
+                               <div class="w3-left"><i class="fa fa-desktop w3-xxlarge w3-margin-right"></i></div>
                                <div class="w3-right">
-                                       <h3 id="client_no">-</h3>
+                                       <h4 id="client_no">-</h4>
                                </div>
-                               <h4><%[ Clients ]%></h4>
+                               <h5><%[ Clients ]%></h5>
                                <div class="w3-text">
                                        <p class="w3-small"><%[ The most often used: ]%> <strong><span id="client_most"></span></strong></p>
                                        <p class="w3-small"><%[ Job count the most used: ]%> <strong><span id="client_jobs"></span> <%[ jobs ]%></strong></p>
                        </div>
                </div>
                <div class="w3-quarter">
-                       <div class="w3-container w3-card-4 w3-blue w3-padding-16 w3-tooltip w3-animate-top usage_box">
-                               <div class="w3-left"><i class="fa fa-tasks w3-xxxlarge"></i></div>
+                       <div class="w3-container w3-card-4 w3-blue w3-padding-24 w3-tooltip w3-animate-top usage_box">
+                               <div class="w3-left"><i class="fa fa-tasks w3-xxlarge w3-margin-right"></i></div>
                                <div class="w3-right">
-                                       <h3 id="job_no">-</h3>
+                                       <h4 id="job_no">-</h4>
                                </div>
-                               <h4><%[ Finished jobs ]%></h4>
+                               <h5><%[ Finished jobs ]%></h5>
                                <div class="w3-text">
                                        <p class="w3-small"><%[ The most often used: ]%> <strong><span id="job_most"></span></strong></p>
                                        <p class="w3-small"><%[ Execution count most used: ]%> <strong><span id="job_most_count"></span> <%[ times ]%></strong></p>
                        </div>
                </div>
                <div class="w3-quarter">
-                       <div class="w3-container w3-card-4 w3-teal w3-padding-16 w3-tooltip w3-animate-top usage_box">
-                               <div class="w3-left"><i class="fa fa-tape w3-xxxlarge"></i></div>
+                       <div class="w3-container w3-card-4 w3-teal w3-padding-24 w3-tooltip w3-animate-top usage_box">
+                               <div class="w3-left"><i class="fa fa-tape w3-xxlarge w3-margin-right"></i></div>
                                <div class="w3-right">
-                                       <h3 id="pool_no">-</h3>
+                                       <h4 id="pool_no">-</h4>
                                </div>
-                               <h4><%[ Pools ]%></h4>
+                               <h5><%[ Pools ]%></h5>
                                <div class="w3-text">
                                        <p class="w3-small"><%[ The most often used: ]%> <strong><span id="pool_most"></span></strong></p>
                                        <p class="w3-small"><%[ Job count the most used: ]%> <strong><span id="pool_jobs"></span> <%[ jobs ]%></strong></p>
                        </div>
                </div>
                <div class="w3-quarter">
-                       <div class="w3-container w3-card-4 w3-orange w3-text-white w3-padding-16 w3-tooltip w3-animate-top usage_box">
-                               <div class="w3-left"><i class="fa fa-copy w3-xxxlarge"></i></div>
+                       <div class="w3-container w3-card-4 w3-orange w3-text-white w3-padding-24 w3-tooltip w3-animate-top usage_box">
+                               <div class="w3-left"><i class="fa fa-copy w3-xxlarge w3-margin-right"></i></div>
                                <div class="w3-right">
-                                       <h3 id="jobs_total_bytes">-</h3>
+                                       <h4 id="jobs_total_bytes">-</h4>
                                </div>
-                               <h4><%[ Total bytes ]%></h4>
+                               <h5><%[ Total bytes ]%></h5>
                                <div class="w3-text">
                                        <p><%[ Total files: ]%><strong><span id="jobs_total_files"></span></strong></p>
                                </div>
@@ -62,7 +62,7 @@
        </div>
        <div class="w3-panel">
                <div class="w3-row-padding" style="margin:0 -16px">
-                       <div class="w3-third">
+                       <div class="w3-quarter">
                                <div class="dashboard_graph">
                                        <div id="jobs_summary_graph"></div>
                                        <div id="jobs_summary_legend"></div>
@@ -73,7 +73,7 @@
                                        </header>
                                        <div class="w3-container w3-half w3-left">
                                                <div class="w3-padding-small"><%[ Database type: ]%> <span id="database_type"></span></div>
-                                               <div class="w3-padding-small"><%[ Database size: ]%> <span id="database_size"></span></div>
+                                               <div class="w3-padding-small"><%[ Database size: ]%> &nbsp;<span id="database_size"></span></div>
                                        </div>
                                        <div class="w3-clear"></div>
                                </div>
@@ -93,7 +93,7 @@
                                </a>
                                <com:Application.Web.Portlets.RunJob ID="RunJobModal" />
                        </div>
-                       <div class="w3-twothird">
+                       <div class="w3-threequarter">
                                <table id="last_jobs_list" class="w3-table w3-striped w3-hoverable w3-white w3-margin-bottom" style="width: 100%">
                                        <thead>
                                                <tr>
index ed38aeff4c3cb13ae48edd5ed3f03dd5011e59ff..53a5c0bcfccf5f58759a4f4b125caf5215fbfda1 100644 (file)
@@ -4,7 +4,8 @@
 }
 
 #jobs_summary_graph {
-       height: 380px;
+       height: 310px;
+       max-width: 800px;
        z-index: 0;
        cursor: pointer;
 }
@@ -405,7 +406,7 @@ table.component td:nth-of-type(1) {
 }
 
 .usage_box {
-       height: 78px;
+       height: 79px;
        -webkit-transition: height 0.3s; /* For Safari 3.1 to 6.0 */
        transition: height 0.3s;
 }
@@ -414,8 +415,13 @@ table.component td:nth-of-type(1) {
        height: 140px;
 }
 
+.usage_box h5 {
+       margin-top: 5px;
+       margin-left: 47px;
+}
+
 .usage_box h4 {
-       margin-left: 78px;
+       margin-top: 3px;
 }
 
 .info {