]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Visual improvements in interface
authorMarcin Haba <marcin.haba@bacula.pl>
Sat, 6 Nov 2021 19:59:44 +0000 (20:59 +0100)
committerEric Bollengier <eric@baculasystems.com>
Thu, 24 Mar 2022 08:03:27 +0000 (09:03 +0100)
Changes:
 - Unify wizards interface
 - Align all doc buttons
 - Button style improvement
 - Reduce size of directive fields
 - General styling

18 files changed:
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/Portlets/DirectiveComboBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
gui/baculum/protected/Web/Portlets/DirectiveMessages.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/DirectiveTime.tpl
gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
gui/baculum/protected/Web/Portlets/NewFileSetFileOptMenu.tpl
gui/baculum/themes/Baculum-v2/css/baculum.css

index 3b4dec1356b03163347f191beca78ad0feaef7eb..a1da7fa45a779ad6eeafb2a18f68d6d746aaf1cf 100644 (file)
                                <p><%[ This wizard enables you to create in easy way a new backup job. ]%></p>
                                <!--p><%[ To start please select job type that you wish to create. ]%></p-->
                        </div>
-                       <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"
-                                       />
-                       </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"
-                                       />
-                       </div>
-                       <div class="w3-container w3-margin-top">
-                               <com:Application.Web.Portlets.DirectiveComboBox
-                                       ID="JobDefs"
-                                       DirectiveName="JobDefs"
-                                       Label="JobDefs"
-                                       Show="true"
-                                       />
+                       <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>
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step2" Title="<%[ Step 2 - what you want to backup ]%>" StepType="Auto">
                                <p><%[ Please select Client from which you want to backup data and please select FileSet with files/directories definition to backup. ]%></p>
                                <p><%[ If your FileSet for this backup does not exist yet, you can create it. ]%></p>
                        </div>
-                       <div class="w3-container">
-                               <com:Application.Web.Portlets.DirectiveComboBox
-                                       ID="Client"
-                                       DirectiveName="Client"
-                                       Label="Client"
-                                       Show="true"
-                                       ValidationGroup="NewJobDirective"
-                                       Required="true"
-                                       />
-                       </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"
+                       <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>
+                               <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>
+                               </div>
+                               <div id="job_wizard_new_fileset" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+                                       <h3><%[ New FileSet ]%></h3>
+                                       <com:Application.Web.Portlets.BaculaConfigDirectives
+                                               ID="FilesetConfig"
+                                               ComponentType="dir"
+                                               ResourceType="Fileset"
+                                               ShowCancelButton="false"
+                                               SaveDirectiveActionOk="$('#job_wizard_new_fileset').slideUp(); set_new_fileset(); $('#fileset_save_ok').show();"
                                        />
-                               <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>
-                       <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>
-                       </div>
-                       <div id="job_wizard_new_fileset" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-                               <h3><%[ New FileSet ]%></h3>
-                               <com:Application.Web.Portlets.BaculaConfigDirectives
-                                       ID="FilesetConfig"
-                                       ComponentType="dir"
-                                       ResourceType="Fileset"
-                                       ShowCancelButton="false"
-                                       SaveDirectiveActionOk="$('#job_wizard_new_fileset').slideUp(); set_new_fileset(); $('#fileset_save_ok').show();"
-                               />
+                               </div>
                        </div>
                        <com:TCallback ID="LoadFilesetList" OnCallback="LoadFilesetList" />
                        <script type="text/javascript">
                                <h2><%[ Storage and Pool ]%></h2>
                                <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-container">
-                               <com:Application.Web.Portlets.DirectiveComboBox
-                                       ID="Storage"
-                                       DirectiveName="Storage"
-                                       Label="Storage"
-                                       Show="true"
-                                       ValidationGroup="NewJobDirective"
-                                       Required="true"
-                                       />
-                               <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"
-                                                />
-                               </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveCheckBox
-                                               ID="SpoolAttributes"
-                                               DirectiveName="SpoolAttributes"
-                                               Label="Spool Attributes"
-                                               Show="true"
-                                                />
-                               </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveSize
-                                               ID="SpoolSize"
-                                               DirectiveName="SpoolSize"
-                                               Label="Spool Size"
-                                               Show="true"
-                                               />
-                               </div>
-                       </div>
-                       <div class="w3-container w3-margin-top">
-                               <com:Application.Web.Portlets.DirectiveComboBox
-                                       ID="Pool"
-                                       DirectiveName="Pool"
-                                       Label="Pool"
-                                       Show="true"
-                                       ValidationGroup="NewJobDirective"
-                                       Required="true"
-                                        />
-                               <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>
-                       </div>
-                       <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_new_pool" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-                               <h3><%[ New Pool ]%></h3>
-                               <com:Application.Web.Portlets.BaculaConfigDirectives
-                                       ID="PoolConfig"
-                                       ComponentType="dir"
-                                       ResourceType="Pool"
-                                       ShowCancelButton="false"
-                                       SaveDirectiveActionOk="$('#job_wizard_new_pool').slideUp(); set_new_pool(); $('#pool_save_ok').show();"
-                               />
-                       </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-half" style="float: none; margin: auto">
                                <div class="w3-container">
                                        <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="FullBackupPool"
