]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Reduce free spaces between interface elements - idea proposed by Sergey...
authorMarcin Haba <marcin.haba@bacula.pl>
Wed, 10 Nov 2021 19:30:53 +0000 (20:30 +0100)
committerEric Bollengier <eric@baculasystems.com>
Thu, 24 Mar 2022 08:03:27 +0000 (09:03 +0100)
32 files changed:
gui/baculum/protected/API/Portlets/APISideBar.tpl
gui/baculum/protected/Web/Pages/ClientView.page
gui/baculum/protected/Web/Pages/DirectorView.page
gui/baculum/protected/Web/Pages/FileSetView.page
gui/baculum/protected/Web/Pages/Graphs.page
gui/baculum/protected/Web/Pages/JobHistoryView.page
gui/baculum/protected/Web/Pages/JobView.page
gui/baculum/protected/Web/Pages/NewBackupJobWizard.page
gui/baculum/protected/Web/Pages/NewCopyJobWizard.page
gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page
gui/baculum/protected/Web/Pages/PoolView.page
gui/baculum/protected/Web/Pages/ScheduleView.page
gui/baculum/protected/Web/Pages/Security.page
gui/baculum/protected/Web/Pages/StorageView.page
gui/baculum/protected/Web/Pages/VolumeView.page
gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.tpl
gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
gui/baculum/protected/Web/Portlets/FileSetOptionRenderer.php
gui/baculum/protected/Web/Portlets/LabelVolume.tpl
gui/baculum/protected/Web/Portlets/MainSideBar.tpl
gui/baculum/protected/Web/Portlets/RunJob.tpl
gui/baculum/protected/Web/Portlets/UpdateSlots.tpl
gui/baculum/themes/Baculum-v2/css/baculum.css

index 5c1e93f876741cac05e3a13745693d4a050e0a99..775f373ec2e17a0754c40a7ad52bbc213137066c 100644 (file)
@@ -26,7 +26,7 @@
                </div>
        </div>
        <div class="w3-container w3-black">
-               <h5>Baculum API Menu</h5>
+               <h5 class="w3-center" style="margin: 6px 0 2px 0">Baculum API Menu</h5>
        </div>
        <div class="w3-bar-block" style="margin-bottom: 45px;">
                <div class="w3-black" style="height: 3px"></div>
index 1432b84c1d210983e3a973f5519c31e0e232ef17..599cb8e0444f0e759ac5d3af61990bf13dd14d64 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-desktop"></i> <%[ Client details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Client: ]%> <%=$this->getClientName()%> &nbsp;<span class="w3-small">[ClientId <%=$this->getClientId()%>]</span></h3>
+       <h3 class="view_header"><%[ Client: ]%> <%=$this->getClientName()%> &nbsp;<span class="w3-small">[ClientId <%=$this->getClientId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('ClientList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_client_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'client_actions');"><%[ Actions ]%></button>
index c72dd575de070ea69640bf08809d88224ce11519..0ab97292fb3db484569abe0a3ab36c4947a55b93 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-sitemap"></i> <%[ Director details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Director: ]%> <%=$this->getDirectorName()%></h3>
+       <h3 class="view_header"><%[ Director: ]%> <%=$this->getDirectorName()%></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <button id="btn_director_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'director_actions');"><%[ Actions ]%></button>
                <a id="btn_director_config" href="javascript:void(0)" class="w3-bar-item w3-button tab_btn" onclick="load_director_config(); W3Tabs.open(this.id, 'director_config');"<%=empty($_SESSION['dir']) ? ' style="display: none"': ''%>>
index b5724cd6d86e90b6483542efbb06a7166efbdf67..2689a75946be421e6e5eb5ed13e95e15ada98524 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-copy"></i> <%[ FileSet details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ FileSet: ]%> <%=$this->getFileSetName()%></h3>
+       <h3 class="view_header"><%[ FileSet: ]%> <%=$this->getFileSetName()%></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-button w3-bar-item" href="<%=$this->Service->constructUrl('FileSetList')%>"><i class="fa fa-angle-left"></i></a>
        </div>
index 9769c9841cc736bbcf0d81a91efe4ed235f04e32..9610b41d0f273b0fe9d301f2dae845e334033a3e 100644 (file)
@@ -1,10 +1,11 @@
 <%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%>
 <com:TContent ID="Main">
        <!-- Header -->
-       <header class="w3-container w3-show-block">
+       <header class="w3-container">
                <h5>
                        <b><i class="fa fa-chart-pie"></i> <%[ Graphs ]%></b>
                </h5>
        </header>
+       <div style="clear: both"></div>
        <com:Application.Web.Portlets.JobGraphs ID="Graphs" />
 </com:TContent>
index 283129a1be6efdc141e0fc8adb79bf4964b9016b..8225e97a75188939819c3164791532d586a52028 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-tasks"></i> <%[ Job history details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Job: ]%> <%=$this->getJobName()%> &nbsp;<span class="w3-small">[<%[ JobId ]%> <%=$this->getJobId()%>]</span></h3>
+       <h3 class="view_header"><%[ Job: ]%> <%=$this->getJobName()%> &nbsp;<span class="w3-small">[<%[ JobId ]%> <%=$this->getJobId()%>]</span></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>
index 4a5ea40dae5dedc000b892a1e6a70c0db61cf18c..df2d17591db14a26c9ebbbec3aba912a58e90e30 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-tasks"></i> <%[ Job details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Job: ]%> <%=$this->getJobName()%> &nbsp;</h3>
+       <h3 class="view_header"><%[ 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('JobList')%>"><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');"><%[ Actions ]%></button>
index da05a25465b56ab4f4a4ffcf0a167c30fef9bcc4..2b1cce25ef16610c66ae500bd4d17b3427a25d45 100644 (file)
                                <!--p><%[ To start please select job type that you wish to create. ]%></p-->
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Name"
-                                               DirectiveName="Name"
-                                               Label="Job Name"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="true"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Description"
-                                               DirectiveName="Description"
-                                               Label="Description"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="false"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="JobDefs"
-                                               DirectiveName="JobDefs"
-                                               Label="JobDefs"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Name"
+                                       DirectiveName="Name"
+                                       Label="Job Name"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="true"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Description"
+                                       DirectiveName="Description"
+                                       Label="Description"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="false"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="JobDefs"
+                                       DirectiveName="JobDefs"
+                                       Label="JobDefs"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step2" Title="<%[ Step 2 - what you want to backup ]%>" StepType="Auto">
                                <p><%[ If your FileSet for this backup does not exist yet, you can create it. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Client"
-                                               DirectiveName="Client"
-                                               Label="Client"
-                                               Show="true"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Fileset"
-                                               DirectiveName="Fileset"
-                                               Label="FileSet"
-                                               Show="true"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <span><a href="javascript:void(0)" onclick="$('#job_wizard_new_fileset').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green" ><i class="fa fa-plus"></i> &nbsp;<%[ Add new FileSet ]%></a></span>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Client"
+                                       DirectiveName="Client"
+                                       Label="Client"
+                                       Show="true"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Fileset"
+                                       DirectiveName="Fileset"
+                                       Label="FileSet"
+                                       Show="true"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <span><a href="javascript:void(0)" onclick="$('#job_wizard_new_fileset').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green w3-margin-top w3-margin-bottom" ><i class="fa fa-plus"></i> &nbsp;<%[ Add new FileSet ]%></a></span>
                                <div id="fileset_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
                                        <span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
                                        <p><%[ The resource has been created successfully. ]%></p>
                                <p><%[ Please select Storage where you want to backup data and please select Pool with volumes which Storage will use to store backup data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Storage"
-                                               DirectiveName="Storage"
-                                               Label="Storage"
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Storage"
+                                       DirectiveName="Storage"
+                                       Label="Storage"
+                                       Show="true"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <span><a href="javascript:void(0)" onclick="$('#job_wizard_storage_directives').slideToggle();" class="w3-button w3-green w3-margin-top w3-margin-bottom"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Storage directives for Job ]%></a></span>
+                               <div id="job_wizard_storage_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+                                       <h3><%[ Spool setting ]%></h3>
+                                       <com:Application.Web.Portlets.DirectiveCheckBox
+                                               ID="SpoolData"
+                                               DirectiveName="SpoolData"
+                                               Label="Spool Data"
                                                Show="true"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="true"
                                                ShowResetButton="false"
                                                ShowRemoveButton="false"
-                                               />
-                                       <span><a href="javascript:void(0)" onclick="$('#job_wizard_storage_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Storage directives for Job ]%></a></span>
-                               </div>
-                               <div id="job_wizard_storage_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-                                       <h3><%[ Spool setting ]%></h3>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveCheckBox
-                                                       ID="SpoolData"
-                                                       DirectiveName="SpoolData"
-                                                       Label="Spool Data"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                        />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveCheckBox
-                                                       ID="SpoolAttributes"
-                                                       DirectiveName="SpoolAttributes"
-                                                       Label="Spool Attributes"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                        />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveSize
-                                                       ID="SpoolSize"
-                                                       DirectiveName="SpoolSize"
-                                                       Label="Spool Size"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                       />
-                                       </div>
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Pool"
-                                               DirectiveName="Pool"
-                                               Label="Pool"
+                                                />
+                                       <com:Application.Web.Portlets.DirectiveCheckBox
+                                               ID="SpoolAttributes"
+                                               DirectiveName="SpoolAttributes"
+                                               Label="Spool Attributes"
                                                Show="true"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="true"
                                                ShowResetButton="false"
                                                ShowRemoveButton="false"
                                                 />
-                                       <span><a href="javascript:void(0)" onclick="$('#job_wizard_pool_directives').hide(); $('#job_wizard_new_pool').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Pool ]%></a></span>
-                                       <span><a href="javascript:void(0)" onclick="$('#job_wizard_new_pool').hide(); $('#job_wizard_pool_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Pool directives for Job ]%></a></span>
+                                       <com:Application.Web.Portlets.DirectiveSize
+                                               ID="SpoolSize"
+                                               DirectiveName="SpoolSize"
+                                               Label="Spool Size"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                               />
                                </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Pool"
+                                       DirectiveName="Pool"
+                                       Label="Pool"
+                                       Show="true"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                        />
+                               <span><a href="javascript:void(0)" onclick="$('#job_wizard_pool_directives').hide(); $('#job_wizard_new_pool').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green w3-margin-top w3-margin-bottom"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Pool ]%></a></span>
+                               <span><a href="javascript:void(0)" onclick="$('#job_wizard_new_pool').hide(); $('#job_wizard_pool_directives').slideToggle();" class="w3-button w3-green w3-margin-top w3-margin-bottom"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Pool directives for Job ]%></a></span>
                                <div id="pool_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
                                        <span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
                                        <p><%[ The resource has been created successfully. ]%></p>
                                </div>
                                <div id="job_wizard_pool_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
                                        <h3><%[ Pool setting ]%></h3>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveComboBox
-                                                       ID="FullBackupPool"
-                                                       DirectiveName="FullBackupPool"
-                                                       Label="Full Backup Pool"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                       />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveComboBox
-                                                       ID="IncrementalBackupPool"
-                                                       DirectiveName="IncrementalBackupPool"
-                                                       Label="Incremental Backup Pool"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                       />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveComboBox
-                                                       ID="DifferentialBackupPool"
-                                                       DirectiveName="DifferentialBackupPool"
-                                                       Label="Differential Backup Pool"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                       />
-                                       </div>
+                                       <com:Application.Web.Portlets.DirectiveComboBox
+                                               ID="FullBackupPool"
+                                               DirectiveName="FullBackupPool"
+                                               Label="Full Backup Pool"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                               />
+                                       <com:Application.Web.Portlets.DirectiveComboBox
+                                               ID="IncrementalBackupPool"
+                                               DirectiveName="IncrementalBackupPool"
+                                               Label="Incremental Backup Pool"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                               />
+                                       <com:Application.Web.Portlets.DirectiveComboBox
+                                               ID="DifferentialBackupPool"
+                                               DirectiveName="DifferentialBackupPool"
+                                               Label="Differential Backup Pool"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                               />
                                </div>
                        </div>
                        <com:TCallback ID="LoadPoolList" OnCallback="LoadPoolList" />
                                <div class="w3-container">
                                        <h2><%[ Job directives ]%></h2>
                                </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Level"
-                                               DirectiveName="Level"
-                                               Label="Level"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveCheckBox
-                                               ID="Accurate"
-                                               DirectiveName="Accurate"
-                                               DefaultValue="0"
-                                               Label="Accurate"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                                />
-                               </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="MaximumConcurrentJobs"
-                                               DirectiveName="MaximumConcurrentJobs"
-                                               DefaultValue="1"
-                                               Label="Maximum Concurrent Jobs"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                                />
-                               </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Priority"
-                                               DirectiveName="Priority"
-                                               DefaultValue="10"
-                                               Label="Priority"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                                />
-                               </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveCheckBox
-                                               ID="ReRunFailedLevels"
-                                               DirectiveName="ReRunFailedLevels"
-                                               DefaultValue="0"
-                                               Label="ReRun Failed Levels"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                                />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Level"
+                                       DirectiveName="Level"
+                                       Label="Level"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveCheckBox
+                                       ID="Accurate"
+                                       DirectiveName="Accurate"
+                                       DefaultValue="0"
+                                       Label="Accurate"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                        />
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="MaximumConcurrentJobs"
+                                       DirectiveName="MaximumConcurrentJobs"
+                                       DefaultValue="1"
+                                       Label="Maximum Concurrent Jobs"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                        />
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Priority"
+                                       DirectiveName="Priority"
+                                       DefaultValue="10"
+                                       Label="Priority"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                        />
+                               <com:Application.Web.Portlets.DirectiveCheckBox
+                                       ID="ReRunFailedLevels"
+                                       DirectiveName="ReRunFailedLevels"
+                                       DefaultValue="0"
+                                       Label="ReRun Failed Levels"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                        />
                                <div class="w3-container">
                                        <h2><%[ Other directives ]%></h2>
                                </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Messages"
-                                               DirectiveName="Messages"
-                                               Label="Messages"
-                                               Show="true"
-                                               ValidationGroup="NewJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Messages"
+                                       DirectiveName="Messages"
+                                       Label="Messages"
+                                       Show="true"
+                                       ValidationGroup="NewJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step5" Title="<%[ Step 5 - when would you like to run backup ]%>" StepType="Auto">
                                <div class="w3-container">
                                        <h2><%[ Schedule ]%></h2>
                                </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Schedule"
-                                               DirectiveName="Schedule"
-                                               Label="Schedule"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <span><a href="javascript:void(0)" onclick="$('#job_wizard_schedule_directives').hide(); $('#job_wizard_new_schedule').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Schedule ]%></a></span>
-                                       <span><a href="javascript:void(0)" onclick="$('#job_wizard_new_schedule').hide(); $('#job_wizard_reschedule_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Reschedule directives ]%></a></span>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Schedule"
+                                       DirectiveName="Schedule"
+                                       Label="Schedule"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <span><a href="javascript:void(0)" onclick="$('#job_wizard_schedule_directives').hide(); $('#job_wizard_new_schedule').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green w3-margin-top w3-margin-bottom"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Schedule ]%></a></span>
+                               <span><a href="javascript:void(0)" onclick="$('#job_wizard_new_schedule').hide(); $('#job_wizard_reschedule_directives').slideToggle();" class="w3-button w3-green w3-margin-top w3-margin-bottom"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Reschedule directives ]%></a></span>
                                <div id="schedule_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
                                        <span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
                                        <p><%[ The resource has been created successfully. ]%></p>
                                </div>
                                <div id="job_wizard_reschedule_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
                                        <h3><%[ Reschedule setting ]%></h3>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveCheckBox
