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

[blackhole at projects.hepforge.org]

Author: watt
Date: Sun Dec  8 15:04:50 2013
New Revision: 1724

Log:
Display second preprint and prevent counter overrunning when browsing keywords.

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

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Mon Dec  2 17:19:03 2013	(r1723)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Sun Dec  8 15:04:50 2013	(r1724)
@@ -193,6 +193,7 @@
        
        int min = offset + m - 10;
        if(min < 0) { min = 0; }
+       if(min > n) { min = n; } // G.W. 03/12/2013 
        int max = min+20;
        if(max > n) { max = n; } 
        System.out.println("max and min are " + max + " " + min);

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	Mon Dec  2 17:19:03 2013	(r1723)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Sun Dec  8 15:04:50 2013	(r1724)
@@ -129,6 +129,10 @@
           Preprinted as <b>${paper.firstPreprint}</b> 
           <br/>
         </t:if>
+        <t:if test="paper.secondPreprint">
+          Preprinted as <b>${paper.secondPreprint}</b> 
+          <br/>
+        </t:if>
         <t:if test="paper.archive">
           Archived as: 
           <a href="http://arxiv.org/abs/${paper.archive}"><b>${paper.archive}</b></a>