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

Rename 'trial' to 'experiment'

Browse Source
This commit is contained in:
Eike Foken
2011-09-08 01:37:32 +02:00
parent 33e116ed60
commit 7b329f4501
25 changed files with 341 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/views/dashboard.php
View File

@@ -1,4 +1,4 @@
<?php $this->load->view('header'); ?>
<?php $this->load->view('header');?>
<div id="content">
@@ -13,9 +13,9 @@
</p>
</div>
<div class="box">
<h3><?=_('Calculations');?></h3>
<h3><?=_('Experiments');?></h3>
<p>
<a class="button left big" href="#"><?=_('Newest results');?></a><a class="button middle big" href="#"><?=_('Running calculations');?></a>
<a class="button left big" href="#"><?=_('Newest results');?></a><a class="button middle big" href="#"><?=_('Running jobs');?></a>
</p>
</div>
<div class="box">
@@ -27,4 +27,4 @@
</div>
<?php $this->load->view('footer'); ?>
<?php $this->load->view('footer');?>

0
application/views/trial/index.html → application/views/experiments/index.html
View File

14
application/views/trial/new.php → application/views/experiments/new.php
View File

@@ -3,16 +3,16 @@
<div id="content">
<div class="title">
<h2><?=_('Create a new trial');?></h2>
<h2><?=_('Create a new experiment');?></h2>
</div>
<form name="newTrial" method="post" action="<?=site_url('trials/create/' . $project['id']);?>" enctype="multipart/form-data">
<form name="newExperiment" method="post" action="<?=site_url('experiments/create/' . $project['id']);?>" enctype="multipart/form-data">
<div class="box">
<h3><?=_('Required information');?></h3>
<ul>
<li>
<?=form_label(_('Trial name'), 'name');?>
<?=form_label(_('Name'), 'name');?>
<span class="req">*</span>
<div>
<input type="text" name="name" id="name" class="short text" value="<?=set_value('name');?>" />
@@ -22,7 +22,7 @@
<li>
<?=form_label(_('Description'), 'description');?>
<span class="req">*</span><br />
<label class="note"><?=_('A description is useful if you want to share this trial with co-workers.');?></label>
<label class="note"><?=_('A description is useful if you want to share this experiment with co-workers.');?></label>
<div>
<textarea name="description" id="description" rows="6" cols="60" class="textarea"><?=set_value('description');?></textarea>
<?=form_error('description');?>
@@ -35,7 +35,7 @@
?>
<div class="notice">
<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.');?>
<?=_('If you want to use a different model for this experiment, you can upload it here.');?>
</div>
<?php
endif;
@@ -56,7 +56,7 @@
?>
<div class="notice">
<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 />
<?=_('This form contains the default values. You can adjust them for this experiment.');?><br />
<?=_('The default configuration will not be modified.');?>
</div>
<?php
@@ -121,7 +121,7 @@
endforeach;
?>
<p>
<a class="button save-big big" href="javascript:void(0);" onclick="$('form[name=newTrial]').submit();"><?=_('Save');?></a>
<a class="button save-big big" href="javascript:void(0);" onclick="$('form[name=newExperiment]').submit();"><?=_('Save');?></a>
</p>
</div>
</form>

10
application/views/header.php
View File

@@ -37,15 +37,15 @@
// get the active project, if there is one
if ($this->input->get('active_project'))
$active_project = $this->project->getById($this->input->get('active_project'));
else
else
$active_project = false;
$projects = $this->project->getAll();
if(!$active_project):
?>
<option disabled="disabled" selected="selected"><strong><?=_('Select a project');?></strong></option>
<?php
<?php
endif;
foreach ($projects as $project):
?>
@@ -75,7 +75,7 @@
<a href="javascript:void(0);" onclick="$(this).parent().toggleClass('active').find('ul').toggle();"><?=_('Project');?> <?=$active_project['shortname'];?></a>
<ul>
<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('experiments/create/' . $active_project['id']);?>" title="<?=sprintf(_('Create a new experiment for the project &quot;%s&quot;'), $active_project['name']);?>"><?=_('New experiment');?></a></li>
<li><a href="<?=site_url('results/project/' . $active_project['id']);?>" title="<?=sprintf(_('Show results for the project &quot;%s&quot;'), $active_project['name']);?>"><?=_('Show results');?></a></li>
</ul>
</li>

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