-                                                       ID="RescheduleOnError"
-                                                       DirectiveName="RescheduleOnError"
-                                                       DefaultValue="0"
-                                                       Label="Reschedule On Error"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                        />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveCheckBox
-                                                       ID="RescheduleIncompleteJobs"
-                                                       DirectiveName="RescheduleIncompleteJobs"
-                                                       DefaultValue="0"
-                                                       Label="Reschedule Incomplete Jobs"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                        />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveTimePeriod
-                                                       ID="RescheduleInterval"
-                                                       DirectiveName="RescheduleInterval"
-                                                       DefaultValue="1800"
-                                                       Label="Reschedule Interval"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                        />
-                                       </div>
-                                       <div class="w3-container">
-                                               <com:Application.Web.Portlets.DirectiveInteger
-                                                       ID="RescheduleTimes"
-                                                       DirectiveName="RescheduleTimes"
-                                                       Label="Reschedule Times"
-                                                       Show="true"
-                                                       ShowResetButton="false"
-                                                       ShowRemoveButton="false"
-                                                        />
-                                       </div>
+                                       <com:Application.Web.Portlets.DirectiveCheckBox
+                                               ID="RescheduleOnError"
+                                               DirectiveName="RescheduleOnError"
+                                               DefaultValue="0"
+                                               Label="Reschedule On Error"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                                />
+                                       <com:Application.Web.Portlets.DirectiveCheckBox
+                                               ID="RescheduleIncompleteJobs"
+                                               DirectiveName="RescheduleIncompleteJobs"
+                                               DefaultValue="0"
+                                               Label="Reschedule Incomplete Jobs"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                                />
+                                       <com:Application.Web.Portlets.DirectiveTimePeriod
+                                               ID="RescheduleInterval"
+                                               DirectiveName="RescheduleInterval"
+                                               DefaultValue="1800"
+                                               Label="Reschedule Interval"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                                />
+                                       <com:Application.Web.Portlets.DirectiveInteger
+                                               ID="RescheduleTimes"
+                                               DirectiveName="RescheduleTimes"
+                                               Label="Reschedule Times"
+                                               Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
+                                                />
                                </div>
                        </div>
                        <com:TCallback ID="LoadScheduleList" OnCallback="LoadScheduleList" />
