|
|
[HepData-svn] r1390 - trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Sep 15 11:47:33 BST 2010
Author: whalley
Date: Wed Sep 15 11:47:32 2010
New Revision: 1390
Log:
modifications to way publication/preprint/archive is displayed
Modified:
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reaction.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTable.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTest.tml
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reaction.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reaction.tml Wed Sep 15 11:46:11 2010 (r1389)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reaction.tml Wed Sep 15 11:47:32 2010 (r1390)
@@ -71,16 +71,22 @@
<li><a href="#" t:type="pagelink" t:page="search" t:context="literal:JetProductionNotEE">Jet production in non-e+e- collisions</a></li>
</ul>
</div>
- </td>
+ <div style="margin-top:1em; font-size: smaller;">
+ <a href="#" t:type="pagelink" t:page="abouthepdata">About HepData</a> ––
+ <a href="#" t:type="pagelink" t:page="submittingdata">Submitting your data to HepData</a>
+ </div>
+ </td>
</tr>
</table>
-
+
+<!--
<div style="margin-top:1em; font-size: smaller;">
<a href="#" t:type="pagelink" t:page="abouthepdata">About HepData</a> ––
<a href="#" t:type="pagelink" t:page="submittingdata">Submitting your data to HepData</a>
<br/>
</div>
+-->
<br/>
</body>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml Wed Sep 15 11:46:11 2010 (r1389)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml Wed Sep 15 11:47:32 2010 (r1390)
@@ -60,6 +60,9 @@
<t:if test="paper.firstPreprint">
Preprint: <b>${paper.firstpreprint}</b>
</t:if>
+ <t:if test="paper.archive">
+ Archive: <b>${paper.archive}</b>
+ </t:if>
<t:if test="paper.spiresId">
(Spires ID:
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+${paper.spiresId}">${paper.spiresId}</a>)
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 Wed Sep 15 11:46:11 2010 (r1389)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml Wed Sep 15 11:47:32 2010 (r1390)
@@ -40,10 +40,18 @@
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/experiments/www2?fin+expt+${paper.experimentName}">
<b>${paper.experimentName} (${paper.informalName})</b></a>
<br/>
- Published in <b>${paper.firstPublished}</b>
- <br/>
- Preprinted as <b>${paper.firstPreprint}</b>
- <br/>
+ <t:if test="paper.firstPublished">
+ Published in <b>${paper.firstPublished}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.firstPreprint">
+ Preprinted as <b>${paper.firstPreprint}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.archive">
+ Archived as <b>${paper.archive}</b>
+ <br/>
+ </t:if>
<t:if test="paper.spiresId">
Spires ID (IRN): <b>${paper.spiresId}</b>
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+${paper.spiresId}">(View)</a>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTable.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTable.tml Wed Sep 15 11:46:11 2010 (r1389)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTable.tml Wed Sep 15 11:47:32 2010 (r1390)
@@ -16,10 +16,18 @@
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/experiments/www2?fin+expt+${paper.experimentName}">
<b>${paper.experimentName} (${paper.informalName})</b></a>
<br/>
- Published in <b>${paper.firstPublished}</b>
- <br/>
- Preprinted as <b>${paper.firstPreprint}</b>
- <br/>
+ <t:if test="paper.firstPublished">
+ Published in <b>${paper.firstPublished}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.firstPreprint">
+ Preprinted as <b>${paper.firstPreprint}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.archive">
+ Archived as <b>${paper.archive}</b>
+ <br/>
+ </t:if>
<t:if test="paper.spiresId">
Spires ID (IRN): <b>${paper.spiresId}</b>
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+${paper.spiresId}">(View)</a>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTest.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTest.tml Wed Sep 15 11:46:11 2010 (r1389)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/ViewTest.tml Wed Sep 15 11:47:32 2010 (r1390)
@@ -2,8 +2,10 @@
<html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<h2> Reaction Database TEST Record Display</h2>
-View
-<a href="#" t:type="pagelink" t:page="view" t:context="bdmsContext"><font size="-1">bdms display</font></a>
+View as:
+<a href="#" t:type="pagelink" t:page="view" t:context="bdmsContext"><font size="-1">bdms</font></a>
+|
+<a href="#" t:type="pagelink" t:page="view" t:context="hepmlContext"><font size="-1">hepml</font></a>
<t:if test="paper.hepdataId">
<title>HepData – ${paper.shortName}</title>
@@ -31,10 +33,18 @@
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/experiments/www2?fin+expt+${paper.informalName}">
<b>${paper.informalName}</b></a>
<br/>
- Published in <b>${paper.firstPublished}</b>
- <br/>
- Preprinted as <b>${paper.firstPreprint}</b>
- <br/>
+ <t:if test="paper.firstPublished">
+ Published in <b>${paper.firstPublished}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.firstPreprint">
+ Preprinted as <b>${paper.firstPreprint}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.archive">
+ Arcihved as <b>${paper.archive}</b>
+ <br/>
+ </t:if>
<t:if test="paper.spiresId">
Spires ID (IRN): <b>${paper.spiresId}</b>
<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+${paper.spiresId}">(View)</a>
@@ -90,7 +100,7 @@
<br/>
${dataset.getDsPlabs()}
<br/>
- ${dataset.getYAxis(1).getReactions()}
+ <!-- ${dataset.getYAxis(1).getReactions()} -->
<t:datasetAsHtml dataset="dataset" format="${format}" />
</div>
</t:loop>
More information about the HepData-svn
mailing list
|