Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@aarpon
aarpon committed Jan 27, 2017
2 parents 9d55e3d + 85f9a8a commit 88ff6ea
Show file tree
Hide file tree
Showing 16 changed files with 89 additions and 74 deletions.
8 changes: 4 additions & 4 deletions aberration_correction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
onmouseover="changeQuickHelp( 'enable' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpDepthDependentPsf')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -247,7 +247,7 @@
onmouseover="changeQuickHelp( 'orientation' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpSpecifySampleOrientation')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -334,7 +334,7 @@
onmouseover="changeQuickHelp( 'mode' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpSaCorrectionMode')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -418,7 +418,7 @@
onmouseover="changeQuickHelp( 'advanced' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpAdvancedSaCorrection')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down
7 changes: 4 additions & 3 deletions calculate_pixel_size.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@

<br/>

<a href="javascript:openWindow('http://www.svi.nl/PixelBinning')">
<a href="javascript:openWindow(
'http://www.svi.nl/PixelBinning')">
<img src="images/help.png" alt="?"/>
</a>
binning:
Expand All @@ -171,8 +172,8 @@

</select>
<br/>
<a href="javascript:openWindow('
http://www.svi.nl/HuygensRemoteManagerHelpCMount')">
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpCMount')">
<img src="images/help.png" alt="?"/>
</a>
<?php
Expand Down
9 changes: 6 additions & 3 deletions capturing_parameter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@
<?php echo $parameterTimeInterval->confidenceLevel(); ?>"
onmouseover="changeQuickHelp( 'time' );">
<legend>
<a href="openWindow('http://www.svi.nl/TimeSeries')">
<a href="javascript:openWindow(
'http://www.svi.nl/TimeSeries')">
<img src="images/help.png" alt="?"/>
</a>
time interval
Expand Down Expand Up @@ -443,7 +444,8 @@
onmouseover="changeQuickHelp( 'pinhole_radius' );">

<legend>
<a href="openWindow('http://www.svi.nl/PinholeRadius')">
<a href="javascript:openWindow(
'http://www.svi.nl/PinholeRadius')">
<img src="images/help.png" alt="?"/>
</a>
pinhole radius
Expand Down Expand Up @@ -539,7 +541,8 @@ class="multichannelinput"/>
<?php echo $parameterPinholeSpacing->confidenceLevel(); ?>"
onmouseover="changeQuickHelp( 'pinhole_spacing' );">
<legend>
<a href="openWindow('http://www.svi.nl/PinholeSpacing')">
<a href="javascript:openWindow(
'http://www.svi.nl/PinholeSpacing')">
<img src="images/help.png" alt="?"/>
</a>
backprojected pinhole spacing
Expand Down
2 changes: 1 addition & 1 deletion chromatic_aberration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
onmouseover="changeQuickHelp( 'chromatic' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/ChromaticAberrationCorrector')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down
12 changes: 7 additions & 5 deletions coloc_analysis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
onmouseover="changeQuickHelp( 'perform' );">

<legend>
<a href="openWindow('http://www.svi.nl/ColocalizationBasics')">
<a href="javascript:openWindow(
'http://www.svi.nl/ColocalizationBasics')">
<img src="images/help.png" alt="?"/>
</a>
Would you like to perform Colocalization Analysis?
Expand Down Expand Up @@ -165,7 +166,8 @@
onmouseover="changeQuickHelp( 'channels' );">

<legend>
<a href="openWindow('http://www.svi.nl/ColocalizationBasics')">
<a href="javascript:openWindow(
'http://www.svi.nl/ColocalizationBasics')">
<img src="images/help.png" alt="?"/>
</a>
Channels
Expand Down Expand Up @@ -211,7 +213,7 @@
onmouseover="changeQuickHelp( 'coeff' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/ColocalizationCoefficientsInBrief')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -279,7 +281,7 @@
<fieldset class="setting"
onmouseover="changeQuickHelp( 'threshold' );">
<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/ColocalizationBasics')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -376,7 +378,7 @@ class="multichannelinput"
onmouseover="changeQuickHelp( 'maps' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/ColocalizationMap')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down
16 changes: 10 additions & 6 deletions create_job.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
<fieldset class="setting">

<legend>
<a href="openWindow('http://www.svi.nl/FileFormats')">
<a href="javascript:openWindow(
'http://www.svi.nl/FileFormats')">
<img src="images/help.png" alt="?"/>
</a>
Output file format
Expand Down Expand Up @@ -251,7 +252,8 @@

<fieldset class="report">
<legend>
<a href="openWindow('http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<img src="images/help.png" alt="?"/>
</a>
<a href="select_parameter_settings.php">
Expand All @@ -273,8 +275,8 @@

<fieldset class="report">
<legend>
<a href="openWindow('
http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<img src="images/help.png" alt="?"/>
</a>
<a href="select_task_settings.php">
Expand All @@ -299,7 +301,8 @@

<fieldset class="report">
<legend>
<a href="openWindow('http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<img src="images/help.png" alt="?"/>
</a>

