[HepData-svn] r1740 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/components resources/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: watt
Date: Tue Feb 11 11:45:49 2014
New Revision: 1740

Log:
Updating View.tml to allow figures in resource area based on RED ID

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

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java	Tue Feb 11 11:40:58 2014	(r1739)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java	Tue Feb 11 11:45:49 2014	(r1740)
@@ -69,7 +69,7 @@
         writer.element("b");
 	writer.write("obs ");
         writer.end();
-        writer.write(" - the observable (eg. SIG, DSIG/DX, DN/DPT). "); 
+        writer.write(" - the observable (e.g. SIG, DSIG/DX, DN/DPT). "); 
         writer.element("br"); writer.end();
         writer.element("b");
 	writer.write("sqrts ");
@@ -79,7 +79,7 @@
         writer.element("b");
 	writer.write("exp ");
         writer.end();
-        writer.write(" - the experiment/laboratory name (eg. ZEUS, CERN, LHC)."); 
+        writer.write(" - the experiment/laboratory name (e.g. ZEUS, CERN, LHC)."); 
         writer.element("br"); writer.end();
         writer.element("b");
 	writer.write("date ");

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 Feb 11 11:40:58 2014	(r1739)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Tue Feb 11 11:45:49 2014	(r1740)
@@ -286,11 +286,16 @@
                   <t:datasetAsHtml dataset="dataset" format="${format}" />
                 </td>
                 <td valign="top">
-                  <t:if test="dataset.haveFigure">
+                  <t:if test="dataset.haveFigureIRN">
                   <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>
+                  <t:if test="dataset.haveFigureRED">
+                  <a href="http://hepdata.cedar.ac.uk/resource/${paper.redId}/fig${dataset.FigureString}.png">
+                  <img src="http://hepdata.cedar.ac.uk/resource/${paper.redId}/thumb_fig${dataset.FigureString}.png"/>
+                  </a>
+                  </t:if>
                 </td>
                </tr>
               </table>