[HepData-svn] r1598 - trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: whalley
Date: Tue Nov  6 16:08:03 2012
New Revision: 1598

Log:
code to add published figures to dataset outputs

Modified:
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Tue Nov  6 16:03:14 2012	(r1597)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Tue Nov  6 16:08:03 2012	(r1598)
@@ -215,7 +215,6 @@
       </t:if>
       
       <t:loop source="datasetsnew" value="dataset">
-
          <t:if test="longFormat">
          <div>
          <div>
@@ -240,9 +239,25 @@
 <!--          <t:datasetAsHtml dataset="dataset" format="${format}" /> -->
 
           </div>
-            </div><div>
-              <div><t:datasetAsHtml dataset="dataset" format="${format}" /></div>
-        </div>
+            </div>
+            <div>
+              <div>
+              <table>
+               <tr>
+                <td valign="top">
+                  <t:datasetAsHtml dataset="dataset" format="${format}" />
+                </td>
+                <td valign="top">
+                  <t:if test="dataset.haveFigure">
+                  <a href="http://hepdata.cedar.ac.uk/resource/${paper.spiresId}/fig${dataset.FigureString}.png">
+                  <img src="http://hepdata.cedar.ac.uk/resource/${paper.spiresId}/thumb_fig${dataset.FigureString}.png"/>
+                  </a>
+                  </t:if>
+                </td>
+               </tr>
+              </table>
+              </div>
+            </div>
         </div>
          
          <t:parameter name="else">
@@ -269,7 +284,8 @@
           <t:displayDatasetComments ds="dataset" />
           </div>
             </div><div class="hidden">
-             <div><t:datasetAsHtml dataset="dataset" format="${format}" /></div>
+             <div><t:datasetAsHtml dataset="dataset" format="${format}" />
+             </div>
         </div>
         </div>