Expand Down Expand Up @@ -328,7 +331,8 @@

<fieldset class="report">
<legend>
<a href="openWindow('http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpCreateJob')">
<img src="images/help.png" alt="?"/>
</a>
<a href="select_images.php">
Expand Down
6 changes: 3 additions & 3 deletions image_format.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
onmouseover="changeQuickHelp( 'channels' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/NumberOfChannels')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -234,7 +234,7 @@ function check($parameter, $value)
onmouseover="changeQuickHelp( 'PSF' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/PointSpreadFunction')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -269,7 +269,7 @@ function check($parameter, $value)
"theoretical"
)
echo "checked=\"checked\"" ?> />
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/TheoreticalPsf')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down
35 changes: 17 additions & 18 deletions login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,12 @@
?>
<h2>Welcome</h2>

<p class="intro">The <a
href="javascript:openWindow('http://hrm.sourceforge.net')">Huygens
Remote Manager</a> is an easy to use interface to the Huygens
Software
by <a href="javascript:openWindow('http://www.svi.nl')">Scientific
Volume Imaging B.V.</a> that allows for multi-user, large-scale
deconvolution and analysis.</p>
<p class="intro">
The <a href="javascript:openWindow('http://hrm.sourceforge.net')">
Huygens Remote Manager</a> is an easy to use interface to the Huygens
Software by <a href="javascript:openWindow('http://www.svi.nl')">
Scientific Volume Imaging B.V.</a> that allows for multi-user,
large-scale deconvolution and analysis.</p>

<?php
/*
Expand All @@ -252,16 +251,16 @@
<!-- Logos -->
<tr>
<td class="epfl"
onclick="openWindow('http://biop.epfl.ch')">
onclick="javascript:openWindow('http://biop.epfl.ch')">
</td>
<td class="fmi"
onclick="openWindow('http://www.fmi.ch')">
onclick="javascript:openWindow('http://www.fmi.ch')">
</td>
<td class="mri"
onclick="openWindow('http://www.mri.cnrs.fr')">
onclick="javascript:openWindow('http://www.mri.cnrs.fr')">
</td>
<td class="bsse"
onclick="openWindow('http://www.bsse.ethz.ch')">
onclick="javascript:openWindow('http://www.bsse.ethz.ch')">
</td>
</tr>

Expand Down Expand Up @@ -305,16 +304,16 @@
<!-- Logos -->
<tr>
<td class="svi"
onclick="openWindow('http://www.svi.nl')">
onclick="javascript:openWindow('http://www.svi.nl')">
</td>
<td class="lin"
onclick="openWindow('http://www.lin-magdeburg.de')">
onclick="javascript:openWindow('http://www.lin-magdeburg.de')">
</td>
<td class="bio-basel"
onclick="openWindow('http://www.biozentrum.unibas.ch')">
onclick="javascript:openWindow('http://www.biozentrum.unibas.ch')">
</td>
<td class="cni"
onclick="openWindow('http://cni.ifn-magdeburg.de')">
onclick="javascript:openWindow('http://cni.ifn-magdeburg.de')">
</td>
</tr>

Expand Down Expand Up @@ -363,7 +362,7 @@
<form method="post" action="">
<fieldset>
<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpLogin')">
<img src="images/help.png" alt="?"/></a> Login
</legend>
Expand Down Expand Up @@ -391,8 +390,8 @@ class="textfield"

<fieldset>
<legend>
<a href="openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpRegistration')">
<a href="javascript:openWindow(
'http://www.svi.nl/HuygensRemoteManagerHelpRegistrationPage')">
<img src="images/help.png" alt="?"/></a>
Registration
</legend>
Expand Down
10 changes: 5 additions & 5 deletions microscope_parameter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
onmouseover="changeQuickHelp( 'type' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/MicroscopeType')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -255,7 +255,7 @@
onmouseover="changeQuickHelp( 'NA' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/NumericalAperture')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -296,7 +296,7 @@
onmouseover="changeQuickHelp( 'wavelengths' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/WaveLength')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -408,7 +408,7 @@ class="multichannelinput"/>
onmouseover="changeQuickHelp( 'objective' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/LensImmersionMedium')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down Expand Up @@ -508,7 +508,7 @@ class="multichannelinput"/>
onmouseover="changeQuickHelp( 'sample' );">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/SpecimenEmbeddingMedium')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down
2 changes: 1 addition & 1 deletion reset_password.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<div id="navleft">
<ul>
<?php
echo(Nav::linkWikiPage('HuygensRemoteManagerHelpResetPassword'));
echo(Nav::linkWikiPage('HuygensRemoteManagerHelpLogin'));
?>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion select_images.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ function imageAction (list) {
<fieldset class="setting">

<legend>
<a href="openWindow(
<a href="javascript:openWindow(
'http://www.svi.nl/FileFormats')">
<img src="images/help.png" alt="?"/>
</a>
Expand Down
Loading

0 comments on commit 88ff6ea

Please sign in to comment.