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 
Conflicts:
	application/views/dashboard.php
	application/views/header.php
This commit is contained in:
Eike Foken
2011-08-11 05:12:31 +02:00
parent d014a630c8 2899ed81e5
commit 1d76db035d
13 changed files with 107 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/views/dashboard.php
View File

@@ -9,7 +9,7 @@
<div class="box">
<h3><?=_('Projects');?></h3>
<p>
<a class="button left big" href="projects/create"><?=_('Create project');?></a><a class="button middle big" href="projects"><?=_('Manage projects');?></a><a class="button right big" href="#"><?=_('Search projects');?></a>
<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">
@@ -21,7 +21,7 @@
<div class="box">
<h3><?=_('Administration');?></h3>
<p>
<a class="button left big" href="#"><?=_('Manage servers');?></a><a class="button middle big" href="#"><?=_('Manage programs');?></a><a class="button right big" href="<?=site_url('users');?>"><?=_('Manage users');?></a>
<a class="button left big" href="#"><?=_('Manage servers');?></a><a class="button middle big" href="#"><?=_('Manage applications');?></a><a class="button right big" href="<?=site_url('users');?>"><?=_('Manage users');?></a>
</p>
</div>

10
application/views/footer.php
View File

@@ -2,11 +2,11 @@
<?
if($this->session->userdata('group') == 'admins'):
?>
<span class="left"><strong>Administration - </strong>
<a href="<?=site_url('admin/settings')?>">Globale Einstellungen</a> |
<a href="<?=site_url('admin/servers')?>">Berechnungsserver verwalten</a> |
<a href="<?=site_url('admin/users')?>">Benutzer verwalten</a> |
<a href="<?=site_url('admin/programs')?>">Programme verwalten</a>
<span class="left"><strong><?=_('Administration')?> - </strong>
<a href="<?=site_url('admin/settings')?>"><?=_('Global settings')?></a> |
<a href="<?=site_url('admin/servers')?>"><?=_('Manage calculation servers')?></a> |
<a href="<?=site_url('admin/users')?>"><?=_('Manage users')?></a> |
<a href="<?=site_url('admin/programs')?>"><?=_('Manage applications')?></a>
</span>
<?
endif;

34
application/views/header.php
View File

