karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of disposed.de:scattport

Browse Source
This commit is contained in:
Eike Foken
2011-09-10 12:42:09 +02:00
parent 72d2ac3f6f 853ec411c3
commit 84a14217bc
15 changed files with 212 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/views/admin/server/detail.php
View File

@@ -17,10 +17,11 @@
<h3>Technical information</h3>
<h4>Hardware &amp; OS</h4>
<p>
CPU: Intel Xeon E5540, 2533 MHz<br />
Uptime: 254 Tage, 13 Stunden<br />
OS: Debian/GNU 5.0r1<br />
Workload: 2.01, 1.05, 0.85
CPU: <?=$server->hardware;?><br />
Uptime: <?=$server->uptimestring;?><br />
OS: <?=$server->os;?><br />
Workload: <?=sprintf('%.02f', $server->workload);?><br />
Last heartbeat: <?=$server->lastheartbeat;?>
</p>
<h4>ScattPort-Statistics</h4>

2
application/views/admin/server/list.php
View File

@@ -21,7 +21,7 @@
<?
foreach ($servers as $server):
if ($server['available']) {
if ($server['workload'] > 2) {
if ($server['workload'] > 0.8) {
$server['class'] = "pending";
$server['status'] = 'busy';
} else {

79
application/views/dashboard.php
View File

@@ -1,30 +1,63 @@
<?php $this->load->view('header');?>
<div id="content">
<div class="title">
<h2><?=_('Dashboard');?></h2>
<div id="dashboard">
<div class="title">
<h2><?=_('Dashboard');?></h2>
</div>
<div class="box">
<h3><?=_('Quick actions');?></h3>
<p>
<?
if(count($action_buttons) > 0):
$i = 1;
foreach ($action_buttons as $button):
if($i == 1 && (count($action_buttons) == 1))
$button['class'] = '';
elseif($i == count($action_buttons))
$button['class'] = 'right';
elseif($i == 1)
$button['class'] = 'left';
else
$button['class'] = 'middle';
?><a class="button <?=$button['class'];?> big" href="<?=$button['target'];?>"><strong><?=image_asset($button['icon']);?></strong><br /><?=$button['text'];?></a><?
$i++;
endforeach;
endif;
?>
</p>
</div>
<div class="box">
<h3><?=_('Recent events');?></h3>
<p>
<?
if(count($recent_buttons) > 0):
$i = 1;
foreach ($recent_buttons as $button):
if($i == 1 && (count($recent_buttons) == 1))
$button['class'] = '';
elseif($i == count($recent_buttons))
$button['class'] = 'right';
elseif($i == 1)
$button['class'] = 'left';
else
$button['class'] = 'middle';
?><a class="button <?=$button['class'];?> big" href="<?=$button['target'];?>" title="<?=$button['title'];?>"><strong><?=$button['count'];?></strong><br /><?=$button['text'];?></a><?
$i++;
endforeach;
endif;
?>
</p>
</div>
<div class="box">
<h3><?=_('Administration');?></h3>
<p>
<a class="button left big" href="#"><?=_('Manage servers');?></a><a class="button middle big" href="<?=site_url('admin/programs');?>"><?=_('Manage programs');?></a><a class="button right big" href="<?=site_url('admin/users');?>"><?=_('Manage users');?></a>
</p>
</div>
</div>
<div class="box">
<h3><?=_('Projects');?></h3>
<p>
<a class="button left big" href="projects/create"><?=_('Create a project');?></a><a class="button middle big" href="projects"><?=_('Show projects');?></a><a class="button right big" href="#"><?=_('Search projects');?></a>
</p>
</div>
<div class="box">
<h3><?=_('Experiments');?></h3>
<p>
<a class="button left big" href="#"><?=_('Newest results');?></a><a class="button middle big" href="#"><?=_('Running jobs');?></a>
</p>
</div>
<div class="box">
<h3><?=_('Administration');?></h3>
<p>
<a class="button left big" href="#"><?=_('Manage servers');?></a><a class="button middle big" href="<?=site_url('admin/programs');?>"><?=_('Manage programs');?></a><a class="button right big" href="<?=site_url('admin/users');?>"><?=_('Manage users');?></a>
</p>
</div>
</div>
<?php $this->load->view('footer');?>

12
application/views/header.php
View File

@@ -175,16 +175,4 @@
</form>
</div>
<div class="title">
<h2><?=_('Recent events');?></h2>
</div>
<div class="box">
<ul id="blog">
<li><h4><a href="#" title="<?=_('Calculation done');?>"><?=_('Calculation done');?></a> <abbr title="22.07.2011">22.07.2011</abbr></h4><p><?=sprintf(_('Calculation successfully finished for project &quot;%s&quot;'), 'Gerstenkorn');?></i></p></li>
<li><h4><a href="#" title="<?=_('Calculation done');?>"><?=_('Calculation done');?></a> <abbr title="22.07.2011">22.07.2011</abbr></h4><p><?=sprintf(_('Calculation successfully finished for project &quot;%s&quot;'), 'Gerstenkorn');?></i></p></li>
<li><h4><a href="#" title="<?=_('Calculation done');?>"><?=_('Calculation done');?></a> <abbr title="22.07.2011">22.07.2011</abbr></h4><p><?=sprintf(_('Calculation successfully finished for project &quot;%s&quot;'), 'Gerstenkorn');?></i></p></li>
</ul>
</div>
</div>

16
application/views/projects/detail.php
View File

@@ -88,8 +88,7 @@
<thead>
<tr>
<th scope="col"><?=_('Experiment');?></th>
<th scope="col"><?=_('Started');?></th>
<th scope="col"><?=_('Finished');?></th>
<th scope="col"><?=_('Status');?></th>
<th scope="col"><?=_('Actions');?></th>
</tr>
</thead>
@@ -97,11 +96,20 @@
<?php
if (count($jobs) > 0):
foreach ($jobs as $job):
if($job['status'] == 'pending') {
$job['humanstatus'] = _('Pending');
$job['cssclass'] = 'closed';
} elseif($job['status'] == 'running') {
$job['humanstatus'] = _('Simulation running');
$job['cssclass'] = 'pending';
} elseif($job['status'] == 'complete') {
$job['humanstatus'] = _('Simulation complete');
$job['cssclass'] = 'active';
}
?>
<tr>
<td><?=$job['name'];?></td>
<td><?=$job['started_at'];?></td>
<td><?=$job['finished_at'] != '0000-00-00 00:00:00' ? $job['finished_at'] : _('Currently running');?></td>
<td><span class="<?=$job['cssclass'];?>"><?=$job['humanstatus'];?></span></td>
<td>
<a href="<?=site_url('experiments/results/' . $job['id']);?>" title="<?= sprintf(_('Show results for this experiment'), $job['name']);?>"><?=_('Show results');?></a> |
<a href="<?=site_url('experiments/edit/' . $job['id']);?>" title="<?= sprintf(_('Edit this experiment'), $job['name']);?>"><?=_('Edit');?></td>