-                                               DirectiveName="FullBackupPool"
-                                               Label="Full Backup Pool"
+                                               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"><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">
+                               <div class="w3-container w3-margin-top">
                                        <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="IncrementalBackupPool"
-                                               DirectiveName="IncrementalBackupPool"
-                                               Label="Incremental Backup Pool"
+                                               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"><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>
+                               </div>
+                               <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_new_pool" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+                                       <h3><%[ New Pool ]%></h3>
+                                       <com:Application.Web.Portlets.BaculaConfigDirectives
+                                               ID="PoolConfig"
+                                               ComponentType="dir"
+                                               ResourceType="Pool"
+                                               ShowCancelButton="false"
+                                               SaveDirectiveActionOk="$('#job_wizard_new_pool').slideUp(); set_new_pool(); $('#pool_save_ok').show();"
+                                       />
                                </div>
-                               <div class="w3-container">
-                                       <com:Application.Web.Portlets.DirectiveComboBox
-                                               ID="DifferentialBackupPool"
-                                               DirectiveName="DifferentialBackupPool"
-                                               Label="Differential Backup Pool"
-                                               Show="true"
-                                               />
+                               <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>
                                </div>
                        </div>
                        <com:TCallback ID="LoadPoolList" OnCallback="LoadPoolList" />
                        </script>
                </com:TWizardStep>
                <com:TWizardStep ID="Step4" Title="<%[ Step 4 - how would you like to backup ]%>" StepType="Auto">
-                       <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"
-                                       />
-                       </div>
-                       <div class="w3-container">
-                               <com:Application.Web.Portlets.DirectiveCheckBox
-                                       ID="Accurate"
-                                       DirectiveName="Accurate"
-                                       DefaultValue="0"
-                                       Label="Accurate"
-                                       Show="true"
-                                        />
-                       </div>
-                       <div class="w3-container">
-                               <com:Application.Web.Portlets.DirectiveTextBox
-                                       ID="MaximumConcurrentJobs"
-                                       DirectiveName="MaximumConcurrentJobs"
-                                       DefaultValue="1"
-                                       Label="Maximum Concurrent Jobs"
-                                       Show="true"
-                                        />
-                       </div>
-                       <div class="w3-container">
-                               <com:Application.Web.Portlets.DirectiveTextBox
-                                       ID="Priority"
-                                       DirectiveName="Priority"
-                                       DefaultValue="10"
-                                       Label="Priority"
-                                       Show="true"
-                                        />
-                       </div>
-                       <div class="w3-container">
-                               <com:Application.Web.Portlets.DirectiveCheckBox
-                                       ID="ReRunFailedLevels"
-                                       DirectiveName="ReRunFailedLevels"
-                                       DefaultValue="0"
-                                       Label="ReRun Failed Levels"
-                                       Show="true"
-                                        />
-                       </div>
-                       <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"
-                                       />
-                       </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"
-                                       />
-                               <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>
-                       <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_new_schedule" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-                               <h3><%[ New Schedule ]%></h3>
-                               <com:Application.Web.Portlets.BaculaConfigDirectives
-                                       ID="ScheduleConfig"
-                                       ComponentType="dir"
-                                       ResourceType="Schedule"
-                                       ShowCancelButton="false"
-                                       SaveDirectiveActionOk="$('#job_wizard_new_schedule').slideUp(); set_new_schedule(); $('#schedule_save_ok').show();"
-                               />
-                       </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-half" style="float: none; margin: auto">
+                               <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="RescheduleOnError"
-                                               DirectiveName="RescheduleOnError"
+                                               ID="Accurate"
+                                               DirectiveName="Accurate"
                                                DefaultValue="0"
-                                               Label="Reschedule On Error"
+                                               Label="Accurate"
                                                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"