@@ -27,7 +27,7 @@
<option value="<?=site_url('projects');?>">Projekte verwalten</option>
</select>
</div>
<div class="menu"><?=_('Hello');?> <a href="<?=site_url('');?>"><?=$this->user->profile()->firstname;?> <?=$this->user->profile()->lastname;?></a>! | <?=lang_select('assets/images');?> | <?=anchor('', _('Help'));?> | <?=anchor('settings', _('Settings'));?> | <?=anchor('auth/logout', _('Logout'));?></div>
<div class="menu"><?= _('Hello,') ?> <a href="<?=site_url('');?>"><?=$this->user->profile()->firstname;?> <?=$this->user->profile()->lastname;?></a>! | <?=lang_select('assets/images');?> | <a href="#"><?=_('Help')?></a> | <?=anchor('settings', _('Settings'));?> | <?=anchor('auth/logout', _('Logout'));?></div>
</div>
<div id="wrapper">
@@ -36,7 +36,7 @@
<div id="sidebar">
<div class="title">
<h2>Aktionen</h2>
<h2><?=_('Actions')?></h2>
</div>
<div class="navigation">
<ul>
@@ -44,30 +44,30 @@
if($this->session->userdata('active_project')):
$active_project = $this->project->getById($this->session->userdata('active_project'));
?>
<li>Projekt <?=$active_project['name']?>
<li><?=_('Project')?> <?=$active_project['name']?>
<ul>
<li><a href="<?=site_url('projects/detail'.$active_project['id'])?>" title="Projektübersicht öffnen">Übersicht</a></li>
<li><a href="<?=site_url('trials/create'.$active_project['id'])?>" title="Neuen Versuch für das Projekt &quot;<?=$active_project['name']?>&quot; anlegen">Neuer Versuch</a></li>
<li><a href="<?=site_url('results/project'.$active_project['id'])?>" title="Alle Ergebnisse für das Projekt &quot;<?=$active_project['name']?>&quot; öffnen">Ergebnisse</a></li>
<li><a href="<?=site_url('projects/detail'.$active_project['id'])?>" title="<?=_('Show overview')?>"><?=_('Overview')?></a></li>
<li><a href="<?=site_url('trials/create'.$active_project['id'])?>" title="<?=sprintf(_('Create a new trial for the project &quot;%s&quot;'), $active_project['name'])?>"><?=_('New trial')?></a></li>
<li><a href="<?=site_url('results/project'.$active_project['id'])?>" title="Show results for the project &quot;%s&quot;'), $active_project['name'])?>"><?=_('New trial')?></a></li>
</ul>
</li>
<?
endif;
?>
<li>Global
<li><?=_('Global')?>
<ul>
<li><a href="<?=site_url('projects/create')?>" title="Neues Projekt anlegen">Neues Projekt</a></li>
<li><a href="<?=site_url('projects/create')?>" title="<?=_('Create a new project')?>"><?=_('New project')?></a></li>
</ul>
</li>
</ul>
</div>
<div class="title">
<h2><a href="<?=site_url('projects')?>" title="Alle Projekte anzeigen">Projekte</a></h2>
<h2><a href="<?=site_url('projects')?>" title="<?=_('Show all projects')?>"><?=_('Projects')?></a></h2>
</div>
<div class="navigation">
<ul>
<li><a href="#">Eigene Projekte</a>
<li><a href="#"><?=_('Own projects')?></a>
<ul>
<?
$projects = $this->project->getOwn();
@@ -79,12 +79,12 @@
?>
</ul>
</li>
<li><a href="#">Freigegebene Projekte</a>
<li><a href="#"><?=_('Projects shared with me')?></a>
<ul>
<li><a href="#">Prisma</a></li>
</ul>
</li>
<li><a href="#">Öffentliche Projekte</a>
<li><a href="#"><?=_('Public projects')?></a>
<ul>
<li><a href="#">Beispielprojekt</a></li>
</ul>
@@ -93,7 +93,7 @@
</div>
<div class="title">
<h2>Suche</h2>
<h2><?=_('Search')?></h2>
</div>
<div class="box">
@@ -104,14 +104,14 @@
</div>
<div class="title">
<h2>Ereignisse</h2>
<h2><?=_('Recent events')?></h2>
</div>
<div class="box">
<ul id="blog">
<li><h4><a href="#" title="Berechnung fertig">Berechnung fertig</a> <abbr title="22.07.2011">22.07.2011</abbr></h4><p>Berechnung für &quot;Gerstenkorn&quot; erfolgreich beendet.</i></p></li>
<li><h4><a href="#" title="Berechnung fertig">Berechnung fertig</a> <abbr title="22.07.2011">22.07.2011</abbr></h4><p>Berechnung für &quot;Gerstenkorn&quot; erfolgreich beendet.</i></p></li>
<li><h4><a href="#" title="Berechnung fertig">Berechnung fertig</a> <abbr title="22.07.2011">22.07.2011</abbr></h4><p>Berechnung für &quot;Gerstenkorn&quot; erfolgreich beendet.</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>
<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>

40
application/views/project/detail.php
View File

