Merge branch 'next' into import

lpanlab · Mar 26, 2014 · 55b68a2 · 55b68a2
2 parents 69060b2 + b1f72e3
commit 55b68a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 /* Changelog for eLabFTW */
 
 Version 0.9.4.2
+* Add general template for experiments
+* Add linked items and comments on PDF
 * Easier install on Mac and Windows
 * Add linked items list to pdf and list of attached files
 * Add links button in editor

diff --git a/inc/viewXP.php b/inc/viewXP.php
@@ -81,6 +81,7 @@
 // Display experiment
 ?>
     <section class="item" style='border: 1px solid #<?php echo $data['color'];?>'>
+    <span class='align_right' id='status'>(<?php echo $data['name'];?>)</span>
 <?php
 echo "<img src='themes/".$_SESSION['prefs']['theme']."/img/calendar.png' title='date' alt='Date :' /><span class='date'> ".$data['date']."</span><br />
     <a href='experiments.php?mode=edit&id=".$data['expid']."'><img src='themes/".$_SESSION['prefs']['theme']."/img/edit.png' title='edit' alt='edit' /></a> 
@@ -101,7 +102,6 @@
 ?>
 <div OnClick="document.location='experiments.php?mode=edit&id=<?php echo $data['expid'];?>'" class='title'>
     <?php echo stripslashes($data['title']);?>
-    <span class='align_right' id='status'>(<?php echo $data['name'];?>)<span>
 </div>
 <?php
 // BODY (show only if not empty, click on it to edit