Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

update and cleanup #41

Merged
merged 1 commit into from
Sep 4, 2014
Merged

update and cleanup #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions module/Application/config/module.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,37 +137,37 @@
'route' => 'director',
),
array(
'label' => 'Fileset',
'label' => 'Filesets',
'route' => 'fileset',
),
array(
'label' => 'Pool',
'label' => 'Pools',
'route' => 'pool',
),
array(
'label' => 'Volume',
'label' => 'Volumes',
'route' => 'media',
),
array(
'label' => 'Storage',
'label' => 'Storages',
'route' => 'storage',
),
array(
'label' => 'Client',
'label' => 'Clients',
'route' => 'client',
),
array(
'label' => 'Job',
'label' => 'Jobs',
'route' => 'job',
),
/*
array(
'label' => 'File',
'label' => 'Files',
'route' => 'file',
),
*/
array(
'label' => 'Log',
'label' => 'Logs',
'route' => 'log',
),
/*
Expand Down
2 changes: 1 addition & 1 deletion module/Client/view/client/client/details.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $this->headTitle($title);
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title"><?php echo "Client " . $this->escapeHtml($client->clientid); ?> - <?php echo $this->escapeHtml($client->name); ?></h3>
<h3 class="panel-title">General Information</h3>
</div>

<div class="panel-body">
Expand Down
2 changes: 1 addition & 1 deletion module/Client/view/client/client/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

$title = 'Client';
$title = 'Clients';
$this->headTitle($title);

?>
Expand Down
34 changes: 22 additions & 12 deletions module/Dashboard/view/dashboard/dashboard/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ $this->headTitle($title);
<h3 class="text-muted"><?php echo $this->translate($title); ?></h3>
<hr />

<!-- PANEL START -->
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Jobs during the past 24 hours</h3>
</div>
<div class="panel-body">

<?php

$flash = $this->flashMessenger();
Expand Down Expand Up @@ -63,12 +70,12 @@ $flash->setMessageOpenFormat('
<div class="panel-heading">
<h3 class="panel-title">
<span class="glyphicon glyphicon-list"></span>
<a data-toggle="collapse" href="#collapseRunning"><?php echo $this->translate('Running jobs') ?></a>
<a data-toggle="collapse" href="#collapseRunning"><?php echo count($this->runningJobs) . ' ';?><?php echo $this->translate('Running Job(s)') ?></a>
<span class="caret"></span>
</h3>
</div>

<div class="panel-body panel-collapse collapse in" id="collapseRunning">
<div class="panel-body panel-collapse collapse out" id="collapseRunning">

<table class="table table-striped table-hover" style="font-size: 9pt;">

Expand Down Expand Up @@ -129,7 +136,7 @@ $flash->setMessageOpenFormat('
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<ul>
<li><?php echo $this->translate("Currently, there are no jobs running."); ?></li>
<li><?php echo $this->translate("No running jobs found."); ?></li>
</ul>
</div>
<?php endif; ?>
Expand All @@ -146,12 +153,12 @@ $flash->setMessageOpenFormat('
<div class="panel-heading">
<h3 class="panel-title">
<span class="glyphicon glyphicon-list"></span>
<a data-toggle="collapse" href="#collapseWaiting"><?php echo $this->translate('Waiting jobs') ?></a>
<a data-toggle="collapse" href="#collapseWaiting"><?php echo count($this->waitingJobs) . ' '; ?><?php echo $this->translate('Waiting Job(s)') ?></a>
<span class="caret"></span>
</h3>
</div>

<div class="panel-body panel-collapse collapse in" id="collapseWaiting">
<div class="panel-body panel-collapse collapse out" id="collapseWaiting">

<table class="table table-striped table-hover" style="font-size: 9pt;">

Expand Down Expand Up @@ -208,7 +215,7 @@ $flash->setMessageOpenFormat('
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<ul>
<li><?php echo $this->translate("Currently, there are no jobs waiting."); ?></li>
<li><?php echo $this->translate("No waiting jobs found."); ?></li>
</ul>
</div>
<?php endif; ?>
Expand All @@ -225,7 +232,7 @@ $flash->setMessageOpenFormat('
<div class="panel-heading">
<h3 class="panel-title">
<span class="glyphicon glyphicon-list"></span>
<a data-toggle="collapse" href="#collapseUnsuccessful"><?php echo $this->translate('Unsuccessful jobs (last 24 hours)') ?></a>
<a data-toggle="collapse" href="#collapseUnsuccessful"><?php echo count($this->lastUnsuccessfulJobs) . ' '; ?><?php echo $this->translate('Unsuccessful Job(s)') ?></a>
<span class="caret"></span>
</h3>
</div>
Expand Down Expand Up @@ -294,7 +301,7 @@ $flash->setMessageOpenFormat('
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<ul>
<li><?php echo $this->translate("Congratulation, no unsuccessful jobs during the last 24 hours!"); ?></li>
<li><?php echo $this->translate("No unsuccessful jobs found."); ?></li>
</ul>
</div>

Expand All @@ -313,12 +320,12 @@ $flash->setMessageOpenFormat('
<div class="panel-heading">
<h3 class="panel-title">
<span class="glyphicon glyphicon-list"></span>
<a data-toggle="collapse" href="#collapseSuccessful"><?php echo $this->translate('Successful jobs (last 24 hours)') ?></a>
<a data-toggle="collapse" href="#collapseSuccessful"><?php echo count($this->lastSuccessfulJobs) . ' '; ?><?php echo $this->translate('Successful Job(s)') ?></a>
<span class="caret"></span>
</h3>
</div>

<div class="panel-body panel-collapse collapse in" id="collapseSuccessful">
<div class="panel-body panel-collapse collapse out" id="collapseSuccessful">

<table class="table table-striped table-hover" style="font-size: 9pt;">

Expand Down Expand Up @@ -385,9 +392,12 @@ $flash->setMessageOpenFormat('
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<ul>
<li><?php echo $this->translate("No successful jobs during the last 24 hours!"); ?></li>
<li><?php echo $this->translate("No successful jobs found."); ?></li>
</ul>
</div>

<?php endif; ?>


<!-- PANEL END -->
</div>
</div>
54 changes: 29 additions & 25 deletions module/Fileset/view/fileset/fileset/details.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $this->headTitle($title);
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->escapeHtml($fileset->fileset); ?></h3>
<h3 class="panel-title">General Information</h3>
</div>

<div class="panel-body">
Expand All @@ -62,6 +62,34 @@ $this->headTitle($title);
<div class="col-md-6">
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->translate("Current configuration"); ?></h3>
</div>

<div class="panel-body">

<pre style="font-size: 8pt;">
<code>
<?php
foreach($this->configuration as $row) {
echo $row ."<br />";
}
?>
</code>
</pre>

</div>

</div>

</div>
</div>

<div class="row">

<div class="col-md-6">
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->translate("History"); ?></h3>
</div>
Expand Down Expand Up @@ -93,29 +121,5 @@ $this->headTitle($title);
</div>
</div>

<div class="col-md-6">
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->translate("Current configuration"); ?></h3>
</div>

<div class="panel-body">

<pre style="font-size: 8pt;">
<code>
<?php
foreach($this->configuration as $row) {
echo $row ."<br />";
}
?>
</code>
</pre>

</div>

</div>

</div>
</div>

2 changes: 1 addition & 1 deletion module/Fileset/view/fileset/fileset/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
*/

