|
[HepData-svn] r1318 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/pages resources/cedar/hepdata/webapp/components resources/cedar/hepdata/webapp/pages webappblackhole at projects.hepforge.org blackhole at projects.hepforge.orgWed Nov 25 15:49:14 GMT 2009
Author: whalley Date: Wed Nov 25 15:49:13 2009 New Revision: 1318 Log: more tweaks towards final HepData replacement Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/OtherHEPResources.java trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OtherHEPResources.tml Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/components/Layout.tml trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browse.tml trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browsing.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/Pdfs.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/SubmittingData.tml trunk/hepdata-webapp/src/main/webapp/hepdata.css Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/OtherHEPResources.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/OtherHEPResources.java Wed Nov 25 15:49:13 2009 (r1318) @@ -0,0 +1,12 @@ +package cedar.hepdata.webapp.pages; + +import java.util.Date; + +import org.apache.tapestry5.*; +import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.ioc.annotations.*; +import org.apache.tapestry5.services.*; + + +public class OtherHEPResources { +} Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/components/Layout.tml ============================================================================== --- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/components/Layout.tml Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/components/Layout.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -12,9 +12,30 @@ <a href="#" t:type="pagelink" t:page="index">The Durham HepData Project</a> <!-- HepData Reaction Database --> </h1> + <div class="navbar"> + <a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> • + <a href="#" id="nav-review" t:type="pagelink" t:page="reviews">Data Reviews</a> • + <a href="#" id="nav-pdf" t:type="pagelink" t:page="pdfs">Parton Distribution Function Server</a> • + <a href="#" id="nav-resources" t:type="pagelink" t:page="otherhepresources">Other HEP Resources</a> + </div> <t:body/> + <div class="navbar_lower"> + <table width="100%"> + <tr> + <td align="left"> + HepData also maintains the UK mirrors of: + <a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> + & + <a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> + </td> + <td align="right"> + <a href="#" id="nav-feedback" t:type="pagelink" t:page="feedback">Contact Us</a> + </td> + </tr> + </table> + </div> <div class="credits"> <a href="http://www.scitech.ac.uk"> <img alt="STFC" style="float:right; margin:0 1em;" src="${asset:context:stfc-small.jpg}"/> Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml ============================================================================== --- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -4,12 +4,6 @@ <title>Durham REACTION DATABASE Search</title> <body class="reaction"> - <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> @@ -31,13 +25,6 @@ </tr> </table> - <div class="navbar_lower"> - HepData also maintains the UK mirrors of: - <a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> - & - <a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> - </div> - </body> </html> Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browse.tml ============================================================================== --- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browse.tml Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browse.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -5,12 +5,6 @@ <title>Durham REACTION DATABASE Browsing</title> <body class="reaction"> - <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> @@ -47,13 +41,6 @@ </table> <p/> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -& -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browsing.tml ============================================================================== --- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browsing.tml Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browsing.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -4,13 +4,6 @@ <title>Durham REACTION DATABASE Browsing</title> <body class="reaction"> - <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> - <p/> @@ -43,12 +36,5 @@ </tr> </table> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -& -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> </html> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -6,13 +6,6 @@ <body class="feedback"> - <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> - <form method="POST" action="http://durpdg.dur.ac.uk/cgi-bin/hepdata/feedback"> <p> Enter any comments or suggestions about the HEPDATA databases you may have @@ -29,13 +22,6 @@ </p> </form> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -& -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> </html> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -5,13 +5,6 @@ <body class="reaction"> - <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> @@ -120,13 +113,6 @@ </tr> </table> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -& -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -6,13 +6,6 @@ <body class="reaction"> - <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 id="mainsearchcol"> @@ -85,13 +78,6 @@ </div> <br/> - <div class="navbar_lower"> - HepData also maintains the UK mirrors of: - <a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> - & - <a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> - </div> - </body> </html> Added: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OtherHEPResources.tml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OtherHEPResources.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -0,0 +1,61 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> + +<title>OtherHEPResrouces</title> + +<body class="resources"> + +<h2><b>Other HEP Resources</b></h2> + + +<img align="top" src="${asset:context:/bullet.gif}"/> +<a href="http://www.ippp.dur.ac.uk/HEPCODE/"><b>The HEPCODE Package</b></a> + with links to many event generator/MC programmes (being developed)!. + +<p/> +<img align="top" src="${asset:context:/bullet.gif}"/> +The <font color="blue">QCD-Pegasus Parton Distribution Evolution</font> package of Andreas Vogt -see +<a href="http://arxiv.org/abs/hep-ph/0408244">hep-ph/0408244</a>. +<br/>Download <a href="/pdflib/pegasus/manual.ps">manual.ps</a> and full code as +<a href="/pdflib/pegasus/pegasus.tar.gz">pegasus.tar.gz</a> + +<p/> +<img align="top" src="${asset:context:/bullet.gif}"/> +<a href="http://www.hep.phy.cam.ac.uk/theory/webber/MCatNLO/"><b>The MC at NLO Package</b></a> of Frixione and Webber. + + +<p/> +<img align="top" src="${asset:context:/bullet.gif}"/> +<a href="/hepdata/dvcs.html"><b>DVCS and Generalised Parton Distributions at NLO</b></a> - DVCS code of McDermott and Freund. + + +<p/><img align="top" src="${asset:context:/bullet.gif}"/><a href="http://www.pv.infn.it/~radici/FFdatabase/"><b> Fragmentation Function database site</b></a> +of Marco Radici + +<p/><img align="top" src="${asset:context:/bullet.gif}"/><a href="http://sophia.ecm.ub.es/f2neural/"><b> Neural Network PDF parametrisation</b></a> - Neural Network Parametrisation of S.Forte et al. + (see <a href="http://arxiv.org/abs/hep-ph/0204232">hep-ph/0204232)</a> + +<p/><img align="top" src="${asset:context:/bullet.gif}"/><a href="http://wwwlapp.in2p3.fr/lapth/PHOX_FAMILY/main.html"><b> The PHOX family of +programs </b></a> - NLO programs (partonic event generators) to compute + large p_T cross sections involving photons, hadrons and jets. + + + +<p/><img align="top" src="${asset:context:/bullet.gif}"/> +<a href="http://hep.pa.msu.edu/resum/">ResBos etc.</a>, +the new <a href="http://hep.pa.msu.edu/resum/">Transverse momentum resummation portal</a> + at MSU. + + + +<p/><img align="top" src="${asset:context:/bullet.gif}"/><a href="http://www.cedar.ac.uk/jetweb/"><b> JetWeb </b></a> Automated Data Comparison for +HEP (Jon Butterworth et al.). + + + + +<p/> + +</body> + +</html> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -5,13 +5,6 @@ <body class="reaction"> - <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> @@ -56,13 +49,6 @@ </tr> </table> <p/> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -and -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Pdfs.tml ============================================================================== --- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Pdfs.tml Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Pdfs.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -5,13 +5,6 @@ <body class="pdf"> - <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 id="main"> @@ -192,16 +185,6 @@ </tr> </table> -<div class="navbar_lower"> - -</div> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -& -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -1,3 +1,4 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> @@ -5,13 +6,6 @@ <body class="review"> - <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 id="main"> @@ -65,13 +59,6 @@ </tr> </table> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -& -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> </html> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -14,7 +14,7 @@ <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="#" t:type="pagelink" t:page="search" t:context="lastcontext">Last</a> </t:if> 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 Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SearchHelp.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -6,14 +6,6 @@ <body class="reaction"> - <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> @@ -124,13 +116,6 @@ </tr> </table> -<div class="navbar_lower"> -HepData also maintains the UK mirrors of: -<a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> -and -<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> -</div> - </body> </html> Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml ============================================================================== --- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml Wed Nov 25 15:49:13 2009 (r1318) @@ -4,13 +4,6 @@ <body class="reaction"> - <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> @@ -31,13 +24,6 @@ </tr> </table> - <div class="navbar_lower"> - HepData also maintains the UK mirrors of: - <a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a> - & - <a href="http://durpdg.dur.ac.uk/lbl/">PDG</a> - </div> - </body> </html> Modified: trunk/hepdata-webapp/src/main/webapp/hepdata.css ============================================================================== --- trunk/hepdata-webapp/src/main/webapp/hepdata.css Tue Nov 24 10:43:02 2009 (r1317) +++ trunk/hepdata-webapp/src/main/webapp/hepdata.css Wed Nov 25 15:49:13 2009 (r1318) @@ -334,8 +334,6 @@ } - - body.review div.navbar a#nav-review { margin:0em; padding:5px 5px 5px 5px; @@ -349,3 +347,17 @@ body.review div.navbar a:hover#nav-review{ color:#695; } + +body.resources div.navbar a#nav-resources { + margin:0em; + padding:5px 5px 5px 5px; + background-color:#dfcedf; + color:#666; +} +body.resources div.navbar a#nav-resources:visited{ + color:#666; +} + +body.resources div.navbar a:hover#nav-resources{ + color:#695; +}
More information about the HepData-svn mailing list |