+                                       <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.DirectiveTimePeriod
-                                               ID="RescheduleInterval"
-                                               DirectiveName="RescheduleInterval"
-                                               DefaultValue="1800"
-                                               Label="Reschedule Interval"
+                                       <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.DirectiveInteger
-                                               ID="RescheduleTimes"
-                                               DirectiveName="RescheduleTimes"
-                                               Label="Reschedule Times"
+                                       <com:Application.Web.Portlets.DirectiveCheckBox
+                                               ID="ReRunFailedLevels"
+                                               DirectiveName="ReRunFailedLevels"
+                                               DefaultValue="0"
+                                               Label="ReRun Failed Levels"
                                                Show="true"
+                                               ShowResetButton="false"
+                                               ShowRemoveButton="false"
                                                 />
                                </div>
+                               <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>
+                       </div>
+               </com:TWizardStep>
+               <com:TWizardStep ID="Step5" Title="<%[ Step 5 - when would you like to run backup ]%>" StepType="Auto">
+                       <div class="w3-half" style="float: none; margin: 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>
+                               <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_new_schedule" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+                                       <h3><%[ New Schedule ]%></h3>
+                                       <com:Application.Web.Portlets.BaculaConfigDirectives
+                                               ID="ScheduleConfig"
+                                               ComponentType="dir"
+                                               ResourceType="Schedule"
+                                               ShowCancelButton="false"
+                                               SaveDirectiveActionOk="$('#job_wizard_new_schedule').slideUp(); set_new_schedule(); $('#schedule_save_ok').show();"
+                                       />
+                               </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>
+                               </div>
                        </div>
                        <com:TCallback ID="LoadScheduleList" OnCallback="LoadScheduleList" />
                        <script type="text/javascript">
                        </script>
                </com:TWizardStep>
                <com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