$title = 'Fileset';
$title = 'Filesets';
$this->headTitle($title);

?>
Expand Down
4 changes: 2 additions & 2 deletions module/Job/view/job/job/details.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $this->headTitle($title);
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title">General</h3>
<h3 class="panel-title">General Information</h3>
</div>

<div class="panel-body">
Expand Down Expand Up @@ -112,7 +112,7 @@ $this->headTitle($title);
<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title">Log messages</h3>
<h3 class="panel-title">Messages</h3>
</div>

<div class="panel-body">
Expand Down
8 changes: 4 additions & 4 deletions module/Job/view/job/job/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*
*/

$title = 'Job overview';
$title = 'Jobs';
$this->headTitle($title);

?>
Expand All @@ -33,11 +33,11 @@ $this->headTitle($title);
<hr />

<ul class="nav nav-tabs">
<li class="active"><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
<li class="active"><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('History'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'unsuccessful')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'successful')); ?>"><?php echo $this->translate('Successful'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'unsuccessful')); ?>"><?php echo $this->translate('Unsuccessful (past 24 hours)'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'successful')); ?>"><?php echo $this->translate('Successful (past 24 hours)'); ?></a></li>
<!-- <li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li> -->
</ul>

Expand Down
10 changes: 5 additions & 5 deletions module/Job/view/job/job/running.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*
*/