index da5c3280e18d36e7cf47ddd4845cb557a14e67e1..198760c39e70ab1a80f4a7e91155436bfc32807f 100644 (file)
                                <p><%[ Copy jobs run copying backup jobs data from one volume to another. It is done by reading the previously backed up data from volume and writing it to another volume in a different pool. All process runs without using file daemon. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Name"
-                                               DirectiveName="Name"
-                                               Label="Job Name"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Description"
-                                               DirectiveName="Description"
-                                               Label="Description"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="false"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="JobDefs"
-                                               DirectiveName="JobDefs"
-                                               Label="JobDefs"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Name"
+                                       DirectiveName="Name"
+                                       Label="Job Name"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Description"
+                                       DirectiveName="Description"
+                                       Label="Description"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="false"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="JobDefs"
+                                       DirectiveName="JobDefs"
+                                       Label="JobDefs"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step2" Title="<%[ Step 2 - what you want to copy ]%>" StepType="Auto">
                                <p><%[ The source pool will be examined for finding backup jobs to copy. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Pool"
-                                               DirectiveName="Pool"
-                                               Label="Source Pool"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="set_storage_from_pool(); oVolumeList.show_volumes_in_pool_btn(this.value);oVolumeList.show_volumes_in_pool_table(false);"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Pool"
+                                       DirectiveName="Pool"
+                                       Label="Source Pool"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="set_storage_from_pool(); oVolumeList.show_volumes_in_pool_btn(this.value);oVolumeList.show_volumes_in_pool_table(false);"
+                                       />
                                <a id="volumes_in_pool_btn" href="javascript:void(0)" onclick="oVolumeList.load_data(document.getElementById('<%=$this->Pool->Directive->ClientID%>').value);" style="display: none; width: 300px; margin: 0 auto;"><%[ See volumes in selected pool ]%></a>
                        </div>
                        <div class="w3-container">
                                <p><%[ Please select a storage using which you want to read copy data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="SourceStorage"
-                                               DirectiveName="Storage"
-                                               Label="Source Storage"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="SourceStorage"
+                                       DirectiveName="Storage"
+                                       Label="Source Storage"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                                <com:TCallback ID="SetSourceStorageByPool" OnCallback="setSourceStorageByPool" />
 <script>
 function set_storage_from_pool() {
@@ -699,7 +689,6 @@ var oVolumeList = {
                                <p><%[ Please select the criteria that will be used for selecting backup jobs to copy. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
                                        <com:Application.Web.Portlets.DirectiveComboBox
                                                ID="SelectionType"
                                                DirectiveName="SelectionType"
@@ -711,70 +700,61 @@ var oVolumeList = {
                                                ShowRemoveButton="false"
                                                Attributes.onchange="oSelectionType.show_opts(this.value);"
                                                />
-                               </div>
                        </div>
                        <div id="selection_type_job" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternJob"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern Job"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <a id="selection_type_jobs_btn" href="javascript:void(0)" onclick="oJobList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See backup jobs ]%></a>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternJob"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern Job"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <a id="selection_type_jobs_btn" href="javascript:void(0)" onclick="oJobList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See backup jobs ]%></a>
                        </div>
                        <div id="selection_type_client" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternClient"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern Client"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <a id="selection_type_clients_btn" href="javascript:void(0)" onclick="oClientList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See clients ]%></a>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternClient"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern Client"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <a id="selection_type_clients_btn" href="javascript:void(0)" onclick="oClientList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See clients ]%></a>
                        </div>
                        <div id="selection_type_volume" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternVolume"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern Volume"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <a id="selection_type_volumes_btn" href="javascript:void(0)" onclick="oVolumeList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See volumes ]%></a>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternVolume"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern Volume"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <a id="selection_type_volumes_btn" href="javascript:void(0)" onclick="oVolumeList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See volumes ]%></a>
                        </div>
                        <div id="selection_type_smallest_volume" style="display: none">
                        </div>
                        <div id="selection_type_oldest_volume" style="display: none">
                        </div>
                        <div id="selection_type_sql_query" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternSQLQuery"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern SQL Query"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternSQLQuery"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern SQL Query"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div id="selection_type_uncopied_jobs" style="display: none">
                        </div>
@@ -1625,19 +1605,17 @@ oSelectionType.init();
                                <p><%[ Please select destination pool to which will be stored data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="NextPool"
-                                               DirectiveName="NextPool"
-                                               Label="Destination Pool (NextPool)"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="set_storage_from_nextpool();"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="NextPool"
+                                       DirectiveName="NextPool"
+                                       Label="Destination Pool (NextPool)"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="set_storage_from_nextpool();"
+                                       />
                        <com:TCallback ID="SetDestinationStorageByPool" OnCallback="setDestinationStorageByPool" />
                        <com:TCallback ID="GetJobsUsingPool" OnCallback="getJobsUsingPool" />
 <script>
@@ -1727,19 +1705,17 @@ function show_storage_warning(storage, pool, jobs) {
                                <p><%[ Please select a storage using which you want to write copied data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="DestinationStorage"
-                                               DirectiveName="Storage"
-                                               Label="Destination Storage"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="set_storage(this.value);"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="DestinationStorage"
+                                       DirectiveName="Storage"
+                                       Label="Destination Storage"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="set_storage(this.value);"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step5" Title="<%[ Step 5 - copy job options ]%>" StepType="Auto">
@@ -1747,91 +1723,79 @@ function show_storage_warning(storage, pool, jobs) {
                                <h2><%[ Limits ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="MaximumSpawnedJobs"
-                                               DirectiveName="MaximumSpawnedJobs"
-                                               DefaultValue="600"
-                                               Label="Maximum Spawned Jobs"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="MaximumSpawnedJobs"
+                                       DirectiveName="MaximumSpawnedJobs"
+                                       DefaultValue="600"
+                                       Label="Maximum Spawned Jobs"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-container">
                                <h2><%[ Schedule ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Schedule"
-                                               DirectiveName="Schedule"
-                                               Label="Schedule"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Schedule"
+                                       DirectiveName="Schedule"
+                                       Label="Schedule"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-container">
                                <h2><%[ Messages ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Messages"
-                                               DirectiveName="Messages"
-                                               Label="Messages"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Messages"
+                                       DirectiveName="Messages"
+                                       Label="Messages"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
                                <a href="javascript:void(0)" onclick="$('#copy_job_wizard_other_options').slideToggle();"><%[ Other options ]%></a>
                        </div>
                        <div id="copy_job_wizard_other_options" class="w3-half" style="float: none; margin: auto; display: none;">
                                <p><%[ Level, Client and FileSet are not used during copy jobs running but they are required to define in copy job resource as the standard Job directives. ]%></p>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Level"
-                                               DirectiveName="Level"
-                                               Label="Level"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Client"
-                                               DirectiveName="Client"
-                                               Label="Client"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="FileSet"
-                                               DirectiveName="Fileset"
-                                               Label="FileSet"
-                                               Show="true"
-                                               ValidationGroup="NewCopyJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Level"
+                                       DirectiveName="Level"
+                                       Label="Level"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Client"
+                                       DirectiveName="Client"
+                                       Label="Client"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="FileSet"
+                                       DirectiveName="Fileset"
+                                       Label="FileSet"
+                                       Show="true"
+                                       ValidationGroup="NewCopyJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
index af623502e8fcf1d67a4c98884cbc123712fba292..2cbc4ee1982de0d3fd4b190622ad13c0f852f117 100644 (file)
                                <p><%[ Migrate jobs run moving backup jobs data from one volume to another. It is done by reading the previously backed up data from volume and writing it to another volume in a different pool. The file catalog records associated with the original backup jobs are purged. All process runs without using file daemon. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Name"
-                                               DirectiveName="Name"
-                                               Label="Job Name"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="Description"
-                                               DirectiveName="Description"
-                                               Label="Description"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="JobDefs"
-                                               DirectiveName="JobDefs"
-                                               Label="JobDefs"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Name"
+                                       DirectiveName="Name"
+                                       Label="Job Name"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="Description"
+                                       DirectiveName="Description"
+                                       Label="Description"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="JobDefs"
+                                       DirectiveName="JobDefs"
+                                       Label="JobDefs"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step2" Title="<%[ Step 2 - what you want to migrate ]%>" StepType="Auto">
                                <p><%[ The source pool will be examined for finding backup jobs to migrate. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Pool"
-                                               DirectiveName="Pool"
-                                               Label="Source Pool"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="set_storage_from_pool(); oVolumeList.show_volumes_in_pool_btn(this.value);oVolumeList.show_volumes_in_pool_table(false);"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Pool"
+                                       DirectiveName="Pool"
+                                       Label="Source Pool"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="set_storage_from_pool(); oVolumeList.show_volumes_in_pool_btn(this.value);oVolumeList.show_volumes_in_pool_table(false);"
+                                       />
                                <a id="volumes_in_pool_btn" href="javascript:void(0)" onclick="oVolumeList.load_data(document.getElementById('<%=$this->Pool->Directive->ClientID%>').value);" style="display: none; width: 300px; margin: 0 auto;"><%[ See volumes in selected pool ]%></a>
                        </div>
                        <div class="w3-container">
                                <p><%[ Please select a storage using which you want to read migrate data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="SourceStorage"
-                                               DirectiveName="Storage"
-                                               Label="Source Storage"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="SourceStorage"
+                                       DirectiveName="Storage"
+                                       Label="Source Storage"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                                <com:TCallback ID="SetSourceStorageByPool" OnCallback="setSourceStorageByPool" />
 <script>
 function set_storage_from_pool() {
@@ -699,82 +689,72 @@ var oVolumeList = {
                                <p><%[ Please select the criteria that will be used for selecting backup jobs to migrate. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="SelectionType"
-                                               DirectiveName="SelectionType"
-                                               Label="Selection Type"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="oSelectionType.show_opts(this.value, true);"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="SelectionType"
+                                       DirectiveName="SelectionType"
+                                       Label="Selection Type"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="oSelectionType.show_opts(this.value, true);"
+                                       />
                        </div>
                        <div id="selection_type_job" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternJob"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern Job"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <a id="selection_type_jobs_btn" href="javascript:void(0)" onclick="oJobList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See backup jobs ]%></a>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternJob"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern Job"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <a id="selection_type_jobs_btn" href="javascript:void(0)" onclick="oJobList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See backup jobs ]%></a>
                        </div>
                        <div id="selection_type_client" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternClient"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern Client"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <a id="selection_type_clients_btn" href="javascript:void(0)" onclick="oClientList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See clients ]%></a>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternClient"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern Client"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <a id="selection_type_clients_btn" href="javascript:void(0)" onclick="oClientList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See clients ]%></a>
                        </div>
                        <div id="selection_type_volume" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternVolume"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern Volume"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                                       <a id="selection_type_volumes_btn" href="javascript:void(0)" onclick="oVolumeList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See volumes ]%></a>
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternVolume"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern Volume"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <a id="selection_type_volumes_btn" href="javascript:void(0)" onclick="oVolumeList.load_data();" style="display: block; width: 300px; margin: 0 auto;"><%[ See volumes ]%></a>
                        </div>
                        <div id="selection_type_smallest_volume" style="display: none">
                        </div>
                        <div id="selection_type_oldest_volume" style="display: none">
                        </div>
                        <div id="selection_type_sql_query" class="w3-half" style="float: none; display: none; margin: auto;">
-                               <div class="w3-container w3-margin-top" style="position: relative">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="SelectionPatternSQLQuery"
-                                               DirectiveName="SelectionPattern"
-                                               Label="Selection Pattern SQL Query"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="SelectionPatternSQLQuery"
+                                       DirectiveName="SelectionPattern"
+                                       Label="Selection Pattern SQL Query"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div id="selection_type_jobs_table" class="w3-container w3-margin" style="display: none">
                                <table id="job_list" class="w3-table w3-striped w3-hoverable w3-white w3-margin-bottom" style="width: 100%">
@@ -1536,45 +1516,39 @@ var oVolumeList = {
 };
 </script>
                        </div>
-                       <div id="selection_type_pool_occupancy" style="display: none">
-                               <div class="w3-container w3-half w3-margin-top" style="float: none; margin: auto;">
-                                       <com:Application.Web.Portlets.DirectiveSize
-                                               ID="MigrationHighBytes"
-                                               DirectiveName="MigrationHighBytes"
-                                               Label="Migration High Bytes"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-half w3-margin-top" style="float: none; margin: auto;">
-                                       <com:Application.Web.Portlets.DirectiveSize
-                                               ID="MigrationLowBytes"
-                                               DirectiveName="MigrationLowBytes"
-                                               Label="Migration Low Bytes"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                       <div id="selection_type_pool_occupancy" class="w3-half" style="display: none; float: none; margin: auto;">
+                               <com:Application.Web.Portlets.DirectiveSize
+                                       ID="MigrationHighBytes"
+                                       DirectiveName="MigrationHighBytes"
+                                       Label="Migration High Bytes"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveSize
+                                       ID="MigrationLowBytes"
+                                       DirectiveName="MigrationLowBytes"
+                                       Label="Migration Low Bytes"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
-                       <div id="selection_type_pool_time" style="display: none">
-                               <div class="w3-container w3-half w3-margin-top" style="float: none; margin: auto;">
-                                       <com:Application.Web.Portlets.DirectiveTimePeriod
-                                               ID="MigrationTime"
-                                               DirectiveName="MigrationTime"
-                                               Label="Migration Time"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="false"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                       <div id="selection_type_pool_time" class="w3-half" style="display: none; float: none; margin: auto;">
+                               <com:Application.Web.Portlets.DirectiveTimePeriod
+                                       ID="MigrationTime"
+                                       DirectiveName="MigrationTime"
+                                       Label="Migration Time"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="false"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div id="modify_source_pool_window" class="w3-modal" style="display: none">
                                <div class="w3-modal-content w3-card-4 w3-animate-zoom" style="width:600px">
@@ -1705,19 +1679,17 @@ $(function() {
                                <p><%[ Please select destination pool to which will be stored data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="NextPool"
-                                               DirectiveName="NextPool"
-                                               Label="Destination Pool (NextPool)"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="set_storage_from_nextpool();"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="NextPool"
+                                       DirectiveName="NextPool"
+                                       Label="Destination Pool (NextPool)"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="set_storage_from_nextpool();"
+                                       />
                        <com:TCallback ID="SetDestinationStorageByPool" OnCallback="setDestinationStorageByPool" />
                        <com:TCallback ID="GetJobsUsingPool" OnCallback="getJobsUsingPool" />
 <script>
@@ -1808,19 +1780,17 @@ function show_storage_warning(storage, pool, jobs) {
                                <p><%[ Please select a storage using which you want to write migrated data. ]%></p>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="DestinationStorage"
-                                               DirectiveName="Storage"
-                                               Label="Destination Storage"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               Attributes.onchange="set_storage(this.value);"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="DestinationStorage"
+                                       DirectiveName="Storage"
+                                       Label="Destination Storage"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       Attributes.onchange="set_storage(this.value);"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step5" Title="<%[ Step 5 - migrate job options ]%>" StepType="Auto">
@@ -1828,107 +1798,93 @@ function show_storage_warning(storage, pool, jobs) {
                                <h2><%[ Purge jobs ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveCheckBox
-                                               ID="PurgeMigrationJob"
-                                               DirectiveName="PurgeMigrationJob"
-                                               DefaultValue="0"
-                                               Label="Purge Migration Job"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveCheckBox
+                                       ID="PurgeMigrationJob"
+                                       DirectiveName="PurgeMigrationJob"
+                                       DefaultValue="0"
+                                       Label="Purge Migration Job"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-container">
                                <h2><%[ Limits ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveTextBox
-                                               ID="MaximumSpawnedJobs"
-                                               DirectiveName="MaximumSpawnedJobs"
-                                               DefaultValue="600"
-                                               Label="Maximum Spawned Jobs"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveTextBox
+                                       ID="MaximumSpawnedJobs"
+                                       DirectiveName="MaximumSpawnedJobs"
+                                       DefaultValue="600"
+                                       Label="Maximum Spawned Jobs"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-container">
                                <h2><%[ Schedule ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Schedule"
-                                               DirectiveName="Schedule"
-                                               Label="Schedule"
-                                               Show="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Schedule"
+                                       DirectiveName="Schedule"
+                                       Label="Schedule"
+                                       Show="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-container">
                                <h2><%[ Messages ]%></h2>
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Messages"
-                                               DirectiveName="Messages"
-                                               Label="Messages"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Messages"
+                                       DirectiveName="Messages"
+                                       Label="Messages"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                        <div class="w3-half" style="float: none; margin: auto">
                                <a href="javascript:void(0)" onclick="$('#migrate_job_wizard_other_options').slideToggle();"><%[ Other options ]%></a>
                        </div>
                        <div id="migrate_job_wizard_other_options" class="w3-half" style="float: none; margin: auto; display: none;">
                                <p><%[ Level, Client and FileSet are not used during migrate jobs running but they are required to define in migrate job resource as the standard Job directives. ]%></p>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Level"
-                                               DirectiveName="Level"
-                                               Label="Level"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="Client"
-                                               DirectiveName="Client"
-                                               Label="Client"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
-                               <div class="w3-container w3-margin-top">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="FileSet"
-                                               DirectiveName="Fileset"
-                                               Label="FileSet"
-                                               Show="true"
-                                               ValidationGroup="NewMigrateJobDirective"
-                                               Required="true"
-                                               ShowResetButton="false"
-                                               ShowRemoveButton="false"
-                                               />
-                               </div>
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Level"
+                                       DirectiveName="Level"
+                                       Label="Level"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Client"
+                                       DirectiveName="Client"
+                                       Label="Client"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="FileSet"
+                                       DirectiveName="Fileset"
+                                       Label="FileSet"
+                                       Show="true"
+                                       ValidationGroup="NewMigrateJobDirective"
+                                       Required="true"
+                                       ShowResetButton="false"
+                                       ShowRemoveButton="false"
+                                       />
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
index 8b6b995d4058b265700378f56033659f85246639..2f89e31045dcf542d597bca44c98b5fbdf04e0d6 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-tape"></i> <%[ Pool details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Pool: ]%> <%=$this->getPoolName()%> &nbsp;<span class="w3-small">[PoolId <%=$this->getPoolId()%>]</span></h3>
+       <h3 class="view_header"><%[ Pool: ]%> <%=$this->getPoolName()%> &nbsp;<span class="w3-small">[PoolId <%=$this->getPoolId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('PoolList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_pool_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'pool_actions');"><%[ Actions ]%></button>
index 8f54445e2d8100f99cf878316676ebd0c0a09668..c4bfcaf502b8905abc76454d3969c1a0f2a6391f 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-copy"></i> <%[ Schedule details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Schedule: ]%> <%=$this->getScheduleName()%></h3>
+       <h3 class="view_header"><%[ Schedule: ]%> <%=$this->getScheduleName()%></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-button w3-bar-item" href="<%=$this->Service->constructUrl('ScheduleList')%>"><i class="fa fa-angle-left"></i></a>
        </div>
index cb48384b4877525f9cd496e73e8b40f140cf581f..f575827221f5145a7ba86fff0287bf6ae593bbdf 100644 (file)
@@ -42,7 +42,7 @@
                </div>
                <div id="general_options_default_access" class="w3-container w3-margin-left" style="display: <%=$this->GeneralDefaultAccess->Checked ? 'block' : 'none'%>">
                        <div class="w3-half">
-                               <div class="w3-container w3-row w3-padding w3-block">
+                               <div class="w3-container w3-row w3-block">
                                        <div class="w3-third w3-col">
                                                <%[ Default role: ]%>
                                        </div>
                <div id="authentication_method_basic" class="w3-container" style="display: none">
                        <%[ This type of authentication is realized by web server. To use it, the basic authentication has to be enabled in the Baculum Web web server configuration. ]%>
                        <div>
-                               <div class="w3-container w3-row w3-padding opt_row">
+                               <div class="w3-container w3-row opt_row">
                                        <div class="w3-col" style="width: 40px">
                                                <com:TCheckBox
                                                        ID="BasicAuthAllowManageUsers"
                                        </div>
                                        <label for="<%=$this->BasicAuthAllowManageUsers->ClientID%>"><%[ Allow Baculum Web to manage the Basic authentication users (add/remove users and change their passwords) ]%></label>
                                </div>
-                               <div class="w3-container w3-row w3-padding w3-block">
+                               <div class="w3-container w3-row w3-block">
                                        <div class="w3-col opt_row" style="width: 220px">
                                                <%[ Users file path: ]%>
                                        </div>
                <div id="authentication_method_ldap" class="w3-container w3-half w3-margin-left" style="display: none">
                        <%[ This type of authentication is realized by an external directory service. To authenticate it uses the Baculum Web login form. The web server basic authentication can be disabled in this method. ]%>
                        <h5><%[ LDAP server options ]%></h5>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ IP Address/Hostname: ]%>
                                </div>
                                        </com:TRequiredFieldValidator>
                                </div>
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ Port: ]%>
                                </div>
                                        </com:TRequiredFieldValidator>
                                </div>
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ SSL encryption (LDAPS): ]%>
                                </div>
                                        />
                                </div>
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ Protocol version: ]%>
                                </div>
                                <label for="<%=$this->LdapAuthMethodSimple->ClientID%>"><%[ Simple authentication ]%></label>
                        </div>
                        <div id="authentication_method_ldap_auth_simple" class="w3-container w3-margin-left" style="display: <%=$this->LdapAuthMethodSimple->Checked ? 'block' : 'none'%>">
-                               <div class="w3-container w3-row w3-padding">
+                               <div class="w3-container w3-row directive_field">
                                        <div class="w3-third w3-col">
                                                <%[ Manager DN: ]%>
                                        </div>
                                                </com:TRequiredFieldValidator>
                                        </div>
                                </div>
-                               <div class="w3-container w3-row w3-padding">
+                               <div class="w3-container w3-row directive_field">
                                        <div class="w3-third w3-col">
                                                <%[ Password: ]%>
                                        </div>
                                <i id="ldap_test_connection_error" class="fas fa-times-circle w3-text-red" style="display: none;"></i>
                                <com:TActiveLabel ID="TestLdapConnectionMsg" CssClass="w3-text-red" Display="None" />
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ Base DN: ]%>
                                </div>
                                </div>
                        </div>
                        <h5><%[ Attributes ]%></h5>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ Username: ]%>
                                </div>
                                        </com:TRequiredFieldValidator>
                                </div>
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ Long name: ]%>
                                </div>
                                        />
                                </div>
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ E-mail: ]%>
                                </div>
                                        />
                                </div>
                        </div>
-                       <div class="w3-container w3-row w3-padding">
+                       <div class="w3-container w3-row directive_field">
                                <div class="w3-third w3-col">
                                        <%[ Description: ]%>
                                </div>
@@ -1292,8 +1292,8 @@ $(function() {
                                                Display="Dynamic"
                                                />
                                        <span id="user_window_username_exists" class="error" style="display: none"><ul><li><%[ Username with the given name already exists. ]%></li></ul></span>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserName" Text="<%[ Username: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserName" Text="<%[ Username: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="UserName"
@@ -1318,8 +1318,8 @@ $(function() {
                                                        />
                                                </div> &nbsp;<i id="user_window_required" class="fa fa-asterisk w3-text-red opt_req" style="display none"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserLongName" Text="<%[ Long name: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserLongName" Text="<%[ Long name: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="UserLongName"
@@ -1329,8 +1329,8 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserDescription" Text="<%[ Description: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserDescription" Text="<%[ Description: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="UserDescription"
@@ -1342,8 +1342,8 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserEmail" Text="<%[ E-mail: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserEmail" Text="<%[ E-mail: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="UserEmail"
@@ -1361,8 +1361,8 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div id="user_window_password" class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserPassword" Text="<%[ Password: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div id="user_window_password" class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserPassword" Text="<%[ Password: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="UserPassword"
@@ -1373,8 +1373,8 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserRoles" Text="<%[ Roles: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserRoles" Text="<%[ Roles: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveListBox
                                                                ID="UserRoles"
@@ -1393,8 +1393,8 @@ $(function() {
                                                        <p class="w3-text-black" style="margin: 0 16px 0 0"><%[ Use CTRL + left-click to multiple item selection ]%></p>
                                                </div> &nbsp;<i class="fa fa-asterisk w3-text-red opt_req"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserAPIHosts" Text="<%[ API hosts: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserAPIHosts" Text="<%[ API hosts: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveListBox
                                                                ID="UserAPIHosts"
@@ -1406,8 +1406,8 @@ $(function() {
                                                        <p class="w3-text-black" style="margin: 0 16px 0 0"><%[ Use CTRL + left-click to multiple item selection ]%></p>
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserEnabled" Text="<%[ Enabled: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="UserEnabled" Text="<%[ Enabled: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveCheckBox
                                                                ID="UserEnabled"
@@ -1418,8 +1418,8 @@ $(function() {
                                        </div>
                                        <i class="fas fa-wrench w3-text-black"></i> &nbsp;<a href="javascript:void(0)" onclick="$('#user_window_advanced_options').toggle('fast');" class="w3-text-black"><%[ Advanced options ]%></a>
                                        <div id="user_window_advanced_options" style="display: none">
-                                               <div class="w3-row w3-section" title="<%[ Comma separated IP addresses. Using asterisk character, there is also possible to provide subnet, for example: 192.168.1.* ]%>">
-                                                       <div class="w3-col w3-third"><com:TLabel ForControl="UserIps" Text="<%[ IP address restrictions: ]%>" CssClass="w3-xlarge"/></div>
+                                               <div class="w3-row directive_field" title="<%[ Comma separated IP addresses. Using asterisk character, there is also possible to provide subnet, for example: 192.168.1.* ]%>">
+                                                       <div class="w3-col w3-third"><com:TLabel ForControl="UserIps" Text="<%[ IP address restrictions: ]%>"/></div>
                                                        <div class="w3-half">
                                                                <com:TActiveTextBox
                                                                        ID="UserIps"
@@ -1774,8 +1774,8 @@ $(function() {
                                                Display="Dynamic"
                                                />
                                        <span id="role_window_role_exists" class="error" style="display: none"><ul><li><%[ Role with the given name already exists. ]%></li></ul></span>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="Role" Text="<%[ Role: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="Role" Text="<%[ Role: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="Role"
@@ -1800,8 +1800,8 @@ $(function() {
                                                        />
                                                </div> &nbsp;<i id="role_window_required" class="fa fa-asterisk w3-text-red opt_req" style="display none"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleLongName" Text="<%[ Long name: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleLongName" Text="<%[ Long name: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="RoleLongName"
@@ -1811,8 +1811,8 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleDescription" Text="<%[ Description: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleDescription" Text="<%[ Description: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveTextBox
                                                                ID="RoleDescription"
@@ -1824,8 +1824,8 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleResources" Text="<%[ Resources: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleResources" Text="<%[ Resources: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveListBox
                                                                ID="RoleResources"
@@ -1845,8 +1845,8 @@ $(function() {
                                                </div> &nbsp;<i class="fa fa-asterisk w3-text-red opt_req"></i>
 
                                        </div>
-                                       <div class="w3-row w3-section">
-                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleEnabled" Text="<%[ Enabled: ]%>" CssClass="w3-xlarge"/></div>
+                                       <div class="w3-row directive_field">
+                                               <div class="w3-col w3-third"><com:TLabel ForControl="RoleEnabled" Text="<%[ Enabled: ]%>"/></div>
                                                <div class="w3-half">
                                                        <com:TActiveCheckBox
                                                                ID="RoleEnabled"
@@ -2451,7 +2451,7 @@ $(function() {
                                <h2 id="oauth2_client_window_title_edit" style="display: none"><%[ Edit OAuth2 client account ]%></h2>
                        </header>
                        <div class="w3-container w3-margin-left w3-margin-right w3-margin-top w3-text-teal">
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientClientId" Text="<%[ OAuth2 Client ID: ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveTextBox
@@ -2480,7 +2480,7 @@ $(function() {
                                                <a id="oauth2_client_generate_client_id_link" href="javascript:void(0)" onclick="document.getElementById('<%=$this->OAuth2ClientClientId->ClientID%>').value = get_random_string('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_', 32);" style="display: none"><%[ generate ]%></a>
                                        </div> &nbsp;<i class="fa fa-asterisk w3-text-red opt_req"></i>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientClientSecret" Text="<%[ OAuth2 Client Secret: ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveTextBox
@@ -2507,7 +2507,7 @@ $(function() {
                                                <a href="javascript:void(0)" onclick="document.getElementById('<%=$this->OAuth2ClientClientSecret->ClientID%>').value = get_random_string('ABCDEFabcdef0123456789', 40); return false;"><%[ generate ]%></a>
                                        </div> &nbsp;<i class="fa fa-asterisk w3-text-red opt_req"></i>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientRedirectURI" Text="<%[ OAuth2 Redirect URI (example: https://baculumgui:9095/web/redirect): ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveTextBox
@@ -2524,7 +2524,7 @@ $(function() {
                                                />
                                        </div> &nbsp;<i class="fa fa-asterisk w3-text-red opt_req"></i>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientScope" Text="<%[ OAuth2 scopes (space separated): ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveTextBox
@@ -2543,7 +2543,7 @@ $(function() {
                                                />
                                        </div> &nbsp;<i class="fa fa-asterisk w3-text-red opt_req"></i>
                                </div>
-                               <div class="w3-row w3-section" id="oauth2_client_bconsole_create">
+                               <div class="w3-row directive_field" id="oauth2_client_bconsole_create">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientBconsoleCreate" Text="<%[ Create dedicated Bconsole config file: ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveCheckBox
@@ -2556,7 +2556,7 @@ $(function() {
                                        </div>
                                </div>
                                <div id="oauth2_client_console" style="display: none">
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientConsole" Text="<%[ Console ACL to use in new Bconsole config file: ]%>" /></div>
                                                <div class="w3-half">
                                                        <com:TActiveDropDownList
@@ -2567,7 +2567,7 @@ $(function() {
                                                        />
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientDirector" Text="<%[ Director for Bconsole config: ]%>" /></div>
                                                <div class="w3-half">
                                                        <com:TActiveDropDownList
@@ -2579,7 +2579,7 @@ $(function() {
                                                </div>
                                        </div>
                                </div>
-                               <div class="w3-row w3-section" id="oauth2_client_bconsole_cfg">
+                               <div class="w3-row directive_field" id="oauth2_client_bconsole_cfg">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientBconsoleCfgPath" Text="<%[ Dedicated Bconsole config file path: ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveTextBox
@@ -2589,7 +2589,7 @@ $(function() {
                                                />
                                        </div>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="OAuth2ClientName" Text="<%[ Short name: ]%>" /></div>
                                        <div class="w3-half">
                                                <com:TActiveTextBox
@@ -2882,7 +2882,7 @@ $(function() {
                        </header>
                        <div class="w3-container w3-margin-left w3-margin-right w3-margin-top w3-text-teal">
                                <div id="api_host_settings">
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostSettings" Text="<%[ Get existing API host settings: ]%>" /></div>
                                                <div class="w3-col w3-third">
                                                        <com:TActiveDropDownList
@@ -2901,7 +2901,7 @@ $(function() {
                                                </div> &nbsp;<i id="api_host_settings_loading" class="fas fa-sync w3-spin w3-text-black" style="visibility: hidden; margin: 10px 5px"></i>
                                        </div>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="APIHostProtocol" Text="<%[ Protocol: ]%>" /></div>
                                        <div class="w3-col w3-third">
                                                <com:TActiveDropDownList ID="APIHostProtocol" CssClass="w3-select w3-border" Width="150px" CausesValidation="false">
@@ -2910,7 +2910,7 @@ $(function() {
                                                </com:TActiveDropDownList>&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                        </div>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="APIHostAddress" Text="<%[ IP Address/Hostname: ]%>" /></div>
                                        <div class="w3-col w3-half">
                                                <com:TActiveTextBox ID="APIHostAddress" CssClass="w3-input w3-border" CausesValidation="false" />
@@ -2918,7 +2918,7 @@ $(function() {
                                        </div>
                                        &nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                </div>
-                               <div class="w3-row w3-section">
+                               <div class="w3-row directive_field">
                                        <div class="w3-col w3-third"><com:TLabel ForControl="APIHostPort" Text="<%[ Port: ]%>" /></div>
                                        <div class="w3-col w3-third">
                                                <com:TActiveTextBox ID="APIHostPort" CssClass="w3-input w3-border" CausesValidation="false" Text="9096" Width="70px" Style="display: inline-block" />
@@ -2927,7 +2927,7 @@ $(function() {
                                        </div>
                                </div>
                                <div class="auth_setting">
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <com:TActiveRadioButton
                                                        ID="APIHostAuthOAuth2"
                                                        GroupName="SelectAuth"
@@ -2941,7 +2941,7 @@ $(function() {
                                                        Text="<%[ Use OAuth2 for authorization and authentication ]%>"
                                                />
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <com:TActiveRadioButton
                                                        ID="APIHostAuthBasic"
                                                        GroupName="SelectAuth"
@@ -2957,8 +2957,8 @@ $(function() {
                                                />
                                        </div>
                                </div>
-                               <div id="configure_basic_auth" style="display: <%=($this->APIHostAuthBasic->Checked === true) ? '' : 'none';%>">
-                                       <div class="w3-row w3-section">
+                               <div id="configure_basic_auth" class="w3-margin-top" style="display: <%=($this->APIHostAuthBasic->Checked === true) ? '' : 'none';%>">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostBasicLogin" Text="<%[ API Login: ]%>" /></div>
                                                <div class="w3-col w3-half">
                                                        <com:TActiveTextBox
@@ -2977,7 +2977,7 @@ $(function() {
                                                </div>
                                                &nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostBasicPassword" Text="<%[ API Password: ]%>" /></div>
                                                <div class="w3-col w3-half">
                                                        <com:TActiveTextBox
@@ -2999,8 +2999,8 @@ $(function() {
                                                &nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                        </div>
                                </div>
-                               <div id="configure_oauth2_auth" style="display: <%=($this->APIHostAuthOAuth2->Checked === true) ? '' : 'none';%>">
-                                       <div class="w3-row w3-section">
+                               <div id="configure_oauth2_auth" class="w3-margin-top" style="display: <%=($this->APIHostAuthOAuth2->Checked === true) ? '' : 'none';%>">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostOAuth2ClientSettings" Text="<%[ Get existing OAuth2 client settings: ]%>" /></div>
                                                <div class="w3-col w3-third">
                                                        <com:TActiveDropDownList
@@ -3018,7 +3018,7 @@ $(function() {
                                                        </com:TActiveDropDownList>
                                                </div> &nbsp;<i id="api_host_oauth2_client_settings_loading" class="fas fa-sync w3-spin w3-text-black" style="visibility: hidden; margin: 10px 5px"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostOAuth2ClientId" Text="<%[ OAuth2 Client ID: ]%>" /></div>
                                                <div class="w3-col w3-half">
                                                        <com:TActiveTextBox
@@ -3047,7 +3047,7 @@ $(function() {
                                                </div>
                                                &nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostOAuth2ClientSecret" Text="<%[ OAuth2 Client Secret: ]%>" /></div>
                                                <div class="w3-col w3-half">
                                                        <com:TActiveTextBox
@@ -3076,7 +3076,7 @@ $(function() {
                                                </div>
                                                &nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostOAuth2RedirectURI" Text="<%[ OAuth2 Redirect URI (example: https://baculumgui:9095/web/redirect): ]%>" /></div>
                                                <div class="w3-col w3-half">
                                                        <com:TActiveTextBox
@@ -3095,7 +3095,7 @@ $(function() {
                                                </div>
                                                &nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third"><com:TLabel ForControl="APIHostOAuth2Scope" Text="<%[ OAuth2 scopes (space separated): ]%>" /></div>
                                                <div class="w3-col w3-half">
                                                        <com:TActiveTextBox
index 83523455be093d3d400b03b0992f7e56aa2cd3a3..c720024f874ee034dc7a2508dc6144ebd5b67a10 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-database"></i> <%[ Storage details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Storage: ]%> <%=$this->getStorageName()%> &nbsp;<span class="w3-small">[StorageId <%=$this->getStorageId()%>]</span></h3>
+       <h3 class="view_header"><%[ Storage: ]%> <%=$this->getStorageName()%> &nbsp;<span class="w3-small">[StorageId <%=$this->getStorageId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('StorageList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_storage_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'storage_actions');"><%[ Actions ]%></button>
@@ -2534,7 +2534,7 @@ var oSlots = {
                                        <h2><%[ Load drive ]%></h2>
                                </header>
                                <div class="w3-container w3-margin-left w3-margin-right w3-margin-top w3-text-teal">
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field w3-margin-bottom">
                                                <div class="w3-col w3-third">
                                                        <%[ Slot ]%>:
                                                </div>
@@ -2542,7 +2542,7 @@ var oSlots = {
                                                        <strong id="load_drive_slot"></strong>
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third">
                                                        <label for="load_drive_drives"><%[ Drive ]%>:</label>
                                                </div>
@@ -2550,7 +2550,7 @@ var oSlots = {
                                                        <select id="load_drive_drives" class="w3-select w3-border"></select>
                                                </div>
                                        </div>
-                                       <div class="w3-row w3-section">
+                                       <div class="w3-row directive_field">
                                                <div class="w3-col w3-third">
                                                        <label for="load_drive_mount"><%[ Mount volume ]%>:</label>
                                                </div>
index 4cb2b67222ee7b4073e17ef526acc24543d20939..68f8bae6cf1adc742bec6baaf9355a42794b1a88 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-hdd"></i> <%[ Volume details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left"><%[ Volume: ]%> <%=$this->getVolumeName()%> &nbsp;<span class="w3-small">[MediaId <%=$this->getMediaId()%>]</span></h3>
+       <h3 class="view_header"><%[ Volume: ]%> <%=$this->getVolumeName()%> &nbsp;<span class="w3-small">[MediaId <%=$this->getMediaId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('VolumeList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_volume_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'volume_actions');"><%[ Actions ]%></button>
index eb0e6883408a115af8b08db368d018eb000478e1..0c55f8e091a1be939fba07d98c38af392d94e959 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveCheckBox
index 5084baee2b5ff2bdec009bc12c3ad0059ad65b29..8badb163eccadbec0cb2fae40b1032635f34f076 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveDropDownList ID="Directive"
index cae4e4f8e8c00590ac0150622402e1d4f23ef675..0bfc381cfb0800dfd7d625dc37ae886ae980869c 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
index 625aee49c2ae4800acd0c7cf7f3de26c327af19a..866133f9c7b40cda8a9a7560f33ae05f66c57af5 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveListBox ID="Directive"
index ea3188ca880dcc0edf47257b09e919c28585cfae..18ef697e23f3aea62a94cf0c5872b16375da403d 100644 (file)
@@ -1,6 +1,6 @@
 <com:TActiveRepeater ID="MultiComboBoxRepeater" OnItemDataBound="createMultiComboBoxElement">
        <prop:ItemTemplate>
-               <div class="directive_field w3-row w3-margin-bottom<%=!isset($this->Data['show']) ? ' hide' : '';%>">
+               <div class="directive_field w3-row<%=!isset($this->Data['show']) ? ' hide' : '';%>">
                        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" />:</div>
                        <div class="w3-col w3-threequarter directive_value">
                                <com:TActiveDropDownList ID="Directive"
index 56a4cbf8bb96df3250030bb61daec3ff509e1677..fb880fbe6889499dcb4116162f944dd8f8e17e04 100644 (file)
@@ -1,6 +1,6 @@
 <com:TActiveRepeater ID="MultiTextBoxRepeater" OnItemDataBound="createMultiTextBoxElement">
        <prop:ItemTemplate>
-               <div class="directive_field w3-row w3-margin-bottom<%=!isset($this->Data['show']) ? ' hide' : '';%>">
+               <div class="directive_field w3-row<%=!isset($this->Data['show']) ? ' hide' : '';%>">
                        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" />:</div>
                        <div class="w3-col w3-threequarter directive_value">
                                <com:TActiveTextBox ID="Directive"
index 1c6eee9ff3d330ce44d93b4598fe344b6c7e5cf1..a70533f6be4522551f7cd98399e48da470ba31c7 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
index 765316e9d2ab5d5674494fbc134f143b1e5eea5e..b9a8f0be6ee2e7e89be5bf6bf52d8b602bf5eeea 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
index 2b1475cf56186be5df4602107c14f2d065970f14..5a46be6d0ac156a429fe40af749c9c1175ab9241 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
index 5aafcecd98fa14b068459b512b6c1355998f76ee..85fae8a83f19f453ec3fc669039b8c320037f96f 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
index 102cc947a5a1d51f6a5cebfac9a44cdef1f0f77a..ad822751875873ac353f8db4ed11e227c47b2a4f 100644 (file)
@@ -1,4 +1,4 @@
-<div class="directive_field w3-row w3-margin-bottom<%=!$this->display_directive ? ' hide' : '';%>">
+<div class="directive_field w3-row<%=!$this->display_directive ? ' hide' : '';%>">
        <div class="w3-col w3-quarter"><com:TActiveLabel ID="Label" ActiveControl.EnableUpdate="false" Visible="<%=$this->display_directive%>" />:</div>
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
index 4c8d0f43ee68fc9632ff760a3853eb5065c5cdc7..c614dbd5e0ed1a9b301d14a49843d4bb93e51189 100644 (file)
@@ -41,7 +41,7 @@ class FileSetOptionRenderer extends DirectiveRenderer {
 
        public function render($writer) {
                if (self::$index % 30 === 0) {
-                       $writer->write('<h3 class="options">Options #' . ((self::$index/30) + 1) . '</h3><hr />');
+                       $writer->write('<h3 class="options">Options #' . ((self::$index/30) + 1) . '</h3><hr style="margin: 7px 0;"/>');
                }
                self::$index++;
 
index af98a72939cfc19c9bf0f83d02f9e9945d026c4a..79a56ee558f0e0c5f49a5263e34a25028f7c4d51 100644 (file)
                                Display="Dynamic"
                                RegularExpression="[0-9]+"
                        />
-                       <div class="w3-row-padding w3-section-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="Barcodes" Text="<%[ Use barcodes as label: ]%>" /></div>
                                <div class="w3-col w3-half"><com:TActiveCheckBox ID="Barcodes" CssClass="w3-check" Attributes.onclick="set_label_volume_barcodes();"/></div>
                        </div>
-                       <div id="label_with_name" class="w3-row-padding w3-section">
+                       <div id="label_with_name" class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="LabelName" Text="<%[ Label name: ]%>" /></div>
                                <div class="w3-col w3-half">
                                        <com:TActiveTextBox ID="LabelName" CssClass="w3-input w3-border" />
@@ -69,7 +69,7 @@
                                        </com:TRequiredFieldValidator>
                                </div>
                        </div>
-                       <div id="label_with_barcodes" class="w3-row-padding w3-section" style="display: none">
+                       <div id="label_with_barcodes" class="w3-row directive_field" style="display: none">
                                <div class="w3-col w3-half"><com:TLabel ForControl="SlotsLabel" Text="<%[ Slots to label (ex. 4 or 1-5 or 2,4,6-10): ]%>" /></div>
                                <div class="w3-col w3-half">
                                        <com:TActiveTextBox ID="SlotsLabel" CssClass="w3-input w3-border" Text="0" />
                                        </com:TRequiredFieldValidator>
                                </div>
                        </div>
-                       <div class="w3-row-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="PoolLabel" Text="<%[ Pool: ]%>" /></div>
                                <div class="w3-col w3-half"><com:TActiveDropDownList ID="PoolLabel" CssClass="w3-select w3-border" /></div>
                        </div>
-                       <div class="w3-row-padding w3-section"<%=$this->Storage ? ' style="display: none"' : ''%>>
+                       <div class="w3-row directive_field"<%=$this->Storage ? ' style="display: none"' : ''%>>
                                <div class="w3-col w3-half"><com:TLabel ForControl="StorageLabel" Text="<%[ Storage: ]%>" /></div>
                                <div class="w3-col w3-half"><com:TActiveDropDownList ID="StorageLabel" CssClass="w3-select w3-border" /></div>
                        </div>
-                       <div class="w3-row-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="DriveLabel" Text="<%[ Drive index: ]%>" /></div>
                                <div class="w3-col w3-half">
                                        <com:TActiveTextBox ID="DriveLabel" CssClass="w3-input w3-border" Text="0" />
                                        />
                                </div>
                        </div>
-                       <div id="label_without_barcodes" class="w3-row-padding w3-section">
+                       <div id="label_without_barcodes" class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="SlotLabel" Text="<%[ Slot number: ]%>" /></div>
                                <div class="w3-col w3-half">
                                        <com:TActiveTextBox ID="SlotLabel" CssClass="w3-input w3-border" Text="0" />
                                        </com:TRequiredFieldValidator>
                                </div>
                        </div>
-                       <div class="w3-row-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><%[ Labeling status: ]%></div>
                                <div class="w3-col w3-half">
                                        <i id="label_status_start" class="fa fa-step-forward" title="<%[ Ready to label ]%>"></i>
index 4401a0e48a7a9453bdda3d174fbb76eed64c05d3..9107d3942ab7520a3086a00a70f31e613e7a6b40 100644 (file)
@@ -39,7 +39,7 @@
                </div>
        </div>
        <div class="w3-container w3-black">
-               <h5>Baculum Menu</h5>
+               <h5 class="w3-center" style="margin: 6px 0 2px 0">Baculum Web Menu</h5>
        </div>
        <div class="w3-bar-block" style="margin-bottom: 45px;">
                <!--a href="#" class="w3-bar-item w3-button w3-padding-16 w3-black w3-hover-black w3-hide-large" onclick="W3SideBar.close(); return false;" title="close menu">  <%[ Close Menu ]%> <i class="fa fa-window-close fa-fw w3-right w3-xlarge"></i></a-->
index 30852e0ee35acdd49152250fde82db87c76eef4c..46334e2238e4d5f033e7d84a66e70a8557526fd1 100644 (file)
@@ -5,8 +5,8 @@
                        <h2><%[ Run job ]%><%=$this->getJobName() ? ' - ' . $this->getJobName() : ''%></h2>
                </header>
                <div class="w3-container w3-margin-left w3-margin-right">
-                       <com:TActivePanel ID="JobToRunLine" CssClass="w3-row w3-section w3-text-teal" Display="None">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-tasks"></i> &nbsp;<com:TLabel ForControl="JobToRun" Text="<%[ Job to run: ]%>" CssClass="w3-xlarge" /></div>
+                       <com:TActivePanel ID="JobToRunLine" CssClass="w3-row w3-text-teal directive_field" Display="None">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-tasks"></i> &nbsp;<com:TLabel ForControl="JobToRun" Text="<%[ Job to run: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList
                                                ID="JobToRun"
@@ -15,8 +15,8 @@
                                        />
                                </div>
                        </com:TActivePanel>
-                       <div class="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-compass"></i> &nbsp;<com:TLabel ForControl="Level" Text="<%[ Level: ]%>" CssClass="w3-xlarge"/></div>
+                       <div class="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-compass"></i> &nbsp;<com:TLabel ForControl="Level" Text="<%[ Level: ]%>" CssClass="w3-large"/></div>
                                <div class="w3-half">
                                <com:TActiveDropDownList ID="Level" CssClass="w3-select w3-border" AutoPostBack="false">
                                        <prop:Attributes.onchange>
@@ -48,8 +48,8 @@
                                </com:TActiveDropDownList>
                                </div>
                        </div>
-                       <com:TActivePanel ID="JobToVerifyOptionsLine" CssClass="w3-row w3-section w3-text-teal" Display="None">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-search-plus"></i> &nbsp;<com:TLabel ForControl="JobToVerifyOptions" Text="<%[ Verify option: ]%>" CssClass="w3-xlarge" /></div>
+                       <com:TActivePanel ID="JobToVerifyOptionsLine" CssClass="w3-row w3-text-teal directive_field" Display="None">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-search-plus"></i> &nbsp;<com:TLabel ForControl="JobToVerifyOptions" Text="<%[ Verify option: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="JobToVerifyOptions" AutoPostBack="false" CssClass="w3-select w3-border">
                                                <prop:Attributes.onchange>
                                        </com:TActiveDropDownList>
                                </div>
                        </com:TActivePanel>
-                       <com:TActivePanel ID="JobToVerifyJobNameLine" CssClass="w3-row w3-section w3-text-teal" Display="None">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-check"></i> &nbsp;<com:TLabel ForControl="JobToVerifyJobName" Text="<%[ Job to Verify: ]%>" CssClass="w3-xlarge" /></div>
+                       <com:TActivePanel ID="JobToVerifyJobNameLine" CssClass="w3-row w3-text-teal directive_field" Display="None">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-check"></i> &nbsp;<com:TLabel ForControl="JobToVerifyJobName" Text="<%[ Job to Verify: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="JobToVerifyJobName" AutoPostBack="false" CssClass="w3-select w3-border" />
                                </div>
                        </com:TActivePanel>
-                       <com:TActivePanel ID="JobToVerifyJobIdLine" CssClass="w3-row w3-section w3-text-teal" Display="None">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-file-alt"></i> &nbsp;<com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" CssClass="w3-xlarge" /></div>
+                       <com:TActivePanel ID="JobToVerifyJobIdLine" CssClass="w3-row w3-text-teal directive_field" Display="None">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-file-alt"></i> &nbsp;<com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveTextBox ID="JobToVerifyJobId" CssClass="w3-input w3-border" AutoPostBack="false" />
                                        <com:TRequiredFieldValidator
                                        </com:TDataTypeValidator>
                                </div>
                        </com:TActivePanel>
-                       <div class="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-desktop"></i> &nbsp;<com:TLabel ForControl="Client" Text="<%[ Client: ]%>" CssClass="w3-xlarge" /></div>
+                       <div class="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-desktop"></i> &nbsp;<com:TLabel ForControl="Client" Text="<%[ Client: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="Client" AutoPostBack="false" CssClass="w3-select w3-border" />
                                </div>
                        </div>
-                       <div class="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-list-alt"></i> &nbsp;<com:TLabel ForControl="FileSet" Text="<%[ FileSet: ]%>" CssClass="w3-xlarge" /></div>
+                       <div class="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-list-alt"></i> &nbsp;<com:TLabel ForControl="FileSet" Text="<%[ FileSet: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="FileSet" AutoPostBack="false" CssClass="w3-select w3-border" />
                                </div>
                        </div>
-                       <div class="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-tape"></i> &nbsp;<com:TLabel ForControl="Pool" Text="<%[ Pool: ]%>" CssClass="w3-xlarge" /></div>
+                       <div class="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-tape"></i> &nbsp;<com:TLabel ForControl="Pool" Text="<%[ Pool: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="Pool" AutoPostBack="false" CssClass="w3-select w3-border" />
                                </div>
                        </div>
-                       <div class="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-database"></i> &nbsp;<com:TLabel ForControl="Storage" Text="<%[ Storage: ]%>" CssClass="w3-xlarge" /></div>
+                       <div class="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-database"></i> &nbsp;<com:TLabel ForControl="Storage" Text="<%[ Storage: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="Storage" AutoPostBack="false" CssClass="w3-select w3-border" />
                                </div>
                                        &nbsp;&nbsp;<i class="fas fa-info-circle" title="<%[ The storage has been selected basing on job configuration. This item may require adjusting before job run. ]%>"></i>
                                </div>
                        </div>
-                       <div class="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-sort-numeric-up"></i> &nbsp;<com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" CssClass="w3-xlarge" /></div>
+                       <div class="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-sort-numeric-up"></i> &nbsp;<com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" CssClass="w3-large" /></div>
                                <div class="w3-half">
-                                       <com:TActiveTextBox ID="Priority" CssClass="w3-input w3-border" AutoPostBack="false" />
+                                       <com:TActiveTextBox ID="Priority" CssClass="w3-input w3-border w3-quarter" AutoPostBack="false" />
                                        <com:TRequiredFieldValidator
                                                ValidationGroup="JobGroup"
                                                ControlToValidate="Priority"
                                        />
                                </div>
                        </div>
-                       <com:TActivePanel ID="AccurateLine" CssClass="w3-row w3-section w3-text-teal">
-                               <div class="w3-col w3-third"><i class="w3-xlarge fa fa-balance-scale"></i> &nbsp;<com:TLabel ForControl="Accurate" Text="<%[ Accurate: ]%>" CssClass="w3-xlarge"/></div>
+                       <com:TActivePanel ID="AccurateLine" CssClass="w3-row w3-text-teal directive_field">
+                               <div class="w3-col w3-third"><i class="w3-large fa fa-balance-scale"></i> &nbsp;<com:TLabel ForControl="Accurate" Text="<%[ Accurate: ]%>" CssClass="w3-large"/></div>
                                <div class="field"><com:TActiveCheckBox ID="Accurate" AutoPostBack="false" CssClass="w3-check" /></div>
                        </com:TActivePanel>
                </div>
index fa3c6d106c972fb5a92d1cc12924beb528306c83..7725078f6e79bbd0b577784c0a533b5227487f6d 100644 (file)
                                Display="Dynamic"
                                RegularExpression="[0-9]+"
                        />
-                       <div class="w3-row-padding w3-section-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="Barcodes" Text="<%[ Update slots using barcodes ]%>" /></div>
                                <div class="w3-col w3-half"><com:TActiveCheckBox ID="Barcodes" CssClass="w3-check" Checked="true" Attributes.onclick="set_update_slots_barcodes();" /></div>
                        </div>
-                       <div class="w3-row-padding w3-section"<%=$this->Storage ? ' style="display: none"' : ''%>>
+                       <div class="w3-row directive_field"<%=$this->Storage ? ' style="display: none"' : ''%>>
                                <div class="w3-col w3-half"><com:TLabel ForControl="StorageUpdate" Text="<%[ Storage: ]%>" /></div>
                                <div class="w3-col w3-half"><com:TActiveDropDownList ID="StorageUpdate" CssClass="w3-select w3-border" /></div>
                        </div>
-                       <div class="w3-row-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="SlotsUpdate" Text="<%[ Slots to update (ex. 4 or 1-5 or 2,4,6-10): ]%>" /></div>
                                <div class="w3-col w3-half">
                                        <com:TActiveTextBox ID="SlotsUpdate" CssClass="w3-input w3-border" Text="0" />
@@ -62,7 +62,7 @@
                                        />
                                </div>
                        </div>
-                       <div class="w3-row-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><com:TLabel ForControl="DriveUpdate" Text="<%[ Drive number: ]%>" /></div>
                                <div class="w3-col w3-half">
                                        <com:TActiveTextBox ID="DriveUpdate" CssClass="w3-input w3-border" Text="0" />
@@ -73,7 +73,7 @@
                                        />
                                </div>
                        </div>
-                       <div class="w3-row-padding w3-section">
+                       <div class="w3-row directive_field">
                                <div class="w3-col w3-half"><%[ Updating status: ]%></div>
                                <div class="w3-col w3-half">
                                        <i id="update_slots_status_start" class="fa fa-step-forward" title="<%[ Ready to update ]%>"></i>
index 0f3f9393a5a4b082e9af65d94c4ab9e5ce2a4b7b..6b5d49f54bc79f3281078778d4ade26fe425046d 100644 (file)
@@ -263,12 +263,23 @@ div.directive_value:hover i.reset_btn, div.directive_value:hover i.remove_btn {
        display: inline;
 }
 
-div.directive_field input, div.directive_field select {
+div.directive_field {
+       margin: 7px 0;
+}
+
+div.directive_field input, div.directive_field select, div.directive_field textarea {
        max-width: 400px;
 }
-div.directive_field input.w3-half, div.directive_field select.w3-half {
+div.directive_field input.w3-half, div.directive_field select.w3-half, div.directive_field textarea.w3-half {
        max-width: 200px;
 }
+div.directive_field input.w3-quarter, div.directive_field select.w3-quarter, div.directive_field textarea.w3-quarter {
+       max-width: 100px;
+}
+
+.view_header {
+       margin: 0 0 2px 16px;
+}
 
 div.details_card {
        min-height: 200px;