-                       <fieldset>
-                               <legend><%[ General ]%></legend>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Job Name</div>
-                                       <div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Description</div>
-                                       <div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">JobDefs</div>
-                                       <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ What ]%></legend>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Client</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Client->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                       <div class="w3-half" style="float: none; margin: auto">
+                               <fieldset>
+                                       <legend><%[ General ]%></legend>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Job Name</div>
+                                               <div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">FileSet</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Fileset->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Fileset', $this->Fileset->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Description</div>
+                                               <div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ Where ]%></legend>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Storage</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Storage->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->Storage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">JobDefs</div>
+                                               <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Spool Data</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->SpoolData->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SpoolData', $this->SpoolData->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ What ]%></legend>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Client</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Client->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Spool Attributes</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->SpoolAttributes->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SpoolAttributes', $this->SpoolAttributes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">FileSet</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Fileset->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Fileset', $this->Fileset->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Spool Size</div>
-                                       <div class="w3-threequarter bold size">
-                                               <%=$this->SpoolSize->getDirectiveValue() ?: '0'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SpoolSize', $this->SpoolSize->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ Where ]%></legend>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Storage</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Storage->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->Storage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Pool</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Pool->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Spool Data</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->SpoolData->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SpoolData', $this->SpoolData->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Full Backup Pool</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->FullBackupPool->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('FullBackupPool', $this->FullBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Spool Attributes</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->SpoolAttributes->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SpoolAttributes', $this->SpoolAttributes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Incremental Backup Pool</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->IncrementalBackupPool->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('IncrementalBackupPool', $this->IncrementalBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Spool Size</div>
+                                               <div class="w3-threequarter bold size">
+                                                       <%=$this->SpoolSize->getDirectiveValue() ?: '0'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SpoolSize', $this->SpoolSize->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Differential Backup Pool</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->DifferentialBackupPool->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('DifferentialBackupPool', $this->DifferentialBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Pool</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Pool->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ How ]%></legend>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Level</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Level->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Full Backup Pool</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->FullBackupPool->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('FullBackupPool', $this->FullBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Accurate</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Accurate->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Accurate', $this->Accurate->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Incremental Backup Pool</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->IncrementalBackupPool->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('IncrementalBackupPool', $this->IncrementalBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Maximum Concurrent Jobs</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->MaximumConcurrentJobs->getDirectiveValue() ?: $this->MaximumConcurrentJobs->getDefaultValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('MaximumConcurrentJobs', $this->MaximumConcurrentJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Differential Backup Pool</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->DifferentialBackupPool->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('DifferentialBackupPool', $this->DifferentialBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Priority</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Priority->getDirectiveValue() ?: $this->Priority->getDefaultValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Priority', $this->Priority->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ How ]%></legend>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Level</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Level->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">ReRun Failed Levels</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->ReRunFailedLevels->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('ReRunFailedLevels', $this->ReRunFailedLevels->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Accurate</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Accurate->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Accurate', $this->Accurate->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ When ]%></legend>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Schedule</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Schedule->getDirectiveValue() ?: '-' %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Maximum Concurrent Jobs</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->MaximumConcurrentJobs->getDirectiveValue() ?: $this->MaximumConcurrentJobs->getDefaultValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('MaximumConcurrentJobs', $this->MaximumConcurrentJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Reschedule On Error</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->RescheduleOnError->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleOnError', $this->RescheduleOnError->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Priority</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Priority->getDirectiveValue() ?: $this->Priority->getDefaultValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Priority', $this->Priority->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Reschedule Incomplete Jobs</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->RescheduleIncompleteJobs->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleIncompleteJobs', $this->RescheduleIncompleteJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">ReRun Failed Levels</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->ReRunFailedLevels->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('ReRunFailedLevels', $this->ReRunFailedLevels->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Reschedule Interval</div>
-                                       <div class="w3-threequarter bold time">
-                                               <%=$this->RescheduleInterval->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleInterval', $this->RescheduleInterval->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ When ]%></legend>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Schedule</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Schedule->getDirectiveValue() ?: '-' %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Reschedule Times</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->RescheduleTimes->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleTimes', $this->RescheduleTimes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Reschedule On Error</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->RescheduleOnError->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleOnError', $this->RescheduleOnError->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ Other directives ]%></legend>
-                               <div class="w3-container">
-                                       <div class="w3-quarter">Messages</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Messages->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Reschedule Incomplete Jobs</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->RescheduleIncompleteJobs->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleIncompleteJobs', $this->RescheduleIncompleteJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Reschedule Interval</div>
+                                               <div class="w3-threequarter bold time">
+                                                       <%=$this->RescheduleInterval->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleInterval', $this->RescheduleInterval->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Reschedule Times</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->RescheduleTimes->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('RescheduleTimes', $this->RescheduleTimes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ Other directives ]%></legend>
+                                       <div class="w3-container">
+                                               <div class="w3-quarter">Messages</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Messages->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                               </fieldset>
+                               <com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+                       </div>
                </com:TWizardStep>
        </com:TWizard>
        <script type="text/javascript">
index 9ae29dd9ebb7192ca8ca7e33751094380287976b..f2bb80b2596a906ee2cf401acb0b767c81a8ef35 100644 (file)
@@ -762,7 +762,7 @@ var oVolumeList = {
                        </div>
                        <div id="selection_type_oldest_volume" style="display: none">
                        </div>
-                       <div id="selection_type_sql_query" style="display: none">
+                       <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"
@@ -1835,117 +1835,119 @@ function show_storage_warning(storage, pool, jobs) {
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
-                       <fieldset>
-                               <legend><%[ General ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Job Name</div>
-                                       <div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Description</div>
-                                       <div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">JobDefs</div>
-                                       <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ What ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Source Pool</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Pool->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                       <div class="w3-half" style="float: none; margin: auto">
+                               <fieldset>
+                                       <legend><%[ General ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Job Name</div>
+                                               <div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Source Storage</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->SourceStorage->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Description</div>
+                                               <div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ How ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Selection Type</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">JobDefs</div>
+                                               <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Selection Pattern</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ What ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Source Pool</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Pool->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ Where ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Destination Pool (NextPool)</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->NextPool->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Source Storage</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->SourceStorage->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Destination Storage</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->DestinationStorage->getDirectiveValue()%>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ How ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Selection Type</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ Options ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Maximum Spawned Jobs</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Selection Pattern</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Schedule</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Schedule->getDirectiveValue() ?: '-' %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ Where ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Destination Pool (NextPool)</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->NextPool->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Messages</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Messages->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Destination Storage</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->DestinationStorage->getDirectiveValue()%>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Level</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Level->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ Options ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Maximum Spawned Jobs</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Client</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Client->getDirectiveValue()%>
-                                               <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Schedule</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Schedule->getDirectiveValue() ?: '-' %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">FileSet</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->FileSet->getDirectiveValue()%>
-                                               <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Messages</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Messages->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Level</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Level->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Client</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Client->getDirectiveValue()%>
+                                                       <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">FileSet</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->FileSet->getDirectiveValue()%>
+                                                       <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                               </fieldset>
+                               <com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+                       </div>
                </com:TWizardStep>
        </com:TWizard>
 </com:TContent>
index 9389f45ae39595455e85ba37835e9aa34c2da720..f2c1850847f92226c64d8a86f1cc501a4ef1973d 100644 (file)
@@ -762,7 +762,7 @@ var oVolumeList = {
                        </div>
                        <div id="selection_type_oldest_volume" style="display: none">
                        </div>
-                       <div id="selection_type_sql_query" style="display: none">
+                       <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"
@@ -1932,145 +1932,147 @@ function show_storage_warning(storage, pool, jobs) {
                        </div>
                </com:TWizardStep>
                <com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
-                       <fieldset>
-                               <legend><%[ General ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Job Name</div>
-                                       <div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Description</div>
-                                       <div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">JobDefs</div>
-                                       <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ What ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Source Pool</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Pool->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                       <div class="w3-half" style="float: none; margin: auto">
+                               <fieldset>
+                                       <legend><%[ General ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Job Name</div>
+                                               <div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Source Storage</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->SourceStorage->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Description</div>
+                                               <div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ How ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Selection Type</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">JobDefs</div>
+                                               <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Selection Pattern</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ What ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Source Pool</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Pool->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
-                                       <div class="w3-quarter">Migration High Bytes</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->MigrationHighBytes->Directive->getText()%> <%=$this->MigrationHighBytes->SizeFormat->getSelectedItem()->getText()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('MigrationHighBytes', ($this->MigrationHighBytes->getValue() ? $this->MigrationHighBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Source Storage</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->SourceStorage->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
-                                       <div class="w3-quarter">Migration Low Bytes</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->MigrationLowBytes->Directive->getText()%> <%=$this->MigrationLowBytes->SizeFormat->getSelectedItem()->getText()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('MigrationLowBytes', ($this->MigrationLowBytes->getValue() ? $this->MigrationLowBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ How ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Selection Type</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolTime' ? 'block' : 'none'%>">
-                                       <div class="w3-quarter">Migration Time</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->MigrationTime->Directive->getText()%> <%=$this->MigrationTime->TimeFormat->getSelectedItem()->getText()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('MigrationTime', ($this->MigrationTime->getValue() ? $this->MigrationTime->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Selection Pattern</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ Where ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Destination Pool (NextPool)</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->NextPool->getDirectiveValue()%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
+                                               <div class="w3-quarter">Migration High Bytes</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->MigrationHighBytes->Directive->getText()%> <%=$this->MigrationHighBytes->SizeFormat->getSelectedItem()->getText()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('MigrationHighBytes', ($this->MigrationHighBytes->getValue() ? $this->MigrationHighBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Destination Storage</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->DestinationStorage->getDirectiveValue()%>
+                                       <div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
+                                               <div class="w3-quarter">Migration Low Bytes</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->MigrationLowBytes->Directive->getText()%> <%=$this->MigrationLowBytes->SizeFormat->getSelectedItem()->getText()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('MigrationLowBytes', ($this->MigrationLowBytes->getValue() ? $this->MigrationLowBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <fieldset>
-                               <legend><%[ Options ]%></legend>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Purge Migration Job</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->PurgeMigrationJob->getValue() ? Prado::localize('Yes') : Prado::localize('No')%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('PurgeMigrationJob', $this->PurgeMigrationJob->getValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolTime' ? 'block' : 'none'%>">
+                                               <div class="w3-quarter">Migration Time</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->MigrationTime->Directive->getText()%> <%=$this->MigrationTime->TimeFormat->getSelectedItem()->getText()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('MigrationTime', ($this->MigrationTime->getValue() ? $this->MigrationTime->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Maximum Spawned Jobs</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ Where ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Destination Pool (NextPool)</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->NextPool->getDirectiveValue()%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Schedule</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Schedule->getDirectiveValue() ?: '-' %>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Destination Storage</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->DestinationStorage->getDirectiveValue()%>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Messages</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Messages->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                               </fieldset>
+                               <fieldset>
+                                       <legend><%[ Options ]%></legend>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Purge Migration Job</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->PurgeMigrationJob->getValue() ? Prado::localize('Yes') : Prado::localize('No')%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('PurgeMigrationJob', $this->PurgeMigrationJob->getValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Level</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Level->getDirectiveValue() ?: '-'%>
-                                               <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Maximum Spawned Jobs</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">Client</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->Client->getDirectiveValue()%>
-                                               <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Schedule</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Schedule->getDirectiveValue() ?: '-' %>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                               <div class="w3-container w3-padding-small">
-                                       <div class="w3-quarter">FileSet</div>
-                                       <div class="w3-threequarter bold">
-                                               <%=$this->FileSet->getDirectiveValue()%>
-                                               <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Messages</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Messages->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
                                        </div>
-                               </div>
-                       </fieldset>
-                       <com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Level</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Level->getDirectiveValue() ?: '-'%>
+                                                       <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">Client</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->Client->getDirectiveValue()%>
+                                                       <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                                       <div class="w3-container w3-padding-small">
+                                               <div class="w3-quarter">FileSet</div>
+                                               <div class="w3-threequarter bold">
+                                                       <%=$this->FileSet->getDirectiveValue()%>
+                                                       <span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                               </div>
+                                       </div>
+                               </fieldset>
+                               <com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+                       </div>
                </com:TWizardStep>
        </com:TWizard>
 </com:TContent>
index be453e7cbda44c12c914844747656c286b446477..5084baee2b5ff2bdec009bc12c3ad0059ad65b29 100644 (file)
@@ -7,7 +7,7 @@
                        Visible="<%=$this->display_directive%>"
                        AutoPostBack="false"
                        ActiveControl.EnableUpdate="false"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
index 78f002ad59b47e23beec0dd3b96ab96b50da0334..cae4e4f8e8c00590ac0150622402e1d4f23ef675 100644 (file)
@@ -7,7 +7,7 @@
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                        AutoTrim="true"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
index 2756bb07c8734f464b65dae1f3c3066195119e70..625aee49c2ae4800acd0c7cf7f3de26c327af19a 100644 (file)
@@ -8,7 +8,7 @@
                        Visible="<%=$this->display_directive%>"
                        AutoPostBack="false"
                        ActiveControl.EnableUpdate="false"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
index 8a99c2d0d9bacbd4021fab81fb8091e12074527d..dcf73a6c43f3425246eb58098ddef7ae84480e80 100644 (file)
@@ -5,7 +5,7 @@
        <prop:ItemTemplate>
                <div class="w3-card w3-padding directive">
                        <com:TActiveLinkButton
-                               CssClass="w3-button w3-green w3-right"
+                               CssClass="w3-button w3-red w3-right"
                                OnCommand="SourceTemplateControl.removeMessages"
                                CommandName="<%=$this->ItemIndex%>"
                        >
index ae3d6697f2c355ae4707360a1beaf52511bee5dc..ea3188ca880dcc0edf47257b09e919c28585cfae 100644 (file)
@@ -7,12 +7,10 @@
                                        CssClass="w3-input w3-border w3-twothird"
                                        AutoPostBack="false"
                                        ActiveControl.EnableUpdate="false"
-                               />      <com:TActiveLinkButton ID="AddFieldBtn"
+                               /> &nbsp;<com:TActiveLinkButton ID="AddFieldBtn"
                                                OnCommand="SourceTemplateControl.addField"
                                                CommandParameter="save"
-                                       >
-                                       <i class="fa fa-plus" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i>
-                               </com:TActiveLinkButton>
+                                       ><i class="fa fa-plus plus_btn" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i></com:TActiveLinkButton>
                                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->SourceTemplateControl->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                                <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                                <div class="directive_help" style="clear: left; display: none"><%=$this->SourceTemplateControl->doc%></div>
index b0eb1055f461668c1c930cb4b662a1460302e737..56a4cbf8bb96df3250030bb61daec3ff509e1677 100644 (file)
@@ -7,15 +7,11 @@
                                        CssClass="w3-input w3-border w3-twothird"
                                        ActiveControl.EnableUpdate="false"
                                        AutoTrim="true"
-                               />      <com:TActiveLinkButton ID="AddFieldBtn"
+                               /> &nbsp;<com:TActiveLinkButton ID="AddFieldBtn"
                                                OnCommand="SourceTemplateControl.addField"
                                                CommandParameter="save"
                                                ClientSide.OnComplete="var el = $('#<%=$this->SourceTemplateControl->MultiTextBoxRepeater->ClientID%>_Container').find('input[type=\'text\']'); el[el.length-1].focus();"
-                                       >
-                                       <prop:Text>
-                                               <i class="fa fa-plus" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i>
-                                       </prop:Text>
-                               </com:TActiveLinkButton>
+                                       ><i class="fa fa-plus plus_btn" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i></com:TActiveLinkButton>
                                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->SourceTemplateControl->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                                <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                                <div class="directive_help" style="clear: left; display: none"><%=$this->SourceTemplateControl->doc%></div>
index 3c71d8aebc0380cf73e105c413b27a43e140b993..1c6eee9ff3d330ce44d93b4598fe344b6c7e5cf1 100644 (file)
@@ -9,8 +9,7 @@
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                        AutoTrim="true"
-               />
-                <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <a href="javascript:void(0)" onclick="var el = document.getElementById('<%=$this->Directive->ClientID%>'); el.type = el.type == 'text' ? 'password' : 'text'"><i class="fa fa-eye"></i></a>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
index d7ea83d124729afddb37d3d1419043fac8f0e32e..765316e9d2ab5d5674494fbc134f143b1e5eea5e 100644 (file)
@@ -3,20 +3,20 @@
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
                        OnTextChanged="saveValue"
-                       CssClass="w3-input w3-border w3-third"
+                       CssClass="w3-input w3-border w3-half"
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                />
                <com:TActiveDropDownList
                        ID="SizeFormat"
-                       CssClass="w3-select w3-border w3-quarter"
+                       CssClass="w3-select w3-border w3-half"
                        DataTextField="label"
                        DataValueField="format"
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                        AutoPostBack="false"
                        OnSelectedIndexChanged="saveValue"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fsize = Units.format_size(parseInt('<%=$this->getDefaultValue()%>', 10), 'B'); document.getElementById('<%=$this->Directive->ClientID%>').value = fsize.value; document.getElementById('<%=$this->SizeFormat->ClientID%>').value = fsize.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
index fb3db1c31718f9b21525f56b3a6ac677f79caed9..2b1475cf56186be5df4602107c14f2d065970f14 100644 (file)
@@ -3,20 +3,20 @@
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
                        OnTextChanged="saveValue"
-                       CssClass="w3-input w3-border w3-third"
+                       CssClass="w3-input w3-border w3-half"
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                />
                <com:TActiveDropDownList
                        ID="SpeedFormat"
-                       CssClass="w3-select w3-border w3-quarter"
+                       CssClass="w3-select w3-border w3-half"
                        DataTextField="label"
                        DataValueField="format"
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                        AutoPostBack="false"
                        OnSelectedIndexChanged="saveValue"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fspeed = Units.format_speed(parseInt('<%=$this->getDefaultValue()%>', 10), 'B/s'); document.getElementById('<%=$this->Directive->ClientID%>').value = fspeed.value; document.getElementById('<%=$this->SpeedFormat->ClientID%>').value = fspeed.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
index 25dfcde0bb283ef2094a8b31d3305c53c1fe7c38..5aafcecd98fa14b068459b512b6c1355998f76ee 100644 (file)
@@ -7,7 +7,7 @@
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                        AutoTrim="true"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
                <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
index dab5467dfc4485abf51e3b0951d76a8999fd1dc5..3c950d0f43b957d6bff84f173ee24267b90a31ba 100644 (file)
@@ -20,7 +20,8 @@
                        Visible="<%=($this->display_directive && $this->ShowMinute)%>"
                        ActiveControl.EnableUpdate="false"
                        AutoPostBack="false"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
+               <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Hour->ClientID%>').value = '<%=isset($this->DefaultValue->Hour) ? $this->DefaultValue->Hour : ''%>';document.getElementById('<%=$this->Minute->ClientID%>').value = '<%=isset($this->DefaultValue->Minute) ? $this->DefaultValue->Minute : ''%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Hour->ClientID%>').value = '';document.getElementById('<%=$this->Minute->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TCustomValidator
@@ -34,5 +35,6 @@
                        Enabled="<%=$this->getRequired() && $this->getShow()%>"
                        Visible="<%=$this->ShowMinute%>"
                />
+               <div class="directive_help" style="clear: left; display: none"><%=$this->doc%></div>
        </div>
 </div>
index 6e525cdd140d87935df9f18d90fb31a41ec3009d..102cc947a5a1d51f6a5cebfac9a44cdef1f0f77a 100644 (file)
@@ -3,20 +3,22 @@
        <div class="w3-col w3-threequarter directive_value">
                <com:TActiveTextBox ID="Directive"
                        OnTextChanged="saveValue"
-                       CssClass="w3-input w3-border w3-third"
+                       CssClass="w3-input w3-border w3-half"
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                />
                <com:TActiveDropDownList
                        ID="TimeFormat"
-                       CssClass="w3-select w3-border w3-quarter"
+                       CssClass="w3-select w3-border w3-half"
                        DataTextField="label"
                        DataValueField="format"
                        Visible="<%=$this->display_directive%>"
                        ActiveControl.EnableUpdate="false"
                        AutoPostBack="false"
+                       Style="max-width: 200px"
                        OnSelectedIndexChanged="saveValue"
-               /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+               /> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
+               <i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
                <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var ftime = Units.format_time_period(parseInt('<%=$this->getDefaultValue()%>', 10), 'second'); document.getElementById('<%=$this->Directive->ClientID%>').value = ftime.value; document.getElementById('<%=$this->TimeFormat->ClientID%>').value = ftime.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
                <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
@@ -28,5 +30,6 @@
                        Text="Field required."
                        Enabled="<%=$this->getRequired() && $this->getShow()%>"
                />
+               <div class="directive_help" style="clear: left; display: none"><%=$this->doc%></div>
        </div>
 </div>
index b20d3379da2e6919e08bff850095dbe138119cc6..79df1be7754f02f59635eb828b0e58d85bd9d638 100644 (file)
@@ -41,7 +41,7 @@ class JobRunscriptRenderer extends DirectiveRenderer {
                parent::onInit($param);
                if ($this->ItemIndex % self::DIRECTIVE_COUNT === 0) {
                        $alb = new TActiveLinkButton;
-                       $alb->CssClass = 'w3-button w3-green w3-right';
+                       $alb->CssClass = 'w3-button w3-red w3-right';
                        $alb->OnCommand = 'SourceTemplateControl.removeRunscript';
                        $alb->CommandName = $this->ItemIndex / self::DIRECTIVE_COUNT;
                        $alb->Text = '<i class="fa fa-trash-alt"></i> &nbsp;' . Prado::localize('Remove');
index 2458ff604d91e405d0ebdf1102d51803e8cc0702..adab04b8b5321442892c1c82a7bdb56393a82178 100644 (file)
@@ -4,7 +4,7 @@
                <li><com:TActiveLinkButton
                        ID="IncludeFileItem"
                        OnCommand="Parent.SourceTemplateControl.newIncludeFile"
-                       ClientSide.OnComplete="var el1 = $('#<%=$this->IncludeFileItem->ClientID%>').parents('div').find('div.include_file')[<%=$this->Parent->ItemIndex%>]; var el2 = $(el1).find('div'); BaculaConfig.scroll_to_element(el2[el2.length-1], 0); $(el2[el2.length-1]).find('input')[0].focus();"
+                       ClientSide.OnComplete="var el1 = $('#<%=$this->IncludeFileItem->ClientID%>').parents('div').find('div.include_file')[<%=$this->Parent->ItemIndex%>]; var el2 = $(el1).find('div'); BaculaConfig.scroll_to_element(el2[el2.length-2], 0); $(el2[el2.length-2]).find('input')[0].focus();"
                        Attributes.onclick="$(this).closest('div.config_new_fileset').hide();"
                        >
                        <i class='fa fa-plus'></i> &nbsp;<%[ Add single file/directory ]%>
index 0bc6cc4b40400b4bd59c56310e8b17da208e6328..0f3f9393a5a4b082e9af65d94c4ab9e5ce2a4b7b 100644 (file)
@@ -238,11 +238,22 @@ div.TDatePicker_default {
        z-index: 10 !important;
 }
 
+i.directive_required {
+       line-height: 40px;
+}
+
+i.help_icon {
+        margin-left: 16px !important;
+        cursor: pointer;
+}
 i.reset_btn, i.remove_btn {
        display: none;
        cursor: pointer;
        margin-left: 4px;
 }
+i.plus_btn {
+       margin-right: 2px;
+}
 
 div.directive_value i {
        vertical-align: middle;
@@ -252,6 +263,13 @@ div.directive_value:hover i.reset_btn, div.directive_value:hover i.remove_btn {
        display: inline;
 }
 
+div.directive_field input, div.directive_field select {
+       max-width: 400px;
+}
+div.directive_field input.w3-half, div.directive_field select.w3-half {
+       max-width: 200px;
+}
+
 div.details_card {
        min-height: 200px;
 }
@@ -613,12 +631,6 @@ img.job_weather_icon {
        width: 14px;
 }
 
-i.help_icon {
-        margin-left: 16px !important;
-        margin-right: 16px !important;
-        cursor: pointer;
-}
-
 div.directive_help dt, div.directive_help dd {
        color: #333;
 }