$title = 'Running jobs';
$title = 'Jobs';
$this->headTitle($title);

?>
Expand Down Expand Up @@ -52,11 +52,11 @@ $flash->setMessageOpenFormat('
?>

<ul class="nav nav-tabs">
<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('History'); ?></a></li>
<li class="active"><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'unsuccessful')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'successful')); ?>"><?php echo $this->translate('Successful'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'unsuccessful')); ?>"><?php echo $this->translate('Unsuccessful (past 24 hours)'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'successful')); ?>"><?php echo $this->translate('Successful (past 24 hours)'); ?></a></li>
<!-- <li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li> -->
</ul>

Expand Down Expand Up @@ -141,7 +141,7 @@ echo $this->paginationControl(
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<ul>
<li><?php echo $this->translate("Currently, there are no jobs running."); ?></li>
<li><?php echo $this->translate("No running jobs found."); ?></li>
</ul>
</div>
<?php endif; ?>
Expand Down
12 changes: 7 additions & 5 deletions module/Job/view/job/job/successful.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*
*/

$title = 'Successful jobs (last 24h)';
$title = 'Jobs';
$this->headTitle($title);

?>
Expand Down Expand Up @@ -52,11 +52,11 @@ $flash->setMessageOpenFormat('
?>

<ul class="nav nav-tabs">
<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('History'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'unsuccessful')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
<li class="active"><a href="<?php echo $this->url('job', array('action'=>'successful')); ?>"><?php echo $this->translate('Successful'); ?></a></li>
<li><a href="<?php echo $this->url('job', array('action'=>'unsuccessful')); ?>"><?php echo $this->translate('Unsuccessful (past 24 hours)'); ?></a></li>
<li class="active"><a href="<?php echo $this->url('job', array('action'=>'successful')); ?>"><?php echo $this->translate('Successful (past 24 hours)'); ?></a></li>
<!-- <li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li> -->
</ul>

Expand All @@ -82,6 +82,7 @@ $flash->setMessageOpenFormat('
<th><?php echo $this->translate("Start"); ?></th>
<th><?php echo $this->translate("End"); ?></th>
<th><?php echo $this->translate("Duration"); ?></th>
<th><?php echo $this->translate("Bytes"); ?></th>
<th><?php echo $this->translate("Status"); ?></th>
<th><?php echo $this->translate("Action"); ?></th>

Expand All @@ -99,6 +100,7 @@ $flash->setMessageOpenFormat('
<td><?php echo $this->printDate($job->starttime); ?></td>
<td><?php echo $this->printDate($job->endtime); ?></td>
<td><?php echo $this->printJobDuration($job->starttime, $job->endtime); ?></td>
<td><?php echo $this->printBytes($job->jobbytes); ?></td>
<td><?php echo $this->printJobStatus($job->jobstatus); ?></td>
<td>

Expand Down Expand Up @@ -146,7 +148,7 @@ echo $this->paginationControl(
<div class="alert alert-dismissable alert-info">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<ul>
<li><?php echo $this->translate("There were no successful jobs during the last 24 hours!"); ?></li>
<li><?php echo $this->translate("No successful jobs found."); ?></li>
</ul>
</div>

Expand Down