@@ -34,28 +34,28 @@
<?php
endif;
?>
<h3><?=_('Trials');?></h3>
<h3><?=_('Experiments');?></h3>
<table class="tableList">
<thead>
<tr>
<th scope="col"><?=_('Trial');?></th>
<th scope="col"><?=_('Name');?></th>
<th scope="col"><?=_('Jobs');?></th>
<th scope="col"><?=_('Actions');?></th>
</tr>
</thead>
<tbody>
<?php
if (count($trials) > 0):
foreach ($trials as $trial):
if (count($experiments) > 0):
foreach ($experiments as $experiment):
?>
<tr>
<td><a href="<?=site_url('trials/' . $trial['id']);?>" title="<?=sprintf(_("Show trial '%s'"), $trial['name']);?>"><?=$trial['name'];?></a></td>
<td><a href="<?=site_url('experiments/' . $experiment['id']);?>" title="<?=sprintf(_('Show experiment &quot;%s&quot;'), $experiment['name']);?>"><?=$experiment['name'];?></a></td>
<td><span class="active"><?=_('Completed');?></span></td>
<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/create/' . $project['id'] . '/' . $trial['id']);?>" title="<?=sprintf(_('Copy trial &quot;%s&quot;'), $trial['name']);?>"><?=_('Copy');?></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>
<a href="<?=site_url('experiments/results/' . $experiment['id']);?>" title="<?=sprintf(_('Show results for this experiment'), $experiment['name']);?>"><?=_('Show results');?></a> |
<a href="<?=site_url('experiments/create/' . $project['id'] . '/' . $experiment['id']);?>" title="<?=sprintf(_('Copy experiment &quot;%s&quot;'), $experiment['name']);?>"><?=_('Copy');?></a> |
<a href="<?=site_url('experiments/edit/' . $experiment['id']);?>" title="<?=sprintf(_('Edit this experiment'), $experiment['name']);?>"><?=_('Edit');?></a> |
<a href="<?=site_url('experiments/delete/' . $experiment['id']);?>" title="<?=sprintf(_('Delete experiment'), $experiment['name']);?>"><?=_('Delete');?></a>
</td>
</tr>
<?php
@@ -63,7 +63,7 @@
else:
?>
<tr>
<td colspan="3"><?=_('No trials available.');?></td>
<td colspan="3"><?=_('No experiments available.');?></td>
</tr>
<?php
endif;
@@ -71,7 +71,7 @@
</tbody>
</table>
<p><a class="button add" href="<?=site_url('trials/create/' . $project['id']);?>"><?=_('Create a new trial');?></a>
<p><a class="button add" href="<?=site_url('experiments/create/' . $project['id']);?>"><?=_('Create experiment');?></a>
</div>
<div class="title">
@@ -82,7 +82,7 @@
<table class="tableList">
<thead>
<tr>
<th scope="col"><?=_('Trial');?></th>
<th scope="col"><?=_('Experiment');?></th>
<th scope="col"><?=_('Started');?></th>
<th scope="col"><?=_('Finished');?></th>
<th scope="col"><?=_('Actions');?></th>
@@ -98,8 +98,8 @@
<td><?=$job['started_at'];?></td>
<td><?=$job['finished_at'] != '0000-00-00 00:00:00' ? $job['finished_at'] : _('Currently running');?></td>
<td>
<a href="<?=site_url('trials/results/' . $job['id']);?>" title="<?= sprintf(_('Show results for the trial &quot;%s&quot;'), $job['name']);?>"><?=_('Show results');?></a> |
<a href="<?=site_url('trials/edit/' . $job['id']);?>" title="<?= sprintf(_('Edit trial &quot;%s&quot;'), $job['name']);?>"><?=_('Edit');?></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>
</tr>
<?php
endforeach;

4
application/views/projects/new.php
View File

@@ -34,7 +34,7 @@
<input type="file" name="defaultmodel" id="defaultmodel" class="file" />
<?=form_error('defaultmodel');?>
</div>
<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>
<label class="note"><?=_('Upload a 3D model that is used as a default for new experiments.<br/>This model can be changed for every experiment.');?></label>
</li>
<li>
<?=form_label(_('Default configuration'), 'defaultconfig');?>
@@ -42,7 +42,7 @@
<input type="file" name="defaultconfig" id="defaultconfig" class="file" />
<?=form_error('defaultconfig');?>
</div>
<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>
<label class="note"><?=_('Upload a configuration that is used as a default for new experiments.<br/>This configuration can be changed for every experiment.');?></label>
</li>
<li>
<a href="#" onclick="document.forms.createproject.submit()" class="button"><?=_('Save');?></a>