@@ -3,21 +3,21 @@
<div id="content">
<div class="title">
<h2>Projektinformationen</h2>
<h2><?= _('Project details') ?></h2>
</div>
<div class="box">
<h3>Beschreibung</h3>
<h3><?= _('Description') ?></h3>
<div class="editInPlace"><?=nl2br($project['description']);?></div>
<p></p>
<h3>Versuche</h3>
<h3><?= _('Trials') ?></h3>
<table class="tableList">
<thead>
<tr>
<th scope="col">Versuch</th>
<th scope="col">Berechnungen</th>
<th scope="col">Aktionen</th>
<th scope="col"><?= _('Trial') ?></th>
<th scope="col"><?= _('Jobs') ?></th>
<th scope="col"><?= _('Actions') ?></th>
</tr>
</thead>
<tbody>
@@ -26,19 +26,19 @@
foreach($trials as $trial):
?>
<tr>
<td><a href="<?=site_url('trials/'.$trial['id'])?>"title="Versuch &quot;<?=$trial['name']?>&quot; anzeigen"><?=$trial['name']?></a></td>
<td><span class="active">Erfolgreich abgeschlossen</span></td>
<td><a href="<?=site_url('trials/'.$trial['id'])?>"title="<?= sprintf(_('Show trial &quot;%s&quot'), $trial['name'])?>"><?=$trial['name']?></a></td>
<td><span class="active"><?= _('Completed') ?></span></td>
<td>
<a href="<?=site_url('trials/results/'.$trial['id'])?>" title="Ergebnisse zum Versuch &quot;<?=$trial['name']?>&quot; anzeigen">Ergebnisse anzeigen</a> |
<a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; bearbeiten">Bearbeiten</a> |
<a href="<?=site_url('trials/delete/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; entfernen">Entfernen</a></td>
<a href="<?=site_url('trials/results/'.$trial['id'])?>" title="<?= sprintf(_('Show results for the trial &quot;%s&quot'), $trial['name'])?>"><?= _('Show results') ?></a> |
<a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="<?= sprintf(_('Edit trial &quot;%s&quot;'), $trial['name']) ?>"><?= _('Edit') ?></a> |
<a href="<?=site_url('trials/delete/'.$trial['id'])?>" title="<?= sprintf(_('Delete trial &quot;%s&quot;'), $trial['name']) ?>"><?= _('Delete') ?></a></td>
</tr>
<?
endforeach;
else:
?>
<tr>
<td colspan="3">Keine Versuche vorhanden.</td>
<td colspan="3"><?= _('No trials available.') ?></td>
</tr>
<?
endif;
@@ -46,20 +46,20 @@
</tbody>
</table>
<p><a class="button add" href="<?=site_url('trials/create/'.$project['id'])?>">Neuen Versuch erstellen</a>
<p><a class="button add" href="<?=site_url('trials/create/'.$project['id'])?>"><?= _('Create a new trial') ?></a>
</div>
<div class="title">
<h2>Letzte Berechnungen</h2>
<h2><?= _('Recent jobs') ?></h2>
</div>
<div class="box">
<table class="tableList">
<thead>
<tr>
<th scope="col">Versuch</th>
<th scope="col">Fertiggestellt</th>
<th scope="col">Aktionen</th>
<th scope="col"><?= _('Trial') ?></th>
<th scope="col"><?= _('Finished') ?></th>
<th scope="col"><?= _('Actions') ?></th>
</tr>
</thead>
<tbody>
@@ -71,15 +71,15 @@
<td>Versuchsname</td>
<td>Heute, 09:32</td>
<td>
<a href="<?=site_url('trials/results/'.$trial['id'])?>" title="Ergebnisse zum Versuch &quot;<?=$trial['name']?>&quot; anzeigen">Ergebnisse anzeigen</a> |
<a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; bearbeiten">Bearbeiten</a></td>
<a href="<?=site_url('trials/results/'.$trial['id'])?>" title="<?= sprintf(_('Show results for the trial &quot;%s&quot'), $trial['name'])?>"><?= _('Show results') ?></a> |
<a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="<?= sprintf(_('Edit trial &quot;%s&quot;'), $trial['name']) ?>"><?= _('Edit') ?></td>
</tr>
<?
endforeach;
else:
?>
<tr>
<td colspan="3">Es wurden noch keine Berechnungen durchgeführt.</td>
<td colspan="3"><?= _('No jobs found.') ?></td>
</tr>
<?
endif;

