From b22089404b22dadb8c4bbe8e3fffc4b60a632fb3 Mon Sep 17 00:00:00 2001 From: Marcin Haba Date: Tue, 9 Dec 2014 22:21:24 +0100 Subject: [PATCH] baculum: Enable support for Verify jobs --- gui/baculum/protected/Class/Miscellaneous.php | 82 +++++++++++++++++- gui/baculum/protected/Lang/en/messages.mo | Bin 26274 -> 26660 bytes gui/baculum/protected/Lang/en/messages.po | 17 ++++ gui/baculum/protected/Lang/pl/messages.mo | Bin 28330 -> 28755 bytes gui/baculum/protected/Lang/pl/messages.po | 24 ++++- gui/baculum/protected/Pages/API/JobRun.php | 7 +- .../protected/Portlets/JobConfiguration.php | 63 +++++++++++++- .../protected/Portlets/JobConfiguration.tpl | 74 ++++++++++++++-- gui/baculum/protected/Portlets/JobList.php | 54 ++---------- gui/baculum/protected/Portlets/JobList.tpl | 6 +- .../Portlets/JobRunConfiguration.php | 57 ++++++++++++ .../Portlets/JobRunConfiguration.tpl | 74 ++++++++++++++-- gui/baculum/themes/Baculum-v1/style.css | 4 +- 13 files changed, 390 insertions(+), 72 deletions(-) diff --git a/gui/baculum/protected/Class/Miscellaneous.php b/gui/baculum/protected/Class/Miscellaneous.php index b167b94b42..ad0b61021e 100644 --- a/gui/baculum/protected/Class/Miscellaneous.php +++ b/gui/baculum/protected/Class/Miscellaneous.php @@ -4,7 +4,59 @@ class Miscellaneous extends TModule { const LICENCE_FILE = 'LICENSE'; - private $jobLevels = array('F' => 'Full', 'I' => 'Incremental', 'D'=> 'Differential', 'B' => 'Base', 'f' => 'VirtualFull'); + private $jobTypes = array( + 'B' => 'Backup', + 'M' => 'Migrated', + 'V' => 'Verify', + 'R' => 'Restore', + 'I' => 'Internal', + 'D' => 'Admin', + 'A' => 'Archive', + 'C' => 'Copy', + 'g' => 'Migration' + ); + + private $jobLevels = array( + 'F' => 'Full', + 'I' => 'Incremental', + 'D' => 'Differential', + 'B' => 'Base', + 'f' => 'VirtualFull', + 'V' => 'InitCatalog', + 'C' => 'Catalog', + 'O' => 'VolumeToCatalog', + 'd' => 'DiskToCatalog' + ); + + private $jobStates = array( + 'C' => array('value' => 'Created', 'description' =>'Created but not yet running'), + 'R' => array('value' => 'Running', 'description' => 'Running'), + 'B' => array('value' => 'Blocked', 'description' => 'Blocked'), + 'T' => array('value' => 'Terminated', 'description' =>'Terminated normally'), + 'W' => array('value' => 'Terminated with warnings', 'description' =>'Terminated normally with warnings'), + 'E' => array('value' => 'Error', 'description' =>'Terminated in Error'), + 'e' => array('value' => 'Non-fatal error', 'description' =>'Non-fatal error'), + 'f' => array('value' => 'Fatal error', 'description' =>'Fatal error'), + 'D' => array('value' => 'Verify Diff.', 'description' =>'Verify Differences'), + 'A' => array('value' => 'Canceled by user', 'description' =>'Canceled by the user'), + 'I' => array('value' => 'Incomplete', 'description' =>'Incomplete Job'), + 'F' => array('value' => 'Waiting on FD', 'description' =>'Waiting on the File daemon'), + 'S' => array('value' => 'Waiting on SD', 'description' =>'Waiting on the Storage daemon'), + 'm' => array('value' => 'Waiting for new vol.', 'description' =>'Waiting for a new Volume to be mounted'), + 'M' => array('value' => 'Waiting for mount', 'description' =>'Waiting for a Mount'), + 's' => array('value' => 'Waiting for storage', 'description' =>'Waiting for Storage resource'), + 'j' => array('value' => 'Waiting for job', 'description' =>'Waiting for Job resource'), + 'c' => array('value' => 'Waiting for client', 'description' =>'Waiting for Client resource'), + 'd' => array('value' => 'Waiting for Max. jobs', 'description' =>'Wating for Maximum jobs'), + 't' => array('value' => 'Waiting for start', 'description' =>'Waiting for Start Time'), + 'p' => array('value' => 'Waiting for higher priority', 'description' =>'Waiting for higher priority job to finish'), + 'i' => array('value' => 'Batch insert', 'description' =>'Doing batch insert file records'), + 'a' => array('value' => 'Despooling attributes', 'description' =>'SD despooling attributes'), + 'l' => array('value' => 'Data despooling', 'description' =>'Doing data despooling'), + 'L' => array('value' => 'Commiting data', 'description' =>'Committing data (last despool)') + ); + + private $runningJobStates = array('C', 'R'); /** * Getting the licence from file. @@ -20,6 +72,32 @@ class Miscellaneous extends TModule { return $this->jobLevels; } + public function getJobState($jobStateLetter = null) { + $state; + if(is_null($jobStateLetter)) { + $state = $this->jobStates; + } else { + $state = array_key_exists($jobStateLetter, $this->jobStates) ? $this->jobStates[$jobStateLetter] : null; + } + return $state; + } + + public function getRunningJobStates() { + return $this->runningJobStates; + } + + + public function getJobType($jobTypeLetter = null) { + $type; + if(is_null($jobTypeLetter)) { + $type = $this->jobTypes; + } else { + $type = array_key_exists($jobTypeLetter, $this->jobTypes) ? $this->jobTypes[$jobTypeLetter] : null; + } + return $type; + + } + public function isValidJobLevel($jobLevel) { return array_key_exists($jobLevel, $this->getJobLevels()); } @@ -140,4 +218,4 @@ class Miscellaneous extends TModule { return $elements; } } -?> \ No newline at end of file +?> diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo index 0a2bde78893a042367266cc5eaa7d303cc31d224..5b75739980b5aaad03e2be27292fb2e34ecab2d3 100755 GIT binary patch delta 7429 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 diff --git a/gui/baculum/protected/Lang/en/messages.po b/gui/baculum/protected/Lang/en/messages.po index dbb62f7e26..a2457c4895 100755 --- a/gui/baculum/protected/Lang/en/messages.po +++ b/gui/baculum/protected/Lang/en/messages.po @@ -986,3 +986,20 @@ msgstr "Vol. Use Duration (in sec.):" msgid "Yes" msgstr "Yes" +msgid "JobId to Verify:" +msgstr "JobId to Verify:" + +msgid "JobId to Verify value must be integer greather than 0." +msgstr "JobId to Verify value must be integer greather than 0." + +msgid "Job to Verify:" +msgstr "Job to Verify:" + +msgid "Verify by Job Name" +msgstr "Verify by Job Name" + +msgid "Verify by JobId" +msgstr "Verify by JobId" + +msgid "Verify option:" +msgstr "Verify option:" diff --git a/gui/baculum/protected/Lang/pl/messages.mo b/gui/baculum/protected/Lang/pl/messages.mo index a1da8d1dc274395139f4c787cb8dec29f47175fc..f05d48bc1e07b6ed7189fb3aa96334fabe209bcf 100755 GIT binary patch delta 7526 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 delta 7139 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 : null; $pool = $this->getModule('pool')->getPoolById($poolid); $priority = property_exists($params, 'priority') ? intval($params->priority) : 10; // default priority is set to 10 + $jobid = property_exists($params, 'jobid') ? 'jobid="' . intval($params->jobid) . '"' : ''; + // @TODO: Move Job name pattern in more appropriate place + $verifyjob = property_exists($params, 'verifyjob') && preg_match('/^[\w\d\.\-\s]+$/', $params->verifyjob) === 1 ? 'verifyjob="' . ($params->verifyjob) . '"' : ''; if(!is_null($job)) { $isValidLevel = $this->getModule('misc')->isValidJobLevel($params->level); @@ -42,7 +45,7 @@ class JobRun extends BaculumAPI { if(!is_null($storage)) { if(!is_null($pool)) { $joblevels = $this->getModule('misc')->getJobLevels(); - $run = $this->getModule('bconsole')->bconsoleCommand($this->director, array('run', 'job="' . $job . '"', 'level="' . $joblevels[$level] . '"', 'fileset="' . $fileset . '"', 'client="' . $client->name . '"', 'storage="' . $storage->name . '"', 'pool="' . $pool->name . '"' , 'priority="' . $priority . '"', 'yes'), $this->user); + $run = $this->getModule('bconsole')->bconsoleCommand($this->director, array('run', 'job="' . $job . '"', 'level="' . $joblevels[$level] . '"', 'fileset="' . $fileset . '"', 'client="' . $client->name . '"', 'storage="' . $storage->name . '"', 'pool="' . $pool->name . '"' , 'priority="' . $priority . '"', $jobid , $verifyjob, 'yes'), $this->user); $this->output = $run->output; $this->error = (integer)$run->exitcode; } else { @@ -72,4 +75,4 @@ class JobRun extends BaculumAPI { } } -?> \ No newline at end of file +?> diff --git a/gui/baculum/protected/Portlets/JobConfiguration.php b/gui/baculum/protected/Portlets/JobConfiguration.php index e08869d227..f0b19fbb9a 100644 --- a/gui/baculum/protected/Portlets/JobConfiguration.php +++ b/gui/baculum/protected/Portlets/JobConfiguration.php @@ -17,13 +17,17 @@ * Bacula® is a registered trademark of Kern Sibbald. */ +Prado::using('System.Web.UI.ActiveControls.TActivePanel'); Prado::using('Application.Portlets.Portlets'); class JobConfiguration extends Portlets { const DEFAULT_JOB_PRIORITY = 10; - private $runningJobStates = array('C', 'R'); + + public $jobToVerify = array('C', 'O', 'd'); + + public $verifyOptions = array('jobname' => 'Verify by Job Name', 'jobid' => 'Verify by JobId'); public function configure($jobId) { $jobdata = $this->Application->getModule('api')->get(array('jobs', $jobId))->output; @@ -36,6 +40,32 @@ class JobConfiguration extends Portlets { $this->Level->SelectedValue = $jobdata->level; $this->Level->dataBind(); + $isVerifyOption = in_array($jobdata->level, $this->jobToVerify); + $this->JobToVerifyOptionsLine->Display = ($isVerifyOption === true) ? 'Dynamic' : 'None'; + $this->JobToVerifyJobNameLine->Display = ($isVerifyOption === true) ? 'Dynamic' : 'None'; + $this->JobToVerifyJobIdLine->Display = 'None'; + $this->AccurateLine->Display = ($isVerifyOption === true) ? 'None' : 'Dynamic'; + $this->EstimateLine->Display = ($isVerifyOption === true) ? 'None' : 'Dynamic'; + + $verifyValues = array(); + + foreach($this->verifyOptions as $value => $text) { + $verifyValues[$value] = Prado::localize($text); + } + + $this->JobToVerifyOptions->dataSource = $verifyValues; + $this->JobToVerifyOptions->dataBind(); + + $jobTasks = $this->Application->getModule('api')->get(array('jobs', 'tasks'))->output; + + $jobsAllDirs = array(); + foreach($jobTasks as $director => $tasks) { + $jobsAllDirs = array_merge($jobsAllDirs, $tasks); + } + + $this->JobToVerifyJobName->dataSource = array_combine($jobsAllDirs, $jobsAllDirs); + $this->JobToVerifyJobName->dataBind(); + $clients = $this->Application->getModule('api')->get(array('clients'))->output; $clientsList = array(); foreach($clients as $client) { @@ -74,9 +104,11 @@ class JobConfiguration extends Portlets { $this->Storage->dataSource = $storagesList; $this->Storage->dataBind(); + $runningJobStates = $this->Application->getModule('misc')->getRunningJobStates(); + $this->Priority->Text = ($jobdata->priorjobid == 0) ? self::DEFAULT_JOB_PRIORITY : $jobdata->priorjobid; $this->DeleteButton->Visible = true; - $this->CancelButton->Visible = in_array($jobdata->jobstatus, $this->runningJobStates); + $this->CancelButton->Visible = in_array($jobdata->jobstatus, $runningJobStates); } public function status($sender, $param) { @@ -106,6 +138,16 @@ class JobConfiguration extends Portlets { $params['storageid'] = $this->Storage->SelectedValue; $params['poolid'] = $this->Pool->SelectedValue; $params['priority'] = $this->Priority->Text; + + if (in_array($this->Level->SelectedItem->Value, $this->jobToVerify)) { + $verifyVals = $this->getVerifyVals(); + if ($this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobname']) { + $params['verifyjob'] = $this->JobToVerifyJobName->SelectedValue; + } elseif ($this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobid']) { + $params['jobid'] = $this->JobToVerifyJobId->Text; + } + } + $result = $this->Application->getModule('api')->create(array('jobs', 'run'), $params)->output; $this->Estimation->Text = implode(PHP_EOL, $result); } @@ -125,5 +167,22 @@ class JobConfiguration extends Portlets { $isValid = preg_match('/^[0-9]+$/',$this->Priority->Text) === 1 && $this->Priority->Text > 0; $param->setIsValid($isValid); } + + public function jobIdToVerifyValidator($sender, $param) { + $verifyVals = $this->getVerifyVals(); + if(in_array($this->Level->SelectedValue, $this->jobToVerify) && $this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobid']) { + $isValid = preg_match('/^[0-9]+$/',$this->JobToVerifyJobId->Text) === 1 && $this->JobToVerifyJobId->Text > 0; + } else { + $isValid = true; + } + $param->setIsValid($isValid); + return $isValid; + } + + private function getVerifyVals() { + $verifyOpt = array_keys($this->verifyOptions); + $verifyVals = array_combine($verifyOpt, $verifyOpt); + return $verifyVals; + } } ?> diff --git a/gui/baculum/protected/Portlets/JobConfiguration.tpl b/gui/baculum/protected/Portlets/JobConfiguration.tpl index 298d5fe4ac..1052462f13 100644 --- a/gui/baculum/protected/Portlets/JobConfiguration.tpl +++ b/gui/baculum/protected/Portlets/JobConfiguration.tpl @@ -13,9 +13,73 @@
- + + + var job_to_verify = $('<%=$this->JobToVerifyOptionsLine->ClientID%>'); + var verify_options = $('<%=$this->JobToVerifyOptionsLine->ClientID%>'); + var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>'); + var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>'); + var accurate = $('<%=$this->AccurateLine->ClientID%>'); + var estimate = $('<%=$this->EstimateLine->ClientID%>'); + var verify_current_opt = $('<%=$this->JobToVerifyOptions->ClientID%>').value; + if(/^(<%=implode('|', $this->jobToVerify)%>)$/.test(this.value)) { + accurate.hide(); + estimate.hide(); + verify_options.show(); + job_to_verify.show(); + if (verify_current_opt == 'jobid') { + verify_by_job_name.hide(); + verify_by_jobid.show(); + } else if (verify_current_opt == 'jobname') { + verify_by_job_name.show(); + verify_by_jobid.hide(); + } + } else if (job_to_verify.visible()) { + job_to_verify.hide(); + verify_options.hide(); + verify_by_job_name.hide(); + verify_by_jobid.hide(); + accurate.show(); + estimate.show(); + } + +
+ +
+
+ + + var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>'); + var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>'); + if (this.value == 'jobname') { + verify_by_jobid.hide(); + verify_by_job_name.show(); + } else if (this.value == 'jobid') { + verify_by_job_name.hide(); + verify_by_jobid.show(); + } else { + verify_by_job_name.hide(); + verify_by_jobid.hide(); + } + + +
+ + +
+
+ +
+ + +
+
+ + +
+
@@ -68,12 +132,12 @@
-
+
-
-
+ + -
+ diff --git a/gui/baculum/protected/Portlets/JobList.php b/gui/baculum/protected/Portlets/JobList.php index 1748575f0a..12cd790a5b 100644 --- a/gui/baculum/protected/Portlets/JobList.php +++ b/gui/baculum/protected/Portlets/JobList.php @@ -31,18 +31,8 @@ class JobList extends Portlets implements ISlideWindow { public $buttonID; public $windowTitle; public $jobLevels; - private $jobStates; - private $jobTypes = array( - 'B' => 'Backup', - 'M' => 'Migrated', - 'V' => 'Verify', - 'R' => 'Restore', - 'I' => 'Internal', - 'D' => 'Admin', - 'A' => 'Archive', - 'C' => 'Copy', - 'g' => 'Migration' - ); + public $jobStates; + public $jobTypes; public function setID($id) { $this->ID = $id; @@ -71,42 +61,10 @@ class JobList extends Portlets implements ISlideWindow { public function onLoad($param) { parent::onLoad($param); $this->prepareData(); - $this->jobLevels = $this->Application->getModule('misc')->getJobLevels(); - } - - public function getJobType($jobLetter) { - return array_key_exists($jobLetter, $this->jobTypes) ? $this->jobTypes[$jobLetter] : null; - } - - public function getJobState($jobStateLetter) { - $jobstates = array( - 'C' => (object)array('value' => 'Created', 'description' =>'Created but not yet running'), - 'R' => (object)array('value' => 'Running', 'description' => 'Running'), - 'B' => (object)array('value' => 'Blocked', 'description' => 'Blocked'), - 'T' => (object)array('value' => 'Terminated', 'description' =>'Terminated normally'), - 'W' => (object)array('value' => 'Terminated with warnings', 'description' =>'Terminated normally with warnings'), - 'E' => (object)array('value' => 'Error', 'description' =>'Terminated in Error'), - 'e' => (object)array('value' => 'Non-fatal error', 'description' =>'Non-fatal error'), - 'f' => (object)array('value' => 'Fatal error', 'description' =>'Fatal error'), - 'D' => (object)array('value' => 'Verify', 'description' =>'Verify Differences'), - 'A' => (object)array('value' => 'Canceled by user', 'description' =>'Canceled by the user'), - 'I' => (object)array('value' => 'Incomplete', 'description' =>'Incomplete Job'), - 'F' => (object)array('value' => 'Waiting on FD', 'description' =>'Waiting on the File daemon'), - 'S' => (object)array('value' => 'Waiting on SD', 'description' =>'Waiting on the Storage daemon'), - 'm' => (object)array('value' => 'Waiting for new vol.', 'description' =>'Waiting for a new Volume to be mounted'), - 'M' => (object)array('value' => 'Waiting for mount', 'description' =>'Waiting for a Mount'), - 's' => (object)array('value' => 'Waiting for storage', 'description' =>'Waiting for Storage resource'), - 'j' => (object)array('value' => 'Waiting for job', 'description' =>'Waiting for Job resource'), - 'c' => (object)array('value' => 'Waiting for client', 'description' =>'Waiting for Client resource'), - 'd' => (object)array('value' => 'Waiting for Max. jobs', 'description' =>'Wating for Maximum jobs'), - 't' => (object)array('value' => 'Waiting for start', 'description' =>'Waiting for Start Time'), - 'p' => (object)array('value' => 'Waiting for higher priority', 'description' =>'Waiting for higher priority job to finish'), - 'i' => (object)array('value' => 'Batch insert', 'description' =>'Doing batch insert file records'), - 'a' => (object)array('value' => 'Despooling attributes', 'description' =>'SD despooling attributes'), - 'l' => (object)array('value' => 'Data despooling', 'description' =>'Doing data despooling'), - 'L' => (object)array('value' => 'Commiting data', 'description' =>'Committing data (last despool)') - ); - return array_key_exists($jobStateLetter, $jobstates) ? $jobstates[$jobStateLetter] : null; + $misc = $this->Application->getModule('misc'); + $this->jobLevels = $misc->getJobLevels(); + $this->jobStates = $misc->getJobState(); + $this->jobTypes = $misc->getJobType(); } public function prepareData($forceReload = false) { diff --git a/gui/baculum/protected/Portlets/JobList.tpl b/gui/baculum/protected/Portlets/JobList.tpl index 5b8d800f18..cdde59509b 100644 --- a/gui/baculum/protected/Portlets/JobList.tpl +++ b/gui/baculum/protected/Portlets/JobList.tpl @@ -38,19 +38,19 @@ - + T - + L -
<%=isset($this->getPage()->JobWindow->getJobState($this->getParent()->Data['jobstatus'])->value) ? $this->getPage()->JobWindow->getJobState($this->getParent()->Data['jobstatus'])->value : ''%>
+
<%=isset($this->getPage()->JobWindow->jobStates[$this->getParent()->Data['jobstatus']]['value']) ? $this->getPage()->JobWindow->jobStates[$this->getParent()->Data['jobstatus']]['value'] : ''%>
 'Verify by Job Name', 'jobid' => 'Verify by JobId'); + public function configure($jobname) { $this->JobName->Text = $jobname; $this->Estimation->Text = ''; @@ -30,6 +35,31 @@ class JobRunConfiguration extends Portlets { $this->Level->dataSource = $this->Application->getModule('misc')->getJobLevels(); $this->Level->dataBind(); + $this->JobToVerifyOptionsLine->Display = 'None'; + $this->JobToVerifyJobNameLine->Display = 'None'; + $this->JobToVerifyJobIdLine->Display = 'None'; + $this->AccurateLine->Display = 'Dynamic'; + $this->EstimateLine->Display = 'Dynamic'; + + $verifyValues = array(); + + foreach($this->verifyOptions as $value => $text) { + $verifyValues[$value] = Prado::localize($text); + } + + $this->JobToVerifyOptions->dataSource = $verifyValues; + $this->JobToVerifyOptions->dataBind(); + + $jobTasks = $this->Application->getModule('api')->get(array('jobs', 'tasks'))->output; + + $jobsAllDirs = array(); + foreach($jobTasks as $director => $tasks) { + $jobsAllDirs = array_merge($jobsAllDirs, $tasks); + } + + $this->JobToVerifyJobName->dataSource = array_combine($jobsAllDirs, $jobsAllDirs); + $this->JobToVerifyJobName->dataBind(); + $clients = $this->Application->getModule('api')->get(array('clients'))->output; $clientsList = array(); foreach($clients as $client) { @@ -77,6 +107,16 @@ class JobRunConfiguration extends Portlets { $params['storageid'] = $this->Storage->SelectedValue; $params['poolid'] = $this->Pool->SelectedValue; $params['priority'] = $this->Priority->Text; + + if (in_array($this->Level->SelectedItem->Value, $this->jobToVerify)) { + $verifyVals = $this->getVerifyVals(); + if ($this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobname']) { + $params['verifyjob'] = $this->JobToVerifyJobName->SelectedValue; + } elseif ($this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobid']) { + $params['jobid'] = $this->JobToVerifyJobId->Text; + } + } + $result = $this->Application->getModule('api')->create(array('jobs', 'run'), $params)->output; $this->Estimation->Text = implode(PHP_EOL, $result); } @@ -96,5 +136,22 @@ class JobRunConfiguration extends Portlets { $isValid = preg_match('/^[0-9]+$/', $this->Priority->Text) === 1 && $this->Priority->Text > 0; $param->setIsValid($isValid); } + + public function jobIdToVerifyValidator($sender, $param) { + $verifyVals = $this->getVerifyVals(); + if(in_array($this->Level->SelectedValue, $this->jobToVerify) && $this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobid']) { + $isValid = preg_match('/^[0-9]+$/',$this->JobToVerifyJobId->Text) === 1 && $this->JobToVerifyJobId->Text > 0; + } else { + $isValid = true; + } + $param->setIsValid($isValid); + return $isValid; + } + + private function getVerifyVals() { + $verifyOpt = array_keys($this->verifyOptions); + $verifyVals = array_combine($verifyOpt, $verifyOpt); + return $verifyVals; + } } ?> diff --git a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl index d83f29a540..e0500c994d 100644 --- a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl +++ b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl @@ -13,9 +13,73 @@
- + + + var job_to_verify = $('<%=$this->JobToVerifyOptionsLine->ClientID%>'); + var verify_options = $('<%=$this->JobToVerifyOptionsLine->ClientID%>'); + var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>'); + var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>'); + var accurate = $('<%=$this->AccurateLine->ClientID%>'); + var estimate = $('<%=$this->EstimateLine->ClientID%>'); + var verify_current_opt = $('<%=$this->JobToVerifyOptions->ClientID%>').value; + if(/^(<%=implode('|', $this->jobToVerify)%>)$/.test(this.value)) { + accurate.hide(); + estimate.hide(); + verify_options.show(); + job_to_verify.show(); + if (verify_current_opt == 'jobid') { + verify_by_job_name.hide(); + verify_by_jobid.show(); + } else if (verify_current_opt == 'jobname') { + verify_by_job_name.show(); + verify_by_jobid.hide(); + } + } else if (job_to_verify.visible()) { + job_to_verify.hide(); + verify_options.hide(); + verify_by_job_name.hide(); + verify_by_jobid.hide(); + accurate.show(); + estimate.show(); + } + +
+ +
+
+ + + var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>'); + var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>'); + if (this.value == 'jobname') { + verify_by_jobid.hide(); + verify_by_job_name.show(); + } else if (this.value == 'jobid') { + verify_by_job_name.hide(); + verify_by_jobid.show(); + } else { + verify_by_job_name.hide(); + verify_by_jobid.hide(); + } + + +
+ + +
+
+ +
+ + +
+
+ + +
+
@@ -64,12 +128,12 @@
-
+
-
-
+ + -
+ diff --git a/gui/baculum/themes/Baculum-v1/style.css b/gui/baculum/themes/Baculum-v1/style.css index ee37ff7425..181a3b7389 100644 --- a/gui/baculum/themes/Baculum-v1/style.css +++ b/gui/baculum/themes/Baculum-v1/style.css @@ -424,7 +424,7 @@ tr.slide-window-element:hover td, tr.slide-window-element-alternating:hover td{ table.window-section-detail, table.file-browser-detail { background-color: rgba(0,0,0,0.5); width: 100%; - font-size: 11px; + font-size: 10px; font-weight: normal; } @@ -675,7 +675,7 @@ div.job-status-W { } div.job-status-D { - background-color: blue; + background-color: #CB4A2C; } /* -- 2.39.5