|
|
[HepData-svn] r1300 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/components java/cedar/hepdata/webapp/pages resources/cedar/hepdata/webapp/pages
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Thu Oct 29 12:40:09 GMT 2009
Author: whalley
Date: Thu Oct 29 12:40:08 2009
New Revision: 1300
Log:
more changes
Modified:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ReactionPlot.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/CombinedPlot.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java Thu Oct 29 12:40:08 2009 (r1300)
@@ -329,7 +329,7 @@
writer.write(Formats.forms(e.getMinus(), msd, -lsd));
writer.write(e.getNormType().toSymbol());
}
- writer.writeRaw(" (" + stype + ") ");
+ if(!stype.equals("?")) writer.writeRaw(" (" + stype + ") ");
}
}
}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java Thu Oct 29 12:40:08 2009 (r1300)
@@ -216,6 +216,54 @@
}
return rtn;
}
+ private Double OptionHasYmax(){
+ Double rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("ymax") > -1){
+ String yh = optionstring.substring(optionstring.indexOf("ymax"));
+ int len = yh.length();
+ if(yh.indexOf(";") > -1) len = yh.indexOf(";");
+ if( len > 5) rtn = Double.valueOf(yh.substring(5,len));
+ }
+ }
+ return rtn;
+ }
+ private Double OptionHasYmin(){
+ Double rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("ymin") > -1){
+ String yh = optionstring.substring(optionstring.indexOf("ymin"));
+ int len = yh.length();
+ if(yh.indexOf(";") > -1) len = yh.indexOf(";");
+ if( len > 5) rtn = Double.valueOf(yh.substring(5,len));
+ }
+ }
+ return rtn;
+ }
+ private Double OptionHasXmax(){
+ Double rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("xmax") > -1){
+ String xh = optionstring.substring(optionstring.indexOf("xmax"));
+ int len = xh.length();
+ if(xh.indexOf(";") > -1) len = xh.indexOf(";");
+ if( len > 5) rtn = Double.valueOf(xh.substring(5,len));
+ }
+ }
+ return rtn;
+ }
+ private Double OptionHasXmin(){
+ Double rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("xmin") > -1){
+ String xh = optionstring.substring(optionstring.indexOf("xmin"));
+ int len = xh.length();
+ if(xh.indexOf(";") > -1) len = xh.indexOf(";");
+ if( len > 5) rtn = Double.valueOf(xh.substring(5,len));
+ }
+ }
+ return rtn;
+ }
@Persist
private int count;
@@ -421,6 +469,11 @@
xlow = 0.90*xlow;
xhigh = 1.10*xhigh;
}
+ if(OptionHasXmax() != null){xhigh = OptionHasXmax();}
+ if(OptionHasXmin() != null){xlow = OptionHasXmin();}
+ if(OptionHasYmax() != null){yhigh = OptionHasYmax();}
+ if(OptionHasYmin() != null){ylow = OptionHasYmin();}
+
IntervalXYDataset data1 = collection;
final XYErrorRenderer renderer1 = new XYErrorRenderer();
@@ -435,6 +488,7 @@
} else{
LogarithmicAxis logaxistemp = new LogarithmicAxis("header");
rangeAxisX = logaxistemp;
+ if(OptionHasXmin() != null && OptionHasXmax() != null) {rangeAxisX.setRange(rangex);}
}
try {
String xlabel = (String) xLabelMap.get(numberRunStart+1);
@@ -451,7 +505,8 @@
} else{
LogarithmicAxis logaxistemp = new LogarithmicAxis(_yaxis.getHeader());
rangeAxisY = logaxistemp;
- }
+ if(OptionHasYmin() != null && OptionHasYmax() != null) {rangeAxisY.setRange(rangey);}
+ }
try{
String ylabel = (String) yLabelMap.get(numberRunStart+1);
rangeAxisY.setLabel(ylabel);
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java Thu Oct 29 12:40:08 2009 (r1300)
@@ -6,7 +6,86 @@
import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.ioc.annotations.*;
import org.apache.tapestry5.services.*;
+import java.net.URLEncoder;
public class Form {
+
+ private String query = "";
+
+ @Property
+ private String reac;
+ @Property
+ private String obs;
+ @Property
+ private String sqrts;
+ @Property
+ private String beam;
+ @Property
+ private String targ;
+ @Property
+ private String fsp;
+ @Property
+ private String year;
+ @Property
+ private String auth;
+ @Property
+ private String ref;
+ @Property
+ private String exp;
+
+ @InjectPage
+ private Search _search;
+
+ @OnEvent(value="submit", component="search")
+ public Object onFormSubmit() {
+
+
+ if(reac != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "reac " + reac;
+ }
+ if(obs != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "obs " + obs;
+ }
+ if(sqrts != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "sqrts " + sqrts;
+ }
+ if(beam != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "beam " + beam;
+ }
+ if(targ != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "targ " + targ;
+ }
+ if(fsp != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "fsp " + fsp;
+ }
+ if(year != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "year " + year;
+ }
+ if(auth != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "auth " + auth;
+ }
+ if(ref != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "ref " + ref;
+ }
+ if(exp != null){
+ if( !query.equals("") ) { query = query + " and "; }
+ query = query + "exp " + exp;
+ }
+ try{
+ query = URLEncoder.encode(query,"UTF-8");
+ } catch(Exception ex){};
+// _search.setSearchString(query.replace(" ", "_"));
+ _search.setSearchString(query);
+ return _search;
+ }
}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ReactionPlot.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ReactionPlot.java Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ReactionPlot.java Thu Oct 29 12:40:08 2009 (r1300)
@@ -648,7 +648,7 @@
saveplot.setXId(getXId());
saveplot.setYscale(getYscale());
saveplot.setXscale(getXscale());
- saveplot.setSys(getSys());
+// saveplot.setSys(getSys());
saveplot.setQueryString(getQueryString());
nextPage=SavePlot.class;
}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Search.java Thu Oct 29 12:40:08 2009 (r1300)
@@ -48,6 +48,7 @@
query = q;
}
public String getSearchString() {
+ if(query == null) return "all records";
if(query.indexOf("?") > 0){
return query.substring(0,query.indexOf("?"));
}
@@ -87,6 +88,7 @@
@OnEvent(value="submit", component="searchagain")
public Object onFormSubmit() {
+ if(query == null) query = "all records";
try{
query = URLEncoder.encode(query,"UTF-8");
} catch(Exception ex){};
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/CombinedPlot.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/CombinedPlot.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/CombinedPlot.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -7,7 +7,7 @@
<h3> Composite Plots </h3>
<p>
This page displays the combined data plot with options to 'Replot' the data
- changing the X and Y axis types (log/lin). Other options can be entered as ';'
+ changing the X and Y axis types (log/lin). Other options (yheader,xheaader,scale(),sys) can be entered as ';'
separated name=value pairs.
</p>
@@ -23,7 +23,8 @@
<br/><a href='SavePlot?string=${getQueryString()}&list=all'>Back to the list of selected plots</a><br/>
</t:form>
- <table class="plotset">
+<!-- <table class="plotset"> -->
+ <table>
<tr>
<td width="50%">
<br/>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -9,7 +9,7 @@
<div class="navbar">
<a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> •
<a id="nav-review" href="reviews">Data Reviews</a> •
- <a id="nav-pdf" href="/new_pdf">Parton Density Functions</a> •
+ <a id="nav-pdf" href="/pdfs">Parton Density Functions</a> •
<a id="nav-feedback" href="feedback">Feedback</a>
</div>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -19,70 +19,69 @@
<td id="main" rowspan="2">
<h2> Reaction Database Form Search Interface </h2>
Database of Numerical HEP scattering cross sections
-<p/>
-<form method="GET" action="http://hepdata.cedar.ac.uk/hepdata/reactionquery">
-<!--<form method=GET action=http://h3:8080/hepdata-webapp/reactionquery>-->
-<input type="hidden" name="string" value="REACFORM"/>
-<input type="hidden" name="plength" value="10"/>
-<input type="hidden" name="start" value="1"/>
+
+<t:form t:id="search" action="search">
<table BORDER="0">
<tr>
<td align="right"><b>Reaction:</b> </td>
-<td align="left" colspan="3"><input type="text" name="reac" size="47"/></td>
+<td align="left" colspan="3"><input t:type="textfield" t:value="reac" size="47"/></td>
</tr>
<tr>
<td align="right"><b>Observable:</b> </td>
-<td align="left"><input type="text" name="obs" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="obs" size="15"/></td>
<td align="right"><b>SQRT(S)low:</b> </td>
-<td align="left"><input type="text" name="plab" size="15"/> GeV/c</td>
+<td align="left"><input t:type="textfield" t:value="sqrts" size="15"/> GeV/c</td>
</tr>
<tr>
<td align="right"><b>Beam:</b></td>
-<td align="left"><input type="text" name="beam" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="beam" size="15"/></td>
<td align="right"><b>Target:</b> </td>
-<td align="left"><input type="text" name="targ" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="targ" size="15"/></td>
</tr>
<tr>
<td align="right"><b>FSP:</b></td>
-<td align="left"><input type="text" name="fsp" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="fsp" size="15"/></td>
<td align="right"><b>Year:</b></td>
-<td align="left"><input type="text" name="year" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="year" size="15"/></td>
</tr>
<tr>
<td align="right"><b>First Author:</b></td>
-<td align="left"><input type="text" name="auth" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="auth" size="15"/></td>
<td align="right"><b>Reference:</b> </td>
-<td align="left"><input type="text" name="ref" size="15"/></td>
+<td align="left"><input t:type="textfield" t:value="ref" size="15"/></td>
</tr>
<tr>
<td align="right"></td><td align="right"><b>Experiment/Detector:</b></td>
-<td align="left"><input type="text" name="exp" size="9"/></td>
+<td align="left"><input t:type="textfield" t:value="exp" size="9"/></td>
</tr>
</table>
<input type="submit" value="search"/>
<input type="reset" value="clear"/>
-</form>
<p/>
<div id="formbar">
-<a href="/hepdata/search_help.shtml">Search Help</a> --
-<a href="/hepdata/search_results_help.shtml">Output Help</a> --
-<a href="/hepdata/new_reac.shtml">Standard Search</a> --
-<a href="/hepdata/browse.shtml">Browse Keywords</a> --
-<a href="/hepdata//about_reactions.shtml">About HepData</a> --
-<a href="/hepdata/submitting_data.shtml">Submitting Data</a>
+ <a href="#" t:type="pagelink" t:page="searchhelp">Search Help</a> ––
+ <a href="#" t:type="pagelink" t:page="outputhelp">Output Help</a> ––
+ <a href="#" t:type="pagelink" t:page="index">Standard Search</a> ––
+ <a href="#" t:type="pagelink" t:page="browse">Browse Keywords</a>
</div>
+</t:form>
+ <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>
</td>
<td>
-<div id="tip">
+<div class="searchtip">
<p>
The HepData Reaction Database has recently moved from its former hierarchical
@@ -92,17 +91,6 @@
Please send any comments or suggestions to <a HREF="mailto:m.r.whalley at durham.ac.uk">m.r.whalley at durham.ac.uk</a>
</p>
-<p>
-<center>
-<b>You are using this NEW HepData Reaction database</b>
-</center>
-</p>
-
-<p>
-If you really do still wish to use the OLD one, click <a href="/hepdata/reac_old.html">here</a>
-but be aware that this facility will eventually be withdrawn.
-</p>
-
</div>
</td>
@@ -111,19 +99,18 @@
<td id="linkstab">
-
-<div id="tip">
-<b>Predefined Event Shape/Jet Searches</b>
-<p>
-<ul>
-<li> <A HREF="http://hepdata.cedar.ac.uk/hepdata/reactionquery?string=EventShapes&plength=10&start=1"> Event Shapes </A> (Thrust, etc...)</li>
-<li> <A HREF="http://hepdata.cedar.ac.uk/hepdata/reactionquery?string=EventShapesEE&plength=10&start=1"> Event Shapes in E+ E- collisions</A></li>
-<li> <A HREF="http://hepdata.cedar.ac.uk/hepdata/reactionquery?string=EventShapesNotEE&plength=10&start=1"> Event Shapes in non-E+ E- collisions</A></li>
-<li> <A HREF="http://hepdata.cedar.ac.uk/hepdata/reactionquery?string=JetProduction&plength=10&start=1"> Jet production </A>(in any process)</li>
-<li> <A HREF="http://hepdata.cedar.ac.uk/hepdata/reactionquery?string=JetProductionEE&plength=10&start=1"> Jet production in E+E- collisions</A></li>
-<li> <A HREF="http://hepdata.cedar.ac.uk/hepdata/reactionquery?string=JetProductionNotEE&plength=10&samp;tart=1"> Jet production in non-E+E- collisions</A></li>
-</ul>
-</p>
+<div id="datareviewbox" class="searchlinkbox">
+ <h3>Predefined Event Shape/Jet Searches</h3>
+ <p>
+ <ul>
+ <li><a href="#" t:type="pagelink" t:page="search" t:context="literal:EventShapes">Event shapes</a> (thrust, etc...)</li>
+ <li><a href="#" t:type="pagelink" t:page="search" t:context="literal:EventShapesEE">Event shapes in e+e- collisions</a></li>
+ <li><a href="#" t:type="pagelink" t:page="search" t:context="literal:EventShapesNotEE">Event shapes in non-e+e- collisions</a></li>
+ <li><a href="#" t:type="pagelink" t:page="search" t:context="literal:JetProduction">Jet production</a> (in any process)</li>
+ <li><a href="#" t:type="pagelink" t:page="search" t:context="literal:JetProductionEE">Jet production in e+e- collisions</a></li>
+ <li><a href="#" t:type="pagelink" t:page="search" t:context="literal:JetProductionNotEE">Jet production in non-e+e- collisions</a></li>
+ </ul>
+ </p>
</div>
</td>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -16,7 +16,8 @@
<table>
<tr>
<td id="mainsearchcol">
- <h2>Reaction Database Search</h2>
+ <h2>Reaction Database Standard Search Interface</h2>
+ Database of Numerical HEP scattering cross sections
<t:form t:id="search" t:context="query" action="search">
Enter query:
<input t:type="textfield" t:value="query" name="q" size="50"/> <input type="submit" value="Search"/>
@@ -28,8 +29,8 @@
<p/>
<a href="#" t:type="pagelink" t:page="searchhelp">Search Help</a> ––
<a href="#" t:type="pagelink" t:page="outputhelp">Output Help</a> ––
+ <a href="#" t:type="pagelink" t:page="form">Form Search</a> ––
<a href="#" t:type="pagelink" t:page="browse">Browse Keywords</a>
- <!-- <a href="new_reacform.shtml">Form search</a> – -->
</span>
</t:form>
@@ -78,8 +79,8 @@
</table>
<div style="margin-top:1em; font-size: smaller;">
- <a href="/about_reactions.shtml">About HepData</a> –
- <a href="/submitting_data.shtml">Submitting your data to HepData</a>
+ <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/>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -3,15 +3,15 @@
<title>Durham REACTION DATABASE Oputput Help</title>
- <script language="javascript" type="text/javascript">
- function popitup(url){
- newwindow=window.open(url,'name','height=400,width=400,scrollbars=1');
- if(window.focus){ newwindow.focus()}
- return false;
- }
- </script>
<body class="reaction">
-<p/>
+
+ <div class="navbar">
+ <a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> •
+ <a id="nav-review" href="reviews">Data Reviews</a> •
+ <a id="nav-pdf" href="/pdfs">Parton Density Functions</a> •
+ <a id="nav-feedback" href="feedback">Feedback</a>
+ </div>
+
<table>
<tr>
<td>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -8,7 +8,7 @@
<div class="navbar">
<a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> •
<a id="nav-review" href="reviews">Data Reviews</a> •
- <a id="nav-pdf" href="/new_pdf">Parton Density Functions</a> •
+ <a id="nav-pdf" href="/pdfs">Parton Density Functions</a> •
<a id="nav-feedback" href="feedback">Feedback</a>
</div>
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 Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -9,25 +9,24 @@
<t:if test="numpapers">
(displaying <b>${starting}</b> to <b>${ending}</b>)
</t:if>
- </p>
- <t:form t:id="searchagain" t:context="query" action="search">
- Enter query:
- <input t:type="textfield" t:value="query" name="q" size="50"/>
- <input type="submit" value="Search again"/>
- </t:form>
-
- <p>
<t:if test="isMultiPage">
+
<a href="#" t:type="pagelink" t:page="search" t:context="firstcontext">First</a> |
<a href="#" t:type="pagelink" t:page="search" t:context="prevcontext">Previous</a> |
<a href="#" t:type="pagelink" t:page="search" t:context="nextcontext">Next</a> |
- <a href="#" t:type="pagelink" t:page="search" t:context="lastcontext">Last</a>
- <!-- <a href="search/${searchString}${prevQueryParameters}">Previous</a> | -->
- <!-- <a href="search/${searchString}${nextQueryParameters}">Next</a> | -->
- <!-- <a href="search/${searchString}${lastQueryParameters}">Last</a> | -->
+ <a href="#" t:type="pagelink" t:page="search" t:context="lastcontext">Last</a> |
+ <a href="#" t:type="pagelink" t:page="index">Home</a>
</t:if>
+
+
</p>
+ <t:form t:id="searchagain" t:context="query" action="search">
+ Enter query:
+ <input t:type="textfield" t:value="query" name="q" size="50"/>
+ <input type="submit" value="Search again"/>
+ </t:form>
+ <p/>
<div class="searchresultsbox">
<t:loop source="papers" value="paper">
@@ -86,4 +85,12 @@
</t:loop>
</div>
+ <t:if test="isMultiPage">
+
+ <a href="#" t:type="pagelink" t:page="search" t:context="firstcontext">First</a> |
+ <a href="#" t:type="pagelink" t:page="search" t:context="prevcontext">Previous</a> |
+ <a href="#" t:type="pagelink" t:page="search" t:context="nextcontext">Next</a> |
+ <a href="#" t:type="pagelink" t:page="search" t:context="lastcontext">Last</a>
+ </t:if>
+
</html>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml Wed Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -3,17 +3,17 @@
<title>Durham REACTION DATABASE Search Help</title>
- <script language="javascript" type="text/javascript">
- function popitup(url){
- newwindow=window.open(url,'name','height=400,width=400,scrollbars=1');
- if(window.focus){ newwindow.focus()}
- return false;
- }
- </script>
<body class="reaction">
-<p/>
+ <div class="navbar">
+ <a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> •
+ <a id="nav-review" href="reviews">Data Reviews</a> •
+ <a id="nav-pdf" href="/pdfs">Parton Density Functions</a> •
+ <a id="nav-feedback" href="feedback">Feedback</a>
+ </div>
+
+
<table>
<tr>
<td>
@@ -105,14 +105,14 @@
To date the topics covered in the Data Reviews are (with direct links):
<ul>
-<li><A HREF="/hepdata/online/f2/structindex.html"><b>Structure Functions in DIS</b></A></li>
-<li><A HREF="/hepdata/online/photon/photonindex.html"><b>Single Photon Production in Hadronic Interactions </b></A> </li>
-<li><A HREF="/hepdata/online/2gamma/2gammaindex.html"><b>Two-Photon Reactions leading to Hadron Final States</b></A> </li>
-<li><A HREF="/hepdata/online/dy/dyindex.html"><b>Drell-Yan cross sections</b></A></li>
-<li><A HREF="/hepdata/online/ee/eeindex.html"><b>Inclusive particle production data in e+e- Interactions</b></A></li>
-<li><A HREF="/hepdata/online/rsig/index.html"><b>Hadronic Total Cross Sections (R) in e+e- Interactions</b></A></li>
-<li><A HREF="/hepdata/online/neutrino/index.html"><b>Low Energy Neutrino Cross Sections </b></A></li>
-<li><A HREF="/hepdata/online/shapes/index.html"><b>Event Shapes in Lepton-Lepton and Lepton-Nucleon Interactions </b></A></li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/f2/structindex.html"><b>Structure Functions in DIS</b></A></li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/photon/photonindex.html"><b>Single Photon Production in Hadronic Interactions </b></A> </li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/2gamma/2gammaindex.html"><b>Two-Photon Reactions leading to Hadron Final States</b></A> </li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/dy/dyindex.html"><b>Drell-Yan cross sections</b></A></li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/ee/eeindex.html"><b>Inclusive particle production data in e+e- Interactions</b></A></li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/rsig/index.html"><b>Hadronic Total Cross Sections (R) in e+e- Interactions</b></A></li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/neutrino/index.html"><b>Low Energy Neutrino Cross Sections </b></A></li>
+<li><A HREF="http://durpdg.dur.ac.uk/hepdata/online/shapes/index.html"><b>Event Shapes in Lepton-Lepton and Lepton-Nucleon Interactions </b></A></li>
</ul>
<p/>
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 Oct 21 21:12:06 2009 (r1299)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml Thu Oct 29 12:40:08 2009 (r1300)
@@ -17,11 +17,6 @@
</h4>
</t:if>
- <p class="permalinks">
- Permalinks:
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaperContext">by HepData ID</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="spiresContext">by Spires ID</a>
- </p>
<p>
Experiment:
@@ -39,7 +34,6 @@
<div class="papercomments">
<t:displayPaperComments p="paper" />
</div>
-
<p>
<t:if test="longFormat">
<a href="#" t:type="pagelink" t:page="view" t:context="shortContext">View short record</a>
@@ -48,10 +42,10 @@
<a href="#" t:type="pagelink" t:page="view" t:context="baseContext">View full record</a>
</t:if>
<t:if test="paper.spiresId">
- | <a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+${paper.spiresId}">Spires record</a>
+ | <a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+${paper.spiresId}">View Spires record</a>
</t:if>
- | <a href="/saveplot?list=all"
- title="Show the datasets which have been selected for combined plotting">Currently selected plots</a>
+ | <a href="/saveplot?list=all"
+ title="Show the datasets which have been selected for combined plotting">View list of currently selected plots</a>
<!-- <t:if test="searchquery"> -->
<!-- | <a href="search?q=${searchquery}">Back to search...</a> -->
<!-- </t:if> -->
@@ -61,7 +55,7 @@
<a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>
<a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT</a>
<a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>
- </p>
+ </p>
<t:if test="showSys">
<div class="systematics">
@@ -114,4 +108,9 @@
</t:parameter>
</t:if>
+ <p class="permalinks">
+ Permalinks:
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaperContext">by HepData ID</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="spiresContext">by Spires ID</a>
+ </p>
</html>
More information about the HepData-svn
mailing list
|