51
application/views/project/list.php
View File

@@ -3,18 +3,17 @@
<div id="content">
<div class="title">
<h2>Projektübersicht</h2>
<h2><?= _('Project overview') ?></h2>
</div>
<div class="box">
<h3>Übersicht aller Projekte</h3>
<table class="tableList paginated sortable">
<thead>
<tr>
<th scope="col">Projekt</th>
<th scope="col">Besitzer</th>
<th scope="col">Berechnungen</th>
<th scope="col">Aktion</th>
<th scope="col"><?= _('Project') ?></th>
<th scope="col"><?= _('Owner') ?></th>
<th scope="col"><?= _('Jobs') ?></th>
<th scope="col"><?= _('Actions') ?></th>
</tr>
</thead>
<tbody>
@@ -24,49 +23,13 @@ foreach($projects as $project):
<tr>
<td><a href="<?=site_url('projects/detail/' . $project['id'])?>"><abbr title="<?=$project['description']?>"><?=$project['name']?></abbr></a></td>
<td><?=$project['firstname'] . " " . $project['lastname']?></td>
<td><span class="active">Erfolgreich abgeschlossen</span></td>
<td><a href="#">Ergebnisse anzeigen</a> | <?=anchor('projects/delete/' . $project['id'], "Entfernen");?>
<td><span class="active"><?= _('Successfully finished') ?></span></td>
<td><a href="#"><?= _('Show results') ?></a> | <?=anchor('projects/delete/' . $project['id'], _('Delete'));?>
</td>
</tr>
<?php
endforeach;
?>
<tr>
<td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
<td>Karsten Heiken</td>
<td><span class="closed">Fehlgeschlagen</span></td>
<td><a href="#">Fehlerbericht</a> | <a href="#">Entfernen</a></td>
</tr>
<tr>
<td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
<td>Karsten Heiken</td>
<td><span class="pending">Berechnung im Gange: 20%</span></td>
<td><a href="#">Anhalten</a> | <a href="#">Entfernen</a></td>
</tr>
<tr>
<td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
<td>Karsten Heiken</td>
<td><span class="pending">Berechnung im Gange: 60%</span></td>
<td><a href="#">Anhalten</a> | <a href="#">Entfernen</a></td>
</tr>
<tr>
<td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
<td>Karsten Heiken</td>
<td><span class="pending">Berechnung im Gange: 0%</span></td>
<td><a href="#">Anhalten</a> | <a href="#">Entfernen</a></td>
</tr>
<tr>
<td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
<td>Karsten Heiken</td>
<td><span class="closed">Fehlgeschlagen</span></td>
<td><a href="#">Fehlerbericht</a> | <a href="#">Entfernen</a></td>
</tr>
<tr>
<td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
<td>Karsten Heiken</td>
<td><span class="closed">Fehlgeschlagen</span></td>
<td><a href="#">Fehlerbericht</a> | <a href="#">Entfernen</a></td>
</tr>
</tbody>
</table>
</div>

24
application/views/project/new.php
View File

