From 3ece4ed981f4a84f3c5b7abe4b0ae24f33ea95c7 Mon Sep 17 00:00:00 2001
From: Dave MacFarlane <driusan@gmail.com>
Date: Fri, 16 Dec 2011 11:17:55 -0500
Subject: [PATCH] Added properly marked up templates, to fix bug where sidebars
 were rendering incorrectly and showing at top of page

---
 .../instrument_list_controlpanel.tpl          | 99 +++++++++++++++++++
 .../templates/timepoint_list_controlpanel.tpl | 75 +++++++-------
 2 files changed, 133 insertions(+), 41 deletions(-)

diff --git a/smarty/templates/instrument_list_controlpanel.tpl b/smarty/templates/instrument_list_controlpanel.tpl
index 31e2cf0c404..0b87453ea69 100644
--- a/smarty/templates/instrument_list_controlpanel.tpl
+++ b/smarty/templates/instrument_list_controlpanel.tpl
@@ -1,3 +1,98 @@
+
+	<h3 class="controlPanelSection">Actions</h3>
+	<ul class="controlPanel">
+	    	<li>
+		{if $access.next_stage}
+                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=next_stage&candID={$candID}&sessionID={$sessionID}&identifier={$sessionID}">Start {$next_stage} Stage</a>
+{else}
+                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;Start Next Stage
+{/if}
+	    	</li>
+
+	</ul>
+
+	<h3 class="controlPanelSection">Stage: {$current_stage}</h3>
+	<ul class="controlPanel">
+		{section name=item loop=$status}
+		<li>
+			{if $access.status and $status[item].showlink}
+                        	<img src="images/{$status[item].icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setStageUpdate={$status[item].label}">{$status[item].label}</a>
+			{else}
+                        	<img src="images/{$status[item].icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;{$status[item].label}
+			{/if}
+		</li>
+		{/section}
+
+	</ul>
+
+	<h3 class="controlPanelSection">Send Time Point</h3>
+	<ul class="controlPanel">
+		<li>
+			{if $access.send_to_dcc===true}
+    				{if $send_to_dcc.set_submitted=='Check'}
+                        		<img src="images/{$send_to_dcc.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=timepoint_flag&subtest=check_timepoint_flag&identifier={$sessionID}">{$send_to_dcc.reverse|default:"Send To DCC"}</a><br>
+	    			{else}
+                        	<img src="images/{$send_to_dcc.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setSubmitted={$send_to_dcc.set_submitted}">{$send_to_dcc.reverse|default:"Send To DCC"}</a>
+    				{/if}
+			{else}
+                        <span title='{$access.send_to_dcc_status_message}'><img src="images/{$send_to_dcc.icon|default:'locked'}.gif" alt="" border="0" width="12" height="12" />&nbsp;Send To DCC</span>
+			{/if}
+		</li>		
+	</ul>
+
+
+	<h3 class="controlPanelSection">BVL QC Type</h3>
+	<ul class="controlPanel">
+		<li>
+			<img src="images/{$bvl_qc_type_none.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;
+			{if $bvl_qc_type_none.showlink}
+                        	<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setBVLQCType=">Not Done</a>
+			{else}
+                                                Not Done
+			{/if}
+		</li>
+		
+		<li>
+		          <img src="images/{$bvl_qc_type_visual.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;
+			{if $bvl_qc_type_visual.showlink}
+                        	<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setBVLQCType=Visual">Visual</a>
+			{else}
+                                                Visual
+			{/if}
+		</li>
+		<li>
+                	<img src="images/{$bvl_qc_type_hardcopy.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;
+			{if $bvl_qc_type_hardcopy.showlink}
+                        	<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setBVLQCType=Hardcopy">Hardcopy</a>
+			{else}
+                                                Hardcopy
+			{/if}
+		</li>
+	</ul>
+
+	<h3 class="controlPanelSection">BVL QC Status</h3>
+	<ul class="controlPanel">
+		<li>
+			<img src="images/{$bvl_qc_status_none.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;
+			{if $bvl_qc_status_none.showlink}
+                        	<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setBVLQCStatus=">Not Done</a>
+			{else}
+                                                Not Done
+			{/if}
+		</li>
+		
+		<li>
+                	<img src="images/{$bvl_qc_status_complete.icon|default:'default'}.gif" alt="" border="0" width="12" height="12" />&nbsp;
+			{if $bvl_qc_status_complete.showlink}
+                        	<a href="main.php?test_name=instrument_list&candID={$candID}&sessionID={$sessionID}&setBVLQCStatus=Complete">Complete</a>
+			{else}
+                                                Complete
+			{/if}
+		</li>
+	</ul>
+
+<!--
+<table>
                 <tr><td class="controlPanelSection">Actions</td></tr>
                 <tr>
                     <td class="controlPanelItem">
@@ -101,4 +196,8 @@
                 <tr><td>&nbsp;</td></tr>
 
 
+</table>
+
+-->
+
 
diff --git a/smarty/templates/timepoint_list_controlpanel.tpl b/smarty/templates/timepoint_list_controlpanel.tpl
index 4d72c402d94..435e6406ba5 100644
--- a/smarty/templates/timepoint_list_controlpanel.tpl
+++ b/smarty/templates/timepoint_list_controlpanel.tpl
@@ -1,41 +1,34 @@
-                <tr><td class="controlPanelSection">Actions</td></tr>
-                <tr>
-                    <td class="controlPanelItem">
-{if $isDataEntryPerson}
-                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=create_timepoint&candID={$candID}&identifier={$candID}">
-{else}
-                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;
-{/if}
-                        Create time point</a>
-                    </td>
-                </tr>
-                    <td class="controlPanelItem">
-{if $isDataEntryPerson}
-                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=candidate_parameters&candID={$candID}&identifier={$candID}">
-{else}
-                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;
-{/if}
-                        Edit Candidate Info</a>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="controlPanelItem">
-{if $isDataEntryPerson}
-                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=demographics&candID={$candID}&identifier={$candID}">
-{else}
-                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;
-{/if}
-                        Demographics Form</a>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="controlPanelItem">
-{if $isDataEntryPerson}
-                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=mri_safety&candID={$candID}&identifier={$candID}">
-{else}
-                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;
-{/if}
-                        MRI Safety Form</a>
-                    </td>
-                </tr>
-                <tr><td>&nbsp;</td></tr>
\ No newline at end of file
+<h3 class="controlPanelSection">Actions</h3>
+<ul class="controlPanel">
+	<li>
+		{if $isDataEntryPerson}
+                        <a href="main.php?test_name=create_timepoint&candID={$candID}&identifier={$candID}">Create time point</a>
+		{else}
+                        Create time point
+		{/if}
+	</li>
+	<li>
+		{if $isDataEntryPerson}
+                        <a href="main.php?test_name=candidate_parameters&candID={$candID}&identifier={$candID}">Edit Candidate Info</a>
+		{else}
+                        Edit Candidate Info
+		{/if}
+	</li>
+
+	<li>
+    {*
+		{if $isDataEntryPerson}
+                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=demographics&candID={$candID}&identifier={$candID}">Demographics Form</a>
+		{else}
+                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;Demographic Form
+		{/if}
+
+	<li>
+		{if $isDataEntryPerson}
+                        <img src="images/open.gif" alt="" border="0" width="12" height="12" />&nbsp;<a href="main.php?test_name=mri_safety&candID={$candID}&identifier={$candID}">MRI Safety Form</a>
+		{else}
+                        <img src="images/locked.gif" alt="" border="0" width="12" height="12" />&nbsp;MRI Safety Form
+		{/if}
+	</li>
+    *}
+</ul>