@@ -3,53 +3,51 @@
<div id="content">
<div class="title">
<h2>Neues Projekt erstellen</h2>
<h2><?= _('Create a new project') ?></h2>
</div>
<div class="box">
<form method="post" name="createproject" action="<?=site_url('projects/create')?>" enctype="multipart/form-data">
<h3>Erforderliche Angaben zum Projekt</h3>
<h3><?= _('Required information') ?></h3>
<ul>
<li>
<h4>Projektname <span class="req">*</span></h4>
<h4><?= _('Project name') ?> <span class="req">*</span></h4>
<div>
<input type="text" name="name" class="short text" tabindex="1" value="<?=set_value('name') == '' ? $this->input->post('name') : set_value('name');?>">
<?=form_error('name')?>
</div>
</li>
<li>
<h4>Beschreibung</h4>
<label class="note">Eine Beschreibung ist hilfreich, wenn Sie dieses Projekt später für andere Mitarbeiter freigeben möchten.</label>
<h4><?= _('Description') ?></h4>
<label class="note"><?= _('A description is useful if you want to share this project with co-workers.') ?></label>
<div>
<textarea name="description" rows="6" cols="60" tabindex="2" class="textarea"><?=set_value('description') == '' ? $this->input->post('description') : set_value('description');?></textarea>
<?=form_error('description')?>
</div>
</li>
</ul>
<h3>Optionale Angaben</h3>
<h3><?= _('Optional information') ?></h3>
<ul>
<li>
<h4>3D-Modell</h4>
<label class="note">Falls ein 3D-Modell für jeden Versuch als Standard definiert werden soll, so können Sie dieses hier hochladen.<br />
Es kann weiterhin bei jedem Versuch ein anderes Modell gewählt werden.</label>
<h4><?= _('3D model') ?></h4>
<label class="note"><?= _('Upload a 3D model that is used as a default for new trials. <br/>This model can be changed for every trial.')?></label>
<div>
<input type="file" class="file" name="defaultmodel" tabindex="3" value="<?=set_value('defaultmodel')?>">
<?=$model['success'] ? '' : $this->upload->display_errors('<span class="error">', '</span>');?>
</div>
</li>
<li>
<h4>Standard-Konfiguration <span class="req">*</span></h4>
<label class="note">Laden Sie eine Konfiguration hoch, die als Vorgabe für alle Versuche verwendet wird.<br />
Diese Konfiguration kann bei jedem Versuch geändert werden.</label>
<h4><?= _('Default configuration') ?> <span class="req">*</span></h4>
<label class="note"><?= _('Upload a configuration that is used as a default for new trials. <br/>This configuration can be changed for every trial.')?></label>
<div>
<input type="file" class="file" name="defaultconfig" tabindex="4" value="<?=set_value('defaultconfig')?>">
<?=$config['success'] ? '' : $this->upload->display_errors('<span class="error">', '</span>');?>
</div>
</li>
<li>
<a href="#" onclick="document.forms.createproject.submit()" class="button">Speichern</a>
<a href="#" onclick="document.forms.createproject.submit()" class="button"><?= _('Save') ?></a>
</li>
</ul>
</form>

36
application/views/trial/new.php
View File

@@ -3,39 +3,39 @@
<div id="content">
<div class="title">
<h2>Neuen Versuch erstellen</h2>
<h2><?= _('Create a new trial') ?></h2>
</div>
<form name="newtrial" method="post" action="<?=site_url('trials/create')?>">
<div class="box">
<h3>Erforderliche Angaben zum Versuch</h3>
<h3><?= _('Required information') ?></h3>
<ul>
<li>
<h4>Versuchsbezeichnung <span class="req">*</span></h4>
<h4><?= _('Trial name') ?> <span class="req">*</span></h4>
<div>
<input type="text" name="name" class="short text" value="<?=set_value('name')?>">
<?=form_error('name')?>
</div>
</li>
<li>
<h4>Beschreibung</h4>
<label class="note">Eine Beschreibung ist hilfreich, wenn andere Mitarbeiter an diesem Projekt mitarbeiten möchten.</label>
<h4><?= _('Description') ?></h4>
<label class="note"><?= _('A description is useful if you want to share this trial with co-workers.') ?></label>
<div>
<textarea name="description" rows="6" cols="60" class="textarea"><?=set_value('description')?></textarea>
<?=form_error('description')?>
</div>
</li>
<li>
<h4>3D-Modell</h4>
<h4><?= _('3D model') ?></h4>
<?
$defaultmodel = "foo";
if(isset($defaultmodel)):
?>
<div class="notice">
<strong>Für dieses Projekt ist ein Standardmodell vorhanden.</strong><br />
Wenn Sie hier eine neue Datei hochladen, wird für diesen Versuch das hier angegebene Modell verwendet.
<strong><?= _('There is a default model set for this project.') ?></strong><br />
<?= _('If you want to use a different model for this trial, you can upload it here.') ?>
</div>
<?
endif;
@@ -50,20 +50,20 @@
<div class="box">
<h3>Programmspezifische Parameter für die Berechnung</h3>
<h3><?= _('Application-specific parameters') ?></h3>
<?
$defaultconfig = "foo";
if(isset($defaultconfig)):
?>
<div class="notice">
<strong>Für dieses Projekt ist eine Standardkonfiguration vorhanden.</strong><br />
Das folgende Formular enthält die Standardparameter. Diese können für diesen Versuch nach Belieben angepasst werden. <br />
Die Standardkonfiguration wird dabei nicht verändert.
<strong><?= _('There is a default configuration set for this project.') ?></strong><br />
<?= _('This form contains the default values. You can adjust them for this trial.') ?><br />
<?= _('The default configuration will not be modified.') ?>
</div>
<?
endif;
?>
<h4>Programm zur Berechnung</h4>
<h4><?= _('Application to use for the computation') ?></h4>
<p>
<?
foreach($programs as $program):
@@ -77,14 +77,14 @@
?>
<div class="program-parameters" id="<?=$program['id']?>-params" style="display:none">
<h4>Parameter für <?=$program['name']?></h4>
<h4><?= sprintf(_('Parameters for %s'), $program['name'])?></h4>
<p>
<table>
<thead>
<tr>
<th scope="col" width="40%">Parameter</th>
<th scope="col" width="40%">Wert</th>
<th scope="col">Einheit</th>
<th scope="col" width="40%"><?= _('Parameter') ?></th>
<th scope="col" width="40%"><?= _('Value') ?></th>
<th scope="col"><?= _('Unit') ?></th>
</tr>
</thead>
<tbody>
@@ -107,7 +107,7 @@
endforeach;
?>
<p>
<a class="button save-big big" href="#" onclick="document.forms.newtrial.submit();return false">Speichern</a>
<a class="button save-big big" href="#" onclick="document.forms.newtrial.submit();return false"><?= _('Save') ?></a>
</p>
</div>
</form>

12
application/views/user/settings.php
View File

@@ -3,11 +3,11 @@
<div id="content">
<form action="#" method="post">
<div class="title">
<h2><?=lang('settings');?></h2>
<h2><?=_('Settings');?></h2>
</div>
<ul class="tabs">
<li class="active"><a href="#personal"><?=lang('tab_personal');?></a></li>
<li><a href="#settings"><?=lang('tab_settings');?></a></li>
<li class="active"><a href="#personal"><?=_('Personal Information');?></a></li>
<li><a href="#settings"><?=_('Settings');?></a></li>
</ul>
<div class="tab_container">
@@ -26,7 +26,7 @@
<div id="settings" class="tab_content">
<ul>
<li>
<label><?=lang('language_select');?></label>
<label><?=_('Language');?></label>
<div>
<select id="language_select" name="language_select" class="drop">
<option value="de">Deutsch</option>
@@ -36,8 +36,8 @@
</li>
<li>
<input type="checkbox" id="projects_sortrecently" name="projects_sortrecently" value="1" class="checkbox"/>
<label for="projects_sortrecently"><?=lang('projects_sortrecently');?></label><br />
<label class="note"><?=lang('projects_sortrecently_note');?></label>
<label for="projects_sortrecently"><?=_('Sort projects by date of the last access');?></label><br />
<label class="note"><?=_('If the projects are sorted by the data of the last access, the rarely used projects &quot;slip&quot; to the end of the list.');?></label>
</li>
</ul>
</div>