|
|
[HepData-svn] r1299 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/components java/cedar/hepdata/webapp/pages resources/cedar/hepdata/webapp/components resources/cedar/hepdata/webapp/pages webapp
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Oct 21 21:12:06 BST 2009
Author: whalley
Date: Wed Oct 21 21:12:06 2009
New Revision: 1299
Log:
more improvements/additions
Added:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Feedback.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Pdfs.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Reviews.java
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/Pdfs.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml
trunk/hepdata-webapp/src/main/webapp/IoP.gif (contents, props changed)
Modified:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/components/Layout.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/CombinedPlot.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Plot.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
trunk/hepdata-webapp/src/main/webapp/hepdata.css
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -382,7 +382,7 @@
writer.element("a");
writer.attributes("href", baseurl + "/saveplot?string=" + getSearchString() + "&plot=" + _dataset.getPaper().getId() + "ds" + _dataset.getId() + "ya" + iy);
writer.attributes("title", "Add this table to the list for combined plotting");
- writer.write("Select plot");
+ writer.write("SelectPlot");
writer.end();
writer.end(); //td
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/ReactionPlotWords.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -198,12 +198,29 @@
writer.write(" | ");
writer.element("a");writer.attributes("href", baseurl + "/plot" + urlxlog + "/ylog" + _yaxis.getId());writer.write("xlog-ylog");writer.end();
writer.element("br");writer.end();
+ writer.element("br");writer.end();
+
+ writer.write("Selected Plots: ");
+ writer.element("a");writer.attributes("href", baseurl + "/saveplot?list=all");
+ writer.write("show list ");writer.end();
+ writer.write(" | ");
+
+ writer.element("a");writer.attributes("href", baseurl + "/saveplot?string=null&plot=" + _yaxis.getPaper().getHepdataId() + "ds" + _yaxis.getDataset().getId() + "ya" + _yaxis.getId());
+ writer.write("add this plot to list");writer.end();
+
+
+
+
+ writer.element("br");writer.end();
+ writer.element("br");writer.end();
+
writer.write("Go back to: ");
writer.element("a");writer.attributes("href", baseurl + "/view" + urlpaper);writer.write("paper");writer.end();
writer.write(" | ");
writer.element("a");writer.attributes("href", baseurl + "/view" + urldataset);writer.write("dataset");writer.end();
writer.write(" | ");
writer.element("a");writer.attributes("href", baseurl + "/index");writer.write("search box");writer.end();
+
}
@Parameter(name="yaxis")
private YAxis _yaxis;
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/CombinedPlot.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -86,42 +86,20 @@
@Inject
private org.hibernate.Session _session;
-// private List <String> _scalefactors = new ArrayList();
- @Persist
- private List <String> _scalefactors;
- public void setScaleFactors(List scalefactors){
- this._scalefactors=scalefactors;
-// System.out.println("CombinedPlot:setScaleFactors: " + this._scalefactors);
- }
- public List <String> getScaleFactors(){ return _scalefactors;}
-
-// private List <String> _saved = new ArrayList();
@Persist
private List <String> _saved;
public void setSavedList(List saved){
this._saved=saved;
-// System.out.println("CombinedPlot:setSavedList: " + this._saved);
}
public List <String> getSavedList(){
-// System.out.println("CombinedPlot:getSavedList: " + this._saved);
return this._saved;
}
-// @SetupRender
-// void setupRender(){
-// System.out.println("setupRender()");
-// _scalefactors = new ArrayList<String>();
-// _saved = new ArrayList();
-// count = 0;
-// }
-
@Persist
private String xid;
public String getXId(){return xid;}
public void setXId(String xid){
- this.xid = xid;
-// System.out.println("CombinedPlot:setXId: " + this.xid);
-
+ this.xid = xid;
}
private static YAxis _yaxis;
@@ -133,7 +111,6 @@
public String getXscale(){return xscale;}
public void setXscale(String xscale){
this.xscale = xscale;
-// System.out.println("CombinedPlot:setXscale: " + this.xscale);
}
@Persist
@@ -141,93 +118,113 @@
public String getQueryString(){return querystring;}
public void setQueryString(String querystring){
this.querystring = querystring;
-// System.out.println("CombinedPlot:setQueryString: " + this.querystring);
}
-// @Persist
-// private String scalefactor;
-// public String getScaleFactor(){return scalefactor;}
-// public void setScaleFactor(String scalefactor){this.scalefactor = scalefactor;}
-
-
- @Persist
- private String sys;
- public String getSys(){return sys;}
- public void setSys(String sys){this.sys = sys;}
-
@Persist
private String yscale;
public String getYscale(){
-// return _reqGlobals.getRequest().getParameter("yscale");
return yscale;
}
public void setYscale(String yscale){
this.yscale = yscale;
-// System.out.println("CombinedPlot:setYscale: " + this.yscale);
}
-
private Paper _paper=null;
public List <YAxis> getYAxes(){
List <YAxis> _selected = new ArrayList();
-// System.out.println("getYAxis");
-// System.out.println("getSavedList: " + getSavedList());
for (String saved : getSavedList()){
- int i1 = saved.indexOf("d");
- String hepid = saved.substring(4,i1);
- int i2 = saved.indexOf("y");
- String dsid = saved.substring(i1+2,i2);
- String yid = saved.substring(i2+2);
- Query q=null;
- q = _session.createQuery("select distinct p from Paper p where p._hepdataId = " + hepid);
- _paper = (Paper) q.uniqueResult();
- _selected.add(_paper.getDataset(Integer.parseInt(dsid)).getYAxis(Integer.parseInt(yid)));
- }
-
- return _selected;
+ int i1 = saved.indexOf("d");
+ String hepid = saved.substring(4,i1);
+ int i2 = saved.indexOf("y");
+ String dsid = saved.substring(i1+2,i2);
+ String yid = saved.substring(i2+2);
+ Query q=null;
+ q = _session.createQuery("select distinct p from Paper p where p._hepdataId = " + hepid);
+ _paper = (Paper) q.uniqueResult();
+ _selected.add(_paper.getDataset(Integer.parseInt(dsid)).getYAxis(Integer.parseInt(yid)));
+ }
+ return _selected;
}
@Persist
- private String xheader;
- public String getXheader(){ return xheader; }
- public void setXheader(String xheader) {this.xheader=xheader;}
-
- at Persist
- private String yheader;
- public String getYheader(){ return yheader; }
- public void setYheader(String yheader) {this.yheader=yheader;}
-
- at Persist
- static private String pdfname;
- public String getPdfName(){
- return pdfname;
- }
- public void setPdfName(String pdfname){
-// System.out.println("Setting pdf name to be " + pdfname);
- this.pdfname = pdfname;
- }
-
- static private String _pdfselect;
- public String getPdfSelect(){
-// return _reqGlobals.getRequest().getParameter("pdfselect");
- return _pdfselect;
- }
- public void setPdfSelect(String pdfselect){this._pdfselect = pdfselect;}
-// public String setPdfSelect(){
-// _pdfselect = getPdfSelect();
-// return "";
-// }
+ private String optionstring;
+ public String getOptionstring(){ return optionstring; }
+ public void setOptionstring(String optionstring) {this.optionstring=optionstring;}
+ private String OptionHasYheader(){
+ String rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("yheader") > -1){
+ String yh = optionstring.substring(optionstring.indexOf("yheader"));
+ int len = yh.length();
+ if(yh.indexOf(";") > -1) len = yh.indexOf(";");
+ rtn = yh.substring(8,len);
+ }
+ }
+ return rtn;
+ }
+ private String OptionHasXheader(){
+ String rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("xheader") > -1){
+ String xh = optionstring.substring(optionstring.indexOf("xheader"));
+ int len = xh.length();
+ if(xh.indexOf(";") > -1) len = xh.indexOf(";");
+ rtn = xh.substring(8,len);
+ }
+
+ }
+ return rtn;
+ }
+ private String OptionHasPdf(){
+ String rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("pdf") > -1){
+ String ph = optionstring.substring(optionstring.indexOf("pdf"));
+ int len = ph.length();
+ if(ph.indexOf(";") > -1) len = ph.indexOf(";");
+ rtn = ph.substring(4,len);
+ }
+
+ }
+ return rtn;
+ }
+
+ private String OptionHasSys(){
+ String rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("sys") > -1){
+ String sh = optionstring.substring(optionstring.indexOf("sys"));
+ int len = sh.length();
+ if(sh.indexOf(";") > -1) len = sh.indexOf(";");
+ rtn = sh.substring(4,len);
+ }
+
+ }
+ return rtn;
+ }
+
+ private Double OptionHasScale(int n){
+ Double rtn = null;
+ if(optionstring != null){
+ if(optionstring.indexOf("scale(" + n + ")") > -1){
+ String sh = optionstring.substring(optionstring.indexOf("scale(" + n + ")"));
+ int len = sh.length();
+ if(sh.indexOf(";") > -1) len = sh.indexOf(";");
+ if( len > 9) rtn = Double.valueOf(sh.substring(9,len));
+ }
+ }
+ return rtn;
+ }
@Persist
-// private int count=0;
private int count;
public int getCount(){
- return count;
+ return count;
}
public String zeroCount(){
count=0;
- return "";
+ return "";
}
public String addCount(){
count += 1;
@@ -242,7 +239,6 @@
public String setTitleStringBlank(){
titlestring="";
-// return "zeroed titlrestring";
return "";
}
@@ -256,50 +252,40 @@
//-----------------------------------------getChart3()
public Link getChart3(){
-// System.out.println("This is chart3");
if (numberRun > 10000) {
numberRun=0;
}
int numberRunStart = numberRun;
-// System.out.println("numberRun: " + numberRun);
XYIntervalSeries series1 = null;
int count = 0;
-// System.out.println("getYAxis size: " + getYAxes().size());
for (YAxis ya : getYAxes()){
numberRun +=1;
- count += 1;
-
-// System.out.println("new scalefactor is " + _scalefactors.get(count-1));
- double _sf = Double.valueOf(_scalefactors.get(count-1));
-
-// double _sf = 1.0;
-// if(getScaleFactor() != null){
-// String words[] = getScaleFactor().split(",");
-// for (int i=0; i<words.length; i++){
-// int i1=words[i].indexOf(":");
-// if(Integer.parseInt(words[i].substring(0,i1)) == count){
-// _sf = Double.valueOf(words[i].substring(i1+1));
-// System.out.println("setting scale factor " + count + " " + _sf);
-// }
-// }
-// }
-
- series1 = getDataSeries(ya,Integer.parseInt(getXId()),getXscale(),getYscale(),_sf,true);
+ count += 1;
+ double _sf = Double.valueOf("1.0");
+ if(optionstring != null){
+ if(OptionHasScale(count) != null){ _sf = OptionHasScale(count);}
+ }
+ Boolean syst = true;
+ if(optionstring != null){
+ if(OptionHasSys() != null){
+ if(OptionHasSys().equals("no")){ System.out.println("setting system to false"); syst = false; }
+ }
+ }
+ series1 = getDataSeries(ya,Integer.parseInt(getXId()),getXscale(),getYscale(),_sf,syst);
seriesMap.put(numberRun,series1);
- String xh = ya.getDataset().getXAxis(1).getHeader();
- if(xheader != null){ xh = xheader; }
- if(xh.endsWith("IN MEV")){
- xh = xh.replace("IN MEV","IN GEV");
+ String xh = ya.getDataset().getXAxis(1).getHeader();
+ if(OptionHasXheader() != null){ xh = OptionHasXheader(); }
+ if(xh.endsWith("IN MEV")){
+ xh = xh.replace("IN MEV","IN GEV");
+ }
+ xLabelMap.put(numberRun,xh);
+ String yh = ya.getHeader();
+ if(OptionHasYheader() != null){ yh = OptionHasYheader(); }
+ yLabelMap.put(numberRun,yh);
}
- xLabelMap.put(numberRun,xh);
- String yh = ya.getHeader();
- if(yheader != null) { yh = yheader; }
- yLabelMap.put(numberRun,yh);
- }
int number = numberRun-numberRunStart;
String xsize = "500";
String ysize = "500";
-// String ysize = Integer.toString(400+number*100);
return _resources.createActionLink("chart", false, new Object[]{xsize,ysize,numberRunStart,number,getXscale(),getYscale()});
}
@@ -308,13 +294,11 @@
private int keycount = 0;
public String zeroKeyCount(){
keycount=0;
- return "";
+ return "";
}
public XYIntervalSeries getDataSeries(YAxis yaxis,int xid, String xscale,String yscale,double factor, Boolean systematics){
XAxis _xaxis = yaxis.getDataset().getXAxis(xid);
keycount += 1;
-
-
int n = 0;
String _firstauthor = "";
Paper paper = yaxis.getDataset().getPaper();
@@ -335,88 +319,78 @@
String _firstpublished = "Not Published";
String _firstpreprint = "Not Preprinted";
for (Reference ref : paper.getReferences()){
- String refdesc = ref.getDescription();
- if(ref.getType().equals("JOUR")){
- if(n1 == 0) { _firstpublished = refdesc; n1 += 1;}
- }
- else{
- if(n2 == 0) { _firstpreprint = refdesc; n2 += 1;}
- }
+ String refdesc = ref.getDescription();
+ if(ref.getType().equals("JOUR")){
+ if(n1 == 0) { _firstpublished = refdesc; n1 += 1;}
+ }
+ else{
+ if(n2 == 0) { _firstpreprint = refdesc; n2 += 1;}
+ }
}
-
- if(_firstpublished.equals("Not Published")){ _firstpublished = _firstpreprint;}
-// titlestring=titlestring.concat("\n" + keycount + " " + yaxis.getDataset().getId().toString() + "/" + yaxis.getId().toString());
+ if(_firstpublished.equals("Not Published")){ _firstpublished = _firstpreprint;}
titlestring=titlestring.concat("\n" + keycount + " - " + _firstauthor + " - " + _firstpublished);
-
for (String comment : yaxis.getDataset().getComments()){
- if(comment.startsWith("Location:")){
- titlestring=titlestring.concat(" - " + comment.substring(10));
- }
- else{
+ if(comment.startsWith("Location:")){
+ titlestring=titlestring.concat(" - " + comment.substring(10));
+ }
+ else{
caption=comment;
- }
+ }
}
- if(!_scalefactors.get(keycount-1).equals("1.0")) {
- titlestring=titlestring.concat(" (x" + _scalefactors.get(keycount-1) + ")");
- }
XYIntervalSeries series = new XYIntervalSeries(" ");
-// if(!systematics){series.setKey(caption);}
-// series.setKey(caption);
-// series.setKey(yaxis.getDataset().getId().toString() + "/" + yaxis.getId().toString());
- series.setKey(keycount);
- for (int ip=1; ip<=yaxis.getPoints().size(); ip++){
+ series.setKey(keycount);
+ for (int ip=1; ip<=yaxis.getPoints().size(); ip++){
try{
- double y = yaxis.getPoint(ip).getValue();
- double eplus = 0.0;
- double eminus = 0.0;
- for (Uncertainty e : yaxis.getPoint(ip).getErrors()){
- Boolean use = true;
- if(e.getSourceType().toString().equals("systematic") && !systematics) { use = false; }
- if(use) {
- if(e.getNormType() == ErrorNorm.PCT){
- eplus = eplus + (y*e.getPlus()/100.0)*(y*e.getPlus()/100.0);
- eminus = eminus + (y*e.getMinus()/100.0)*(y*e.getMinus()/100.0);
- }
- else{
- eplus = eplus + e.getPlus()*e.getPlus();
- eminus = eminus - e.getMinus()*e.getMinus();
- }
- }
- }
- eplus = Math.sqrt(eplus);
- eminus = Math.sqrt(eminus);
- double yhigh = y + eplus;
- double ylow = y - eplus;
- y = y*factor;
- yhigh = yhigh*factor;
- ylow = ylow*factor;
+ double y = yaxis.getPoint(ip).getValue();
+ double eplus = 0.0;
+ double eminus = 0.0;
+ for (Uncertainty e : yaxis.getPoint(ip).getErrors()){
+ Boolean use = true;
+ if(e.getSourceType().toString().equals("systematic") && !systematics) { use = false; }
+ if(use) {
+ if(e.getNormType() == ErrorNorm.PCT){
+ eplus = eplus + (y*e.getPlus()/100.0)*(y*e.getPlus()/100.0);
+ eminus = eminus + (y*e.getMinus()/100.0)*(y*e.getMinus()/100.0);
+ }
+ else{
+ eplus = eplus + e.getPlus()*e.getPlus();
+ eminus = eminus - e.getMinus()*e.getMinus();
+ }
+ }
+ }
+ eplus = Math.sqrt(eplus);
+ eminus = Math.sqrt(eminus);
+ double yhigh = y + eplus;
+ double ylow = y - eplus;
+ y = y*factor;
+ yhigh = yhigh*factor;
+ ylow = ylow*factor;
- double x;
- double xhigh;
- double xlow;
- if(_xaxis.getBin(ip).getLowValue() != null && _xaxis.getBin(ip).getHighValue() != null){
- x = (_xaxis.getBin(ip).getLowValue()+_xaxis.getBin(ip).getHighValue())/2;
- xlow = _xaxis.getBin(ip).getLowValue();
- xhigh = _xaxis.getBin(ip).getHighValue();
- }
- else{
- x = _xaxis.getBin(ip).getFocus();
- xhigh = _xaxis.getBin(ip).getFocus();
- xlow = _xaxis.getBin(ip).getFocus();
- }
- if(_xaxis.getHeader().endsWith("IN MEV")){
- x = x/1000.0;
- xhigh = xhigh/1000.0;
- xlow = xlow/1000.0;
- }
- if(xscale.equals("lin") && yscale.equals("lin") ) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
- if(xscale.equals("log") && yscale.equals("lin") && xlow > 0.0 ) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
- if(xscale.equals("lin") && yscale.equals("log") && ylow > 0.0 ) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
- if(xscale.equals("log") && yscale.equals("log") && ylow > 0.0 && xlow > 0.0) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
-// System.out.println("series:"+ series);
- } catch(Exception e){}
+ double x;
+ double xhigh;
+ double xlow;
+ if(_xaxis.getBin(ip).getLowValue() != null && _xaxis.getBin(ip).getHighValue() != null){
+ x = (_xaxis.getBin(ip).getLowValue()+_xaxis.getBin(ip).getHighValue())/2;
+ xlow = _xaxis.getBin(ip).getLowValue();
+ xhigh = _xaxis.getBin(ip).getHighValue();
+ }
+ else{
+ x = _xaxis.getBin(ip).getFocus();
+ xhigh = _xaxis.getBin(ip).getFocus();
+ xlow = _xaxis.getBin(ip).getFocus();
+ }
+ if(_xaxis.getHeader().endsWith("IN MEV")){
+ x = x/1000.0;
+ xhigh = xhigh/1000.0;
+ xlow = xlow/1000.0;
+ }
+ if(xscale.equals("lin") && yscale.equals("lin") ) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
+ if(xscale.equals("log") && yscale.equals("lin") && xlow > 0.0 ) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
+ if(xscale.equals("lin") && yscale.equals("log") && ylow > 0.0 ) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
+ if(xscale.equals("log") && yscale.equals("log") && ylow > 0.0 && xlow > 0.0) {series.add(x,xlow,xhigh,y,ylow,yhigh);}
+ } catch(Exception e){}
}
- return series;
+ return series;
}
//-----------------------------------------onChart(..................)
@@ -428,43 +402,40 @@
double ylow = 1000000.0;
double yhigh = -1000000.0;
for (int n=1; n<=number; n++){
-
XYIntervalSeries series = (XYIntervalSeries) seriesMap.get(numberRunStart+n);
int nitems = series.getItemCount();
for (int nn=0; nn<nitems; nn++){
- if(series.getXLowValue(nn) < xlow){ xlow = series.getXLowValue(nn);};
- if(series.getXHighValue(nn) > xhigh){ xhigh = series.getXHighValue(nn);};
- if(series.getYLowValue(nn) < ylow){ ylow = series.getYLowValue(nn);};
- if(series.getYHighValue(nn) > yhigh){ yhigh = series.getYHighValue(nn);};
+ if(series.getXLowValue(nn) < xlow){ xlow = series.getXLowValue(nn);};
+ if(series.getXHighValue(nn) > xhigh){ xhigh = series.getXHighValue(nn);};
+ if(series.getYLowValue(nn) < ylow){ ylow = series.getYLowValue(nn);};
+ if(series.getYHighValue(nn) > yhigh){ yhigh = series.getYHighValue(nn);};
}
seriesMap.remove(numberRunStart+n);
collection.addSeries(series);
}
- xlow = xlow - 0.05*(xhigh-xlow);
+ xlow = xlow - 0.05*(xhigh-xlow);
xhigh = xhigh + 0.05*(xhigh-xlow);
- ylow = ylow - 0.05*(yhigh-ylow);
+ ylow = ylow - 0.05*(yhigh-ylow);
yhigh = yhigh + 0.05*(yhigh-ylow);
if(xlow == xhigh){
- xlow = 0.90*xlow;
- xhigh= 1.10*xhigh;
+ xlow = 0.90*xlow;
+ xhigh = 1.10*xhigh;
}
IntervalXYDataset data1 = collection;
-// final XYItemRenderer renderer1 = new XYErrorRenderer();
final XYErrorRenderer renderer1 = new XYErrorRenderer();
renderer1.setCapLength(3);
- //.out.println("xlow: " + xlow + " xhigh: " + xhigh);
final Range rangex = new Range(xlow,xhigh);
final Range rangey = new Range(ylow,yhigh);
NumberAxis rangeAxisX = null;
if(_xscale.equals("lin")){
- rangeAxisX = new NumberAxis();
+ rangeAxisX = new NumberAxis();
rangeAxisX.setRange(rangex);
- } else{
+ } else{
LogarithmicAxis logaxistemp = new LogarithmicAxis("header");
- rangeAxisX = logaxistemp;
- }
+ rangeAxisX = logaxistemp;
+ }
try {
String xlabel = (String) xLabelMap.get(numberRunStart+1);
rangeAxisX.setLabel(xlabel);
@@ -472,19 +443,14 @@
catch(Exception e){
rangeAxisX.setLabel("xaxis label ?");
}
-// rangeAxisX.setAutoRangeIncludesZero(false);
- NumberAxis rangeAxisY = null;
+ NumberAxis rangeAxisY = null;
if(_yscale.equals("lin")) {
- rangeAxisY = new NumberAxis();
- rangeAxisY.setRange(rangey);
- } else{
- LogarithmicAxis logaxistemp = new LogarithmicAxis(_yaxis.getHeader());
-// LogarithmicAxis logaxistemp = new LogarithmicAxis("abc");
-// logaxistemp.setAllowNegativesFlag(true);
-// logaxistemp.setStrictValuesFlag(false);
-// logaxistemp.setAutoRangeNextLogFlag(true);
- rangeAxisY = logaxistemp;
+ rangeAxisY = new NumberAxis();
+ rangeAxisY.setRange(rangey);
+ } else{
+ LogarithmicAxis logaxistemp = new LogarithmicAxis(_yaxis.getHeader());
+ rangeAxisY = logaxistemp;
}
try{
String ylabel = (String) yLabelMap.get(numberRunStart+1);
@@ -496,72 +462,49 @@
final XYPlot subplot1 = new XYPlot(data1, rangeAxisX, rangeAxisY, renderer1);
final TextTitle title = new TextTitle(titlestring);
title.setTextAlignment(HorizontalAlignment.LEFT);
-// Boolean showLegend = (ys.size() > 1);
Boolean showLegend = (true);
-// subplot1.setBackgroundPaint(null);
final JFreeChart chart = new JFreeChart("", new Font("Serif", Font.PLAIN, 12), subplot1, showLegend);
-// final JFreeChart chart = new JFreeChart(subplot1);
chart.setBackgroundPaint(new Color(255,255,255,0));
-// chart.addSubtitle(title);
- System.out.println("pdfselect: " + _pdfselect + " pdfname: " + pdfname);
- if(_pdfselect != null && _pdfselect.equals("Save")){
- if(pdfname != null && !pdfname.equals("")){
- File filename = new File(pdfname);
+ if(optionstring != null){
+ if(OptionHasPdf() != null){
+ File filename = new File(OptionHasPdf());
try {
- saveChartAsPDF(filename, chart, 500, 500);
-// saveChartAsPDF( filename, chart, Integer.parseInt(_pdfwidth), Integer.parseInt(_pdfheight) );
- } catch (IOException ie) {
- //
- }
- }
+ saveChartAsPDF(filename, chart, 500, 500);
+ } catch (IOException ie) {}
+ }
}
String spng = "png";
ImageFormat format = ImageFormat.valueOf(spng.toUpperCase());
return Plotter.makeChartStreamResponse(chart, format, width,height);
-
-
-// return new StreamResponse(){
-// public String getContentType(){
-// return "image/jpeg";
-// }
-// public InputStream getStream() throws IOException {
-// BufferedImage image = chart.createBufferedImage(width, height);
-// ByteArrayOutputStream byteArray = new ByteArrayOutputStream() ;
-// ChartUtilities.writeBufferedImageAsJPEG(byteArray, image) ;
-// return new ByteArrayInputStream(byteArray.toByteArray());
-// }
-// public void prepareResponse(Response response){}
-// };
}
public static void saveChartAsPDF(File file,
JFreeChart chart,
int width,
int height) throws IOException{
- OutputStream out = new BufferedOutputStream(new FileOutputStream(file));
- writeChartAsPDF(out, chart, width, height);
- out.close();
+ OutputStream out = new BufferedOutputStream(new FileOutputStream(file));
+ writeChartAsPDF(out, chart, width, height);
+ out.close();
}
public static void writeChartAsPDF(OutputStream out,
JFreeChart chart,
int width, int height) throws IOException{
- Rectangle pagesize = new Rectangle(width,height);
- Document document = new Document(pagesize, 50, 50, 50, 50);
- try {
- PdfWriter writer = PdfWriter.getInstance(document, out);
- document.addAuthor("JFreeChart");
- document.open();
- PdfContentByte cb = writer.getDirectContent();
- Graphics2D g2 = cb.createGraphics(width, height);
- Rectangle2D r2D = new Rectangle2D.Double(0, 0, width, height);
- chart.draw(g2, r2D, null);
- g2.dispose();
- }
- catch(DocumentException de){
- System.err.println(de.getMessage());
- }
- document.close();
+ Rectangle pagesize = new Rectangle(width,height);
+ Document document = new Document(pagesize, 50, 50, 50, 50);
+ try {
+ PdfWriter writer = PdfWriter.getInstance(document, out);
+ document.addAuthor("JFreeChart");
+ document.open();
+ PdfContentByte cb = writer.getDirectContent();
+ Graphics2D g2 = cb.createGraphics(width, height);
+ Rectangle2D r2D = new Rectangle2D.Double(0, 0, width, height);
+ chart.draw(g2, r2D, null);
+ g2.dispose();
+ }
+ catch(DocumentException de){
+ System.err.println(de.getMessage());
+ }
+ document.close();
}
-
//---------------------------------------end of onChart(..................)
private Class nextPage;
@@ -572,16 +515,12 @@
@OnEvent(component="submit1Button")
void onsubmit()
{
-// combinedplot.setSavedList(_saved);
this.setXId("1");
this.setXscale(xscale);
this.setYscale(yscale);
-// this.setScaleFactor(scalefactor);
- this.setPdfName(pdfname);
this.setQueryString(querystring);
- this.setXheader(xheader);
- this.setYheader(yheader);
- nextPage=CombinedPlot.class;
+ this.setOptionstring(optionstring);
+ nextPage=CombinedPlot.class;
}
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Feedback.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Feedback.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -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 Feedback {
+}
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Form.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -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 Form {
+}
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Pdfs.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Pdfs.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -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 Pdfs {
+}
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Reviews.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Reviews.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -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 Reviews {
+}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java Wed Oct 21 21:12:06 2009 (r1299)
@@ -107,100 +107,14 @@
public String getYscale(){return yscale;}
public void setYscale(String yscale){this.yscale = yscale;}
-// @Persist
-// private String scalefactor;
-// public String getScaleFactor(){return scalefactor;}
-// public void setScaleFactor(String scalefactor){this.scalefactor = scalefactor;}
-
- @Persist
-// private String scalefactor1="1.0";
- private String scalefactor1;
- public String getScalefactor1(){return scalefactor1;}
- public void setScalefactor1(String scalefactor1){this.scalefactor1 = scalefactor1;}
- @Persist
-// private String scalefactor2="1.0";
- private String scalefactor2;
- public String getScalefactor2(){return scalefactor2;}
- public void setScalefactor2(String scalefactor2){this.scalefactor2 = scalefactor2;}
- @Persist
-// private String scalefactor3="1.0";
- private String scalefactor3;
- public String getScalefactor3(){return scalefactor3;}
- public void setScalefactor3(String scalefactor3){this.scalefactor3 = scalefactor3;}
- @Persist
-// private String scalefactor4="1.0";
- private String scalefactor4;
- public String getScalefactor4(){return scalefactor4;}
- public void setScalefactor4(String scalefactor4){this.scalefactor4 = scalefactor4;}
- @Persist
-// private String scalefactor5="1.0";
- private String scalefactor5;
- public String getScalefactor5(){return scalefactor5;}
- public void setScalefactor5(String scalefactor5){this.scalefactor5 = scalefactor5;}
- @Persist
-// private String scalefactor6="1.0";
- private String scalefactor6;
- public String getScalefactor6(){return scalefactor6;}
- public void setScalefactor6(String scalefactor6){this.scalefactor6 = scalefactor6;}
- @Persist
-// private String scalefactor7="1.0";
- private String scalefactor7;
- public String getScalefactor7(){return scalefactor7;}
- public void setScalefactor7(String scalefactor7){this.scalefactor7 = scalefactor7;}
- @Persist
-// private String scalefactor8="1.0";
- private String scalefactor8;
- public String getScalefactor8(){return scalefactor8;}
- public void setScalefactor8(String scalefactor8){this.scalefactor8 = scalefactor8;}
- @Persist
-// private String scalefactor9="1.0";
- private String scalefactor9;
- public String getScalefactor9(){return scalefactor9;}
- public void setScalefactor9(String scalefactor9){this.scalefactor9 = scalefactor9;}
- @Persist
-// private String scalefactor10="1.0";
- private String scalefactor10;
- public String getScalefactor10(){return scalefactor10;}
- public void setScalefactor10(String scalefactor10){this.scalefactor10 = scalefactor10;}
@SetupRender
void setupRender(){
- scalefactor1="1.0";
- scalefactor2="1.0";
- scalefactor3="1.0";
- scalefactor4="1.0";
- scalefactor5="1.0";
- scalefactor6="1.0";
- scalefactor7="1.0";
- scalefactor8="1.0";
- scalefactor9="1.0";
- scalefactor10="1.0";
- count = 0;
- sys="yes";
- if(xscale == null){xscale="lin";}
- if(yscale == null){yscale="lin";}
+ count = 0;
+ if(xscale == null){xscale="lin";}
+ if(yscale == null){yscale="lin";}
}
-
- @Persist
- private String sys;
- public String getSys(){return sys;}
- public void setSys(String sys){this.sys = sys;}
-
-
-
- public boolean getIsCount1(){ return getCount()==1; }
- public boolean getIsCount2(){ return getCount()==2; }
- public boolean getIsCount3(){ return getCount()==3; }
- public boolean getIsCount4(){ return getCount()==4; }
- public boolean getIsCount5(){ return getCount()==5; }
- public boolean getIsCount6(){ return getCount()==6; }
- public boolean getIsCount7(){ return getCount()==7; }
- public boolean getIsCount8(){ return getCount()==8; }
- public boolean getIsCount9(){ return getCount()==9; }
- public boolean getIsCount10(){ return getCount()==10; }
-
-
@Persist
// private int count=0;
private int count;
@@ -218,138 +132,40 @@
private String _last;
public String getLast(){
- return _last;
+ return _last;
}
public String savePlot(){
- System.out.println("savePLot method: " + _reqGlobals.getRequest().getParameterNames().size());
-// System.out.println("startswith: " + _reqGlobals.getRequest().getParameterNames().get(0));
-// System.out.println("startswith: " + _reqGlobals.getRequest().getParameterNames().get(1));
- if(_reqGlobals.getRequest().getParameterNames().size()>0 &&
- _reqGlobals.getRequest().getParameterNames().get(0).startsWith("remove")){
- _last = _reqGlobals.getRequest().getParameter("remove");
- if(_last != null || _last.equals("null")){
- int i = getSaved().indexOf(_last);
- System.out.println("removing position " + i);
- getSaved().remove(_reqGlobals.getRequest().getParameter("remove"));
- if(i==0){
- scalefactor1=scalefactor2;
- scalefactor2=scalefactor3;
- scalefactor3=scalefactor4;
- scalefactor4=scalefactor5;
- scalefactor5=scalefactor6;
- scalefactor6=scalefactor7;
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==1){
- scalefactor2=scalefactor3;
- scalefactor3=scalefactor4;
- scalefactor4=scalefactor5;
- scalefactor5=scalefactor6;
- scalefactor6=scalefactor7;
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==2){
- scalefactor3=scalefactor4;
- scalefactor4=scalefactor5;
- scalefactor5=scalefactor6;
- scalefactor6=scalefactor7;
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==3){
- scalefactor4=scalefactor5;
- scalefactor5=scalefactor6;
- scalefactor6=scalefactor7;
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==4){
- scalefactor5=scalefactor6;
- scalefactor6=scalefactor7;
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==5){
- scalefactor6=scalefactor7;
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==6){
- scalefactor7=scalefactor8;
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==7){
- scalefactor8=scalefactor9;
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==8){
- scalefactor9=scalefactor10;
- scalefactor10="1.0";
- }
- else if(i==9){
- scalefactor10="1.0";
- }
+ if(_reqGlobals.getRequest().getParameterNames().size()>0 && _reqGlobals.getRequest().getParameterNames().get(0).startsWith("remove")){
+ _last = _reqGlobals.getRequest().getParameter("remove");
+ if(_last != null || _last.equals("null")){
+ int i = getSaved().indexOf(_last);
+ getSaved().remove(_reqGlobals.getRequest().getParameter("remove"));
}
- }
- else if(_reqGlobals.getRequest().getParameterNames().size()>0 &&
- _reqGlobals.getRequest().getParameterNames().get(0).startsWith("reset")){
- getSaved().clear();
- scalefactor1="1.0";
- scalefactor2="1.0";
- scalefactor3="1.0";
- scalefactor4="1.0";
- scalefactor5="1.0";
- scalefactor6="1.0";
- scalefactor7="1.0";
- scalefactor8="1.0";
- scalefactor9="1.0";
- scalefactor10="1.0";
- }
- else if(_reqGlobals.getRequest().getParameterNames().size()>0 &&
- _reqGlobals.getRequest().getParameterNames().get(0).startsWith("recover")){
- if(_reqGlobals.getRequest().getParameter("recover") != null &&
- !_reqGlobals.getRequest().getParameter("recover").equals("null"))
- {
- getSaved().add(_reqGlobals.getRequest().getParameter("recover"));
}
-
- }
- else if(_reqGlobals.getRequest().getParameterNames().size()>0 &&
- _reqGlobals.getRequest().getParameterNames().get(0).startsWith("list")){
- querystring=_reqGlobals.getRequest().getParameter("string");
- }
- else if(_reqGlobals.getRequest().getParameterNames().size()>0 &&
- _reqGlobals.getRequest().getParameterNames().get(0).startsWith("plot")){
- String value=_reqGlobals.getRequest().getParameter("plot");
- int i1=value.indexOf("d");
- int i2=value.indexOf("y");
- this.setHepId(value.substring(0,i1));
- this.setDsId(value.substring(i1+2,i2));
- this.setYId(value.substring(i2+2));
- this.setQueryString(_reqGlobals.getRequest().getParameter("string"));
- getSaved().add( "save" + _reqGlobals.getRequest().getParameter("plot") );
- }
- else {
- System.out.println("saving: " + getHepId() + " " + getDsId() + " " + getYId());
+ else if(_reqGlobals.getRequest().getParameterNames().size()>0 && _reqGlobals.getRequest().getParameterNames().get(0).startsWith("reset")){
+ getSaved().clear();
+ }
+ else if(_reqGlobals.getRequest().getParameterNames().size()>0 && _reqGlobals.getRequest().getParameterNames().get(0).startsWith("recover")){
+ if(_reqGlobals.getRequest().getParameter("recover") != null && !_reqGlobals.getRequest().getParameter("recover").equals("null")){
+ getSaved().add(_reqGlobals.getRequest().getParameter("recover"));
+ }
+ }
+ else if(_reqGlobals.getRequest().getParameterNames().size()>0 && _reqGlobals.getRequest().getParameterNames().get(0).startsWith("list")){
+ querystring=_reqGlobals.getRequest().getParameter("string");
+ }
+ else if(_reqGlobals.getRequest().getParameterNames().size()>0 && _reqGlobals.getRequest().getParameterNames().get(0).startsWith("plot")){
+ String value=_reqGlobals.getRequest().getParameter("plot");
+ int i1=value.indexOf("d");
+ int i2=value.indexOf("y");
+ this.setHepId(value.substring(0,i1));
+ this.setDsId(value.substring(i1+2,i2));
+ this.setYId(value.substring(i2+2));
+ this.setQueryString(_reqGlobals.getRequest().getParameter("string"));
+ getSaved().add( "save" + _reqGlobals.getRequest().getParameter("plot") );
+ }
+ else {
getSaved().add( "save" + getHepId() + "ds" + getDsId() + "ya" + getYId() );
- }
+ }
return "";
}
@@ -406,19 +222,18 @@
public Long getSpiresId(){
return getPaper().getSpiresId();
}
- public String getFirstAuthorName(){
+ public String getFirstAuthorName(){
int n = 0;
String _firstauthor = "";
-
for (String author : getPaper().getAuthors()){
- n += 1;
- if(n == 1) {_firstauthor = author;}
+ n += 1;
+ if(n == 1) {_firstauthor = author;}
}
String _refdate = "xx";
for (Reference reference : getPaper().getReferences()){
_refdate = reference.getDate();
- }
- int _lref = _refdate.length();
+ }
+ int _lref = _refdate.length();
_firstauthor = _firstauthor + " " + _refdate.substring(_lref-2,_lref);
return _firstauthor;
}
@@ -437,19 +252,19 @@
for (Experiment experiment : getPaper().getExperiments()){
n += 1;
if(n == 1) {
- if(experiment.getInformalName() == null || experiment.getInformalName().equals("")){
- _firstinformal = experiment.getName();
- }
- else{
- _firstinformal = experiment.getInformalName();
+ if(experiment.getInformalName() == null || experiment.getInformalName().equals("")){
+ _firstinformal = experiment.getName();
+ }
+ else{
+ _firstinformal = experiment.getInformalName();
+ }
}
}
- }
return _firstinformal;
}
public String getPaperNumber(){
- int i1 = getSave().indexOf("d");
+ int i1 = getSave().indexOf("d");
if(i1>4){
return getSave().substring(4,i1);
}
@@ -480,43 +295,14 @@
}
}
-// private Class nextPage;
-// Object onSubmitFromCombinedPlot()
-// {
-// System.out.println("Returning nextpage" + nextPage);
-//
-// return nextPage;
-// }
@OnEvent(value="submit")
-// @OnEvent()
-// void onSubmit1Button()
Object onSubmit()
{
- System.out.println("Hitting submit1Button");
- System.out.println("getSaved(): " + getSaved());
combinedplot.setSavedList(getSaved());
combinedplot.setXId("1");
- System.out.println("xscale: " + xscale);
combinedplot.setXscale(xscale);
- System.out.println("yscale: " + yscale);
combinedplot.setYscale(yscale);
-// combinedplot.setScaleFactor(scalefactor);
- List <String> _scalefactors= new ArrayList();
- _scalefactors.add(getScalefactor1());
- _scalefactors.add(getScalefactor2());
- _scalefactors.add(getScalefactor3());
- _scalefactors.add(getScalefactor4());
- _scalefactors.add(getScalefactor5());
- _scalefactors.add(getScalefactor6());
- _scalefactors.add(getScalefactor7());
- _scalefactors.add(getScalefactor8());
- _scalefactors.add(getScalefactor9());
- _scalefactors.add(getScalefactor10());
- System.out.println("scalefactors: " + _scalefactors);
- combinedplot.setScaleFactors(_scalefactors);
- System.out.println("querystring: " + querystring);
combinedplot.setQueryString(querystring);
- // nextPage=CombinedPlot.class;
return combinedplot;
}
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/components/Layout.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -9,7 +9,7 @@
<img style="float:right;" alt="Durham University" src="${asset:context:/logounidurham-new.gif}"/>
</a>
<h1>
- <a href="#" t:type="pagelink" t:page="index">HepData Reaction Database</a>
+ <a href="#" t:type="pagelink" t:page="index">The Durham HepData Project</a>
<!-- HepData Reaction Database -->
</h1>
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browse.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -1,54 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-trans.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Durham REACTION DATABASE Browsing</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="/hepdata/test.css" />
-</head>
- <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">
-<!--
-<div>
-
-<h2>
-<a href="http://www.dur.ac.uk/"><img alt="DurhamUniv" align="bottom" src="/icons/hepdata/durcrest.gif" width=100></a>
- The Durham HepData Project
-<a href="http://www.ippp.dur.ac.uk/"><img alt="IPPP" align="bottom" src="/icons/hepdata/ippp_transparent-small.png" width=100></a>
-</h2>
+<!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">
-</div>
+<title>Durham REACTION DATABASE Browsing</title>
-<p/>
+<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>
-<div class="navbar">
-<a id="nav-reaction" href=/hepdata/new_reac.shtml>Reaction Database</a>
-<a id="nav-review" href=/hepdata/reviews.shtml>Data Reviews</a>
-<a id="nav-pdf" href=/hepdata/pdf.html>Parton Density Functions</a>
-</div>
-<br/>
--->
-<!--#include virtual="/hepdata/main_header.shtml"-->
<table>
<tr>
<td id="main">
-<h2> HepData Reaction Database</h2>
+<h2> HepData Reaction Database - Browsing Keywords</h2>
-<br/>
- Browsing Keywords
<p/>
-Choose the index you wish to browse and enter the value.
-
+Choose the index you wish to browse and enter the value to browse around.
+<p/>
Select an index:<br/>
<form method="GET" action="http://h3:8080/browsing">
-<!--<form method="GET" action="http://hepdata.cedar.ac.uk/hepdata/browse">-->
<select name="keyword">
<option value="is">Initial State Particle (beam)</option>
@@ -72,6 +46,7 @@
</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>
@@ -80,8 +55,6 @@
</div>
-<!--#include virtual="/hepdata/credits.shtml"-->
-
</body>
</html>
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Browsing.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -1,40 +1,40 @@
-<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <head>
- <title>HepData Reaction Database Browsing</title>
-<!-- <link rel="stylesheet" type="text/css" href="${asset:context:/test.css}" />-->
- </head>
- <body bgcolor="#ffffdd">
-
-<div>
-<!--
-<h2>
-<a href="http://www.dur.ac.uk/"><img alt="DurhamUniv" align="bottom" src="${asset:context:/logounidurham-new.gif}" width="100"/></a>
- The Durham HepData Project
-<a href="http://www.ippp.dur.ac.uk/"><img alt="IPPP" align="bottom" src="${asset:context:/ippp_transparent-small.png}" width="100"/></a>
-</h2>
--->
-</div>
+<!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>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/>
-<div class="navbar">
-<a id="nav-reaction" href="http://durpdg.dur.ac.uk/hepdata/new_reac.shtml">Reaction Database</a>
-<a id="nav-review" href="http://durpdg.dur.ac.uk/hepdata/reviews.shtml">Data Reviews</a>
-<a id="nav-pdf" href="http://durpdg.dur.ac.uk/hepdata/pdf.html">Parton Density Functions</a>
-</div>
<table>
<tr>
<td>
<h2> Browsing ${getBrowseName()} </h2>
-<br/>
<a href="browsing?keyword=${getQueryKeyword()}&value=${getQueryValue()}&pos=${getPosUp()}">browse upwards</a>
<br/>
+<div class="datasetbox">
+<table class="dataset">
+<tr>
+<td>
<t:loop source="names" value="name">
<br/>
<a href="search/${getSearchName()}_${getName()}"> ${getNameReal()}</a>
</t:loop>
+ <br/>
+</td>
+</tr>
+</table>
+</div>
<p/>
<a href="browsing?keyword=${getQueryKeyword()}&value=${getQueryValue()}&pos=${getPosDn()}">browse downwards</a>
@@ -50,6 +50,5 @@
<a href="http://durpdg.dur.ac.uk/lbl/">PDG</a>
</div>
-<!-- <t:Credits /> -->
</body>
</html>
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/CombinedPlot.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -3,12 +3,12 @@
<title>HepData Reaction Database Data Plot</title>
+<div class="paperbox">
+<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 and systematic error inclusion options.
- Alternative X and Y labels can be input from here as well as creating a PDF file
- of the plot. Note that the full path has to be given in the name of the file
- and 'Replot' selected.
+ changing the X and Y axis types (log/lin). Other options can be entered as ';'
+ separated name=value pairs.
</p>
<t:form t:id="CombinedPlot">
@@ -17,28 +17,13 @@
<t:select t:id="xscale" model="literal:lin,log"/>
<t:label for="yscale"/>
<t:select t:id="yscale" model="literal:lin,log"/>
- <t:label for="sys"/>
- <t:select t:id="sys" model="literal:yes,no"/>
- <p/>
- Alternative Xaxis label
- <input type="textfield" t:type="textfield" t:id="xheader" t:value="xheader"/>
- (leave blank for default)
- <br/>
- Alternative Yaxis label
- <input type="textfield" t:type="textfield" t:id="yheader" t:value="yheader"/>
- (leave blank for default)
-
-
- <br/>
- <br/>
- <t:select t:id="pdfselect" model="literal:Don't Save,Save"/>
- in PDF file: <input type="textfield" t:type="textfield" t:id="pdfname" t:value="pdfname"/> ( re-select Replot)
+ Options:
+ <input type="textfield" t:type="textfield" t:id="optionstring" t:value="optionstring" t:size="40"/>
<br/>
-
<br/><a href='SavePlot?string=${getQueryString()}&list=all'>Back to the list of selected plots</a><br/>
</t:form>
- <table>
+ <table class="plotset">
<tr>
<td width="50%">
<br/>
@@ -57,5 +42,5 @@
</td>
</tr>
</table>
-
+</div>
</html>
Added: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Feedback.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -0,0 +1,49 @@
+<!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>Durham REACTION DATABASE Feedback</title>
+
+<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="/new_pdf">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
+in the box below.
+</p>
+<p>
+<textarea name="text" rows="10" cols="100"></textarea>
+</p>
+<p>
+Email Address <input type="text" name="email" rows="1" size="35"/>
+</p>
+<p>
+To send your comment press here: <input type="submit" value="Send"/><input type="reset"/>
+</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>
+
+
+
+
+
+
+
+
+
Added: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Form.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -0,0 +1,146 @@
+<!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>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>
+
+<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"/>
+
+<table BORDER="0">
+<tr>
+<td align="right"><b>Reaction:</b> </td>
+<td align="left" colspan="3"><input type="text" name="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="right"><b>SQRT(S)low:</b> </td>
+<td align="left"><input type="text" name="plab" 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="right"><b>Target:</b> </td>
+<td align="left"><input type="text" name="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="right"><b>Year:</b></td>
+<td align="left"><input type="text" name="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="right"><b>Reference:</b> </td>
+<td align="left"><input type="text" name="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>
+</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>
+</div>
+
+
+</td>
+
+
+<td>
+
+<div id="tip">
+
+<p>
+The HepData Reaction Database has recently moved from its former hierarchical
+database, with its in-house BDMS management system, to a new relational system
+using MySQL and modern Java based tools. This will allow better long-term
+management of the project and also improved searching and display facilities.
+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>
+
+<tr>
+
+<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>
+
+</td>
+
+</tr>
+
+</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/Index.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Index.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -1,19 +1,22 @@
<!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>HepData 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.shtml">Data Reviews</a> •
- <a id="nav-pdf" href="/new_pdf.shtml">Parton Density Functions</a> •
- <a id="nav-feedback" href="feedback.shtml">Feedback</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">
- <h2>Reaction database search</h2>
+ <h2>Reaction Database Search</h2>
<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"/>
@@ -22,11 +25,11 @@
<a href="#" t:type="pagelink" t:page="search" t:context="literal:re_gamma_gamma">re gamma gamma</a>,
<a href="#" t:type="pagelink" t:page="search" t:context="literal:re_p_p_-->_p_p_and_obs_sig">re p p --> p p and obs sig</a>,
<a href="#" t:type="pagelink" t:page="search" t:context="literal:exp_cern">exp cern</a>
- <br/>
- <a href="#" t:type="pagelink" t:page="searchhelp">Search Help</a>, –
- <a href="#" t:type="pagelink" t:page="browse">Browse Keywords</a>, –
+ <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="browse">Browse Keywords</a>
<!-- <a href="new_reacform.shtml">Form search</a> – -->
- <a href="#" t:type="pagelink" t:page="outputhelp">Output Help</a>, –
</span>
</t:form>
@@ -49,14 +52,14 @@
<div id="datareviewbox" class="searchlinkbox">
<h3 class="">Quick link to HepData data reviews</h3>
<ul>
- <li><a href="/online/f2/structindex.html">Structure functions in DIS</a></li>
- <li><a href="/online/photon/photonindex.html">Single photon production in hadronic interactions</a></li>
- <li><a href="/online/2gamma/2gammaindex.html">Two-photon reactions leading to hadron final states</a></li>
- <li><a href="/online/dy/dyindex.html">Drell-Yan cross-sections</a></li>
- <li><a href="/online/ee/eeindex.html">Inclusive particle production data in e+ e- interactions</a></li>
- <li><a href="/online/rsig/index.html">Hadronic total cross-sections (R) in e+e- interactions</a></li>
- <li><a href="/online/neutrino/index.html">Low-energy neutrino cross-sections</a></li>
- <li><a href="/online/shapes/index.html">Event shapes in lepton-lepton and lepton-nucleon interactions</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/f2/structindex.html">Structure functions in DIS</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/photon/photonindex.html">Single photon production in hadronic interactions</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/2gamma/2gammaindex.html">Two-photon reactions leading to hadron final states</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/dy/dyindex.html">Drell-Yan cross-sections</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/ee/eeindex.html">Inclusive particle production data in e+ e- interactions</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/rsig/index.html">Hadronic total cross-sections (R) in e+e- interactions</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/neutrino/index.html">Low-energy neutrino cross-sections</a></li>
+ <li><a href="http://durpdg.dur.ac.uk/hepdata/online/shapes/index.html">Event shapes in lepton-lepton and lepton-nucleon interactions</a></li>
</ul>
<h3>Predefined event shape / jet searches</h3>
@@ -78,10 +81,16 @@
<a href="/about_reactions.shtml">About HepData</a> –
<a href="/submitting_data.shtml">Submitting your data to HepData</a>
<br/>
- 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/">Particle Data Group</a>
</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/Pdfs.tml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Pdfs.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -0,0 +1,208 @@
+<!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>Durham PDF server </title>
+
+<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="/new_pdf">Parton Density Functions</a> •
+ <a id="nav-feedback" href="feedback">Feedback</a>
+ </div>
+
+<table>
+<tr>
+<td id="main">
+
+<h2>HepData Parton Distribution Server</h2>
+<h3><a href="http://durpdg.dur.ac.uk/hepdata/pdf3.html"><font color="red"><b> On-line Unpolarized Parton Distribution Calculator with Graphical Display.</b></font></a></h3>
+<p/>
+<!--<table border="3" bgcolor="#571755">-->
+<table border="3">
+<td>
+<table border="0" cellpadding="2" cellspacing="0">
+<tr>
+<td colspan="2" align="center"><font color="blue" size="+2"><b>Unpolarized Parton Distributions</b></font></td>
+</tr>
+<tr>
+<td colspan="2" align="center">
+Access the parton distribution code, on-line calculation and
+graphical display of the distributions, ffrom CTEQ, GRV, MRST/MSTW,
+Alekhin, ZEUS, H1, BBG and NNPDF.
+</td>
+
+<tr>
+<td align="right"> <b>CTEQ</b> </td>
+<td><a href="http://durpdg.dur.ac.uk/hepdata/cteq.html"><b> fortran code and grids</b></a></td>
+</tr>
+
+<tr>
+<td align="right"> <b>GRV/GJR</b></td>
+<td><a href="http://durpdg.dur.ac.uk/hepdata/grv.html"><b> fortran code and grids</b></a> </td>
+</tr>
+
+<tr>
+<td align="right"><b>MRST</b></td>
+<td><a href="http://durpdg.dur.ac.uk/hepdata/mrs.html"><b> fortran code and grids</b></a>,<a href="/hepdata/mrstc++.html"><b> C++ code</b></a></td>
+</tr>
+
+<tr>
+<td align="right"><b>MSTW</b></td>
+<td><a href="http://projects.hepforge.org/mstwpdf/"><b>fortran, C++ and Mathematica codes + grids etc...</b></a></td>
+</tr>
+
+<tr>
+<td align="right"><b>ALEKHIN</b></td>
+<td><a href="http://Sirius.ihep.su/~alekhin/pdfa02/"><b> fortran,C++,Mathematica code, and grids</b></a></td>
+</tr>
+
+<tr>
+<td align="right"><b>ZEUS</b></td>
+<td><a href="/hepdata/zeus2002.html"><b> ZEUS 2002 PDFs</b></a>, <a href="/hepdata/zeus2005.html"><b>ZEUS 2005 jet fit PDFs</b></a></td>
+</tr>
+
+<tr>
+<td align="right"><b>H1</b></td>
+<td><a href="http://www-h1.desy.de/psfiles/figures/d03-038_fit.h1pdf2000-msbar-dis-lo/h1pdf2000.html"><b>H1 2000</b></a></td>
+</tr>
+
+<tr>
+<td align="right"><b>BBG</b></td>
+<td><a href="http://durpdg.dur.ac.uk/hepdata/bbg06_ns.html"><b>BBG06_NS</b></a></td>
+</tr>
+
+<tr>
+<td align="right"><b>NNPDF</b></td>
+<td><a href="http://sophia.ecm.ub.es/nnqns/"><b>Non Singlet PDF code</b></a>
+ - <a href="http://arxiv.org/abs/hep-ph/0701127">hep-ph/0701127</a> </td>
+</tr>
+
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>Polarized Parton Distributions</b></font></td></tr>
+<tr><td align="center" colspan="2">Currently available parametrizations</td></tr>
+
+<tr>
+<td align="right"><a href="http://durpdg.dur.ac.uk/hepdata/lss.html"><b> LSS2001</b></a> </td>
+<td>E.Leader, A.V.Sidorov and D.B.Stamenov, Eur.Phys.J.C23 (2002) 479 </td>
+</tr>
+
+<tr>
+<td align="right"><a href="http://durpdg.dur.ac.uk/hepdata/lss2005.html"><b> LSS2005</b></a></td>
+<td>E.Leader, A.V.Sidorov and D.B.Stamenov, Phys.Rev.D73 (2006) 034023</td>
+</tr>
+
+<tr>
+<td align="right"><a href="http://durpdg.dur.ac.uk/hepdata/lss2006.html"><b> LSS2006</b></a></td>
+<td>E.Leader, A.V.Sidorov and D.B.Stamenov, Phys.Rev.D75 (2007) 074027</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://doom.physik.uni-dortmund.de/PARTON/index.html"><b>GRSV</b></A></td>
+<td>M. Glueck, E. Reya, M. Stratmann and W. Vogelsang, Phys. Rev. D53 (1996) 4775</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://durpdg.dur.ac.uk/hepdata/grsv.html"><b>GRSV2000</b></A></td>
+<td>M. Glueck, E. Reya, M. Stratmann and W. Vogelsang, Phys. Rev. D63 (2001) 094005</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://durpdg.dur.ac.uk/pdflib/gehrmann/pdf/welcome.html"><b>GS</b></A></td>
+<td>T. Gehrmann and W.J. Stirling, Phys. Rev. D53 (1996) 6100</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://durpdg.dur.ac.uk/hepdata/bb.html"><b>BB</b></A></td>
+<td>J. Bluemlein and H. Boettcher - Nucl.Phys.B636(2002)225</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://spin.riken.bnl.gov/aac/"><b>AAC</b></A></td>
+<td>Asymmetry Analysis Collaboration - M. Hirai et al- Phys. Rev. D69 (2004) 054021</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://durpdg.dur.ac.uk/hepdata/deflorian.html"><b>DS2000</b></A></td>
+<td>D. de Florian and R. Sassot, Phys. Rev. D62 (2000) 094025</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://durpdg.dur.ac.uk/hepdata/dns2005.html"><b>DNS2005</b></A></td>
+<td>D. de Florian, G.A. Navarro and R. Sassot, Phys. Rev. D71 (2005) 094018</td>
+</tr>
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>Diffractive Parton Distributions</b></font> </td></tr>
+<tr>
+<td align="right"><a href="http://durpdg.dur.ac.uk/hepdata/mrw.html"><b>MRW2006</b></a></td>
+<td>A.D.Martin, M.G.Ryskin and G.Watt</td>
+</tr>
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>Pion Parton Distributions</b></font> </td></tr>
+<tr>
+<td align="right"><b>MRS</b></td>
+<td><a href="http://durpdg.dur.ac.uk/hepdata/mrspion.html"><b> fortran code and grids</b></a></td>
+</tr>
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>PDFs from nuclei</b></font> </td></tr>
+<tr>
+<td align="right"> <A HREF="http://hs.phys.saga-u.ac.jp/nuclp.html"><b>HKM</b></A></td>
+<td>M. Hirai, S. Kumano and M. Miyama - Phys. Rev. D64 (2001) 034003</td>
+</tr>
+
+<tr>
+<td align="right"> <A HREF="http://www.jyu.fi/science/laitokset/fysiikka/en/research/highenergy/urhic/EKS98/EKS98param.html"><b>EKS98</b></A></td>
+<td>K.J.Eskola, V.J.Kolhinen and C.A. Salgado - Eur.Phys.J C9(1999)61 <br/>
+and K.J.Eskola, V.J.Kolhinen and P.V.Ruuskanen - Nucl.Phys.B535(1998)351</td>
+</tr>
+
+<tr>
+<td align="right"><A HREF="http://durpdg.dur.ac.uk/hepdata/ndeflorian.html"><b>nDS</b></A></td>
+<td>D. de Florian and R. Sassot, Phys.Rev.D69(2004)074028</td>
+</tr>
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>Generalized Parton Distributions</b></font> </td></tr>
+
+<tr>
+<td align="right"><a href="http://durpdg.dur.ac.uk/hepdata/gpd.html"><b>GPD</b></a></td>
+<td>GPD code of Vinnikov</td>
+</tr>
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>Deeply Virtual Compton Scattering</b></font> </td></tr>
+
+<tr>
+<td align="right"><a href="http://durpdg.dur.ac.uk/hepdata/dvcs.html"><b>DVCS</b></a></td>
+<td>DVCS code of Freund and McDermott</td>
+</tr>
+
+<tr><td align="center" colspan="2"><font color="blue" size="+2"><b>Fragmentation Functions</b></font> </td></tr>
+
+<tr>
+<td align="right"><a href="http://www.pv.infn.it/~radici/FFdatabase/"><b>FF</b></a></td>
+<td>Fragmentation Distribution database site compiled by <a href="mailto:radici at pv.infn.it">Marco Radici</a> and Rainer Jakob</td>
+</tr>
+</tr>
+</table>
+</td>
+</table>
+
+
+</td>
+</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>
+
+</html>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Plot.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Plot.tml Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Plot.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -2,48 +2,17 @@
<html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<title>HepData data plot</title>
-
+
+<div class="paperbox">
<t:loop source="datasets" value="dataset">
<table>
-<!-- <t:loop source="dataset.yaxes" value="yaxis"> -->
<t:loop source="yaxes" value="yaxis">
<tr>
<td width="50%">
- <!-- TODO: What is this? -->
<t:reactionPlotWords yaxis="yaxis" />
<form method="GET" action="plot">
- <!-- Re-plot:-->
- <!-- <t:loop source="selects" value="select"> -->
- <!-- <input type="hidden" name="${getSelect()}" value="on" title="Choose scales"/> -->
- <!-- </t:loop> -->
- <!-- <select name="xscale"> -->
- <!-- <option>x ${getXscale()}</option> -->
- <!-- <option>x ${getNotXscale()}</option> -->
- <!-- </select> -->
- <!-- <select name="yscale"> -->
- <!-- <option>y ${getYscale()}</option> -->
- <!-- <option>y ${getNotYscale()}</option> -->
- <!-- </select> -->
- <!-- with systematics -->
- <!-- <select name="sys"> -->
- <!-- <option>${getSys()}</option> -->
- <!-- <option>${getNotSys()}</option> -->
- <!-- </select> -->
- <!-- <input type="submit" value="Re-plot" title="Redo the current plot" /> -->
-
- <!-- <br/> -->
- <!-- <br/> -->
- <!-- <input type="checkbox" name="pdfselect" value="yes"/> + RePlot -->
- <!-- to save in PDF file: <input type="textfield" name="pdfname" value="${getPdfName()}"/> -->
- <!-- <br/> -->
</form>
-
- <!-- <br/><a href="SavePlot?string=${getQueryString()}&plot=${getHepId()}ds${getDsId()}ya${getYId()}&xscale=${getXscale()}&yscale=${getYscale()}&sys=${getSys()}">Add to selected plot list</a> -->
- <!-- <br/><a href='SavePlot?list=all&string=${getQueryString()}'>List selected plots</a><br/> -->
-
- <!-- <br/><a href="view?p=${getHepId()}&string=${getQueryString()}">Go to paper</a><br/> -->
- <!-- <br/><a href="ReactionQuery?string=${getQueryString()}">Go to search results</a><br/> -->
- </td>
+ </td>
<td width="50%">
<!-- The plot -->
<a href="#" t:type="pagelink" t:page="plotimage" t:context="${linkimagename}">
@@ -55,5 +24,5 @@
</t:loop>
</table>
</t:loop>
-
+</div>
</html>
Added: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Reviews.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -0,0 +1,79 @@
+<!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>HepData Reviews</title>
+
+<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="/new_pdf">Parton Density Functions</a> •
+ <a id="nav-feedback" href="feedback">Feedback</a>
+ </div>
+
+<table>
+<tr>
+<td id="main">
+
+<h2> HepData Data Reviews </h2>
+<p>
+The following data reviews are available:
+
+<ul>
+<li>
+ <A HREF="http://durpdg.dur.ac.uk/hepdata/online/f2/structindex.html"><b>Structure Functions in DIS</b></A>
+ <a href="http://stacks.iop.org/0954-3899/25/A1"> <img src="${asset:context:/IoP.gif}" width="20"/></a>
+ <a href="http://www.iop.org/EJ/abstract/0954-3899/17/D/001"> <img src="${asset:context:/IoP.gif}" width="20"/></a>
+</li>
+<li>
+ <A HREF="http://durpdg.dur.ac.uk/hepdata/online/photon/photonindex.html"><b>Single Photon Production in Hadronic Interactions </b></A>
+ <a href="http://stacks.iop.org/0954-3899/23/A1"> <img src="${asset:context:/IoP.gif}" width="20"/></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>
+ <a href="http://stacks.iop.org/0954-3899/27/A1"> <img src="${asset:context:/IoP.gif}" width="20"/></a>
+ <a href="http://stacks.iop.org/0954-3899/20/A1"> <img src="${asset:context:/IoP.gif}" width="20"/></a>
+</li>
+<li>
+ <A HREF="http://durpdg.dur.ac.uk/hepdata/online/dy/dyindex.html"><b>Drell-Yan cross sections</b></A>
+ <a href="http://www.iop.org/EJ/toc/0954-3899/19/D"> <img src="${asset:context:/IoP.gif}" width="20"/></a>
+</li>
+<li>
+ <A HREF="http://durpdg.dur.ac.uk/hepdata/online/EEC/index.html"><b>Energy-Energy Correlations in e+e- interactions</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>
+ <a href="http://stacks.iop.org/0954-3899/21/A1"> <img src="${asset:context:/IoP.gif}" width="20"/></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>
+ <a href="http://stacks.iop.org/0954-3899/29/A1"> <img src="${asset:context:/IoP.gif}" width="20"/></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>
+<img src="${asset:context:/IoP.gif}" width="20"/> indicates a published version is available in the IoP Journal of Physics G.
+</p>
+</td>
+
+
+</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/SavePlot.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -14,27 +14,28 @@
${savePlot()}
<div class="paperbox">
+<h3> Composite Plots </h3>
<p>
- From this page data sets can be combined together into one plot.
- The data sets to combine are selected from the previous pages either:
+ Multiple datasets from the same, or different, HepData records can be combined on a single plot.
+ This page presents and allows manipulation of these datasets which have been selected from previous pages either:
</p>
- a) from the 'plot' page using 'Add to Selected Plot List' button<br/>
- b) from the 'paper' page using the 'Select Plot' link<br/>
+ a) from the 'plot' pages using '<b>add this plot to list</b>' link<br/>
+ b) from the 'paper' pages using the '<b>SelectPlot</b>' link<br/>
<p>
- Options are provided to manipulate the list by deleting an item,
- clearing the complete list, or returning to the 'plot' or 'paper'
+ Options are provided here to manipulate the list by deleting an item (x),
+ clearing the complete list, or returning to the 'paper'
pages to add more data sets. More details of individual data sets can
be displayed with through the 'summary (?)' link.
'Make the plot' has the option to choose logarithmic or linear x and y
- axis scales and to include the systematic errors (if available in the data).
- Individual data sets can be rescaled using the 'scalefactor' parameter.
+ axis scales. Options to further modify the look of the plot are provided
+ on the next page.
</p>
<p/>
${zeroCount()}
<t:form t:id="CombinedPlot">
<div class="datasetbox">
- <table border='0'>
- <tr><th colspan='7' > Current list of selected plots </th><td align='center'>remove</td><td align='center'>summary</td><td> scalefactor</td></tr>
+ <table border='0' class="dataset">
+ <tr><th colspan='8' > Current list of selected plots </th><td align='center'>remove</td><td align='center'>summary</td></tr>
<t:loop source="saved" value="save">
${addCount()}
<tr>
@@ -44,19 +45,10 @@
<td>${getYAxisNumber()}</td>
<td>${getFirstInformalName()}</td>
<td>${getYAxis().getHeader()}</td>
+ <td>w.r.t</td>
<td>${getXAxis().getHeader()}</td>
<td align='center'><a href='SavePlot?string=${getQueryString()}&remove=${getSave()}'>x</a></td>
<td align='center'><a href="DisplaySummary?string=${getSave()}" onClick="return popitup(this)">?</a></td>
- <t:if t:test="isCount1"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor1" t:value="scalefactor1"/></td></t:if>
- <t:if t:test="isCount2"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor2" t:value="scalefactor2"/></td></t:if>
- <t:if t:test="isCount3"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor3" t:value="scalefactor3"/></td></t:if>
- <t:if t:test="isCount4"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor4" t:value="scalefactor4"/></td></t:if>
- <t:if t:test="isCount5"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor5" t:value="scalefactor5"/></td></t:if>
- <t:if t:test="isCount6"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor6" t:value="scalefactor6"/></td></t:if>
- <t:if t:test="isCount7"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor7" t:value="scalefactor7"/></td></t:if>
- <t:if t:test="isCount8"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor8" t:value="scalefactor8"/></td></t:if>
- <t:if t:test="isCount9"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor9" t:value="scalefactor9"/></td></t:if>
- <t:if t:test="isCount10"><td><input type="textfield" size='6' t:type="textfield" t:id="scalefactor10" t:value="scalefactor10"/></td></t:if>
</tr>
</t:loop>
</table>
@@ -67,6 +59,7 @@
<a href='SavePlot?reset=all'>clear list</a>
<p/>
<a href='View/p${getHepId()}'>Go back to paper</a><br/>
+<!-- <a href='Plot/p${getHepId()}/d${getYAxis().getDataset().getId()}/x01/y${getYId()}'>Go back to plot</a><br/> -->
<a href='ReactionQuery?string=${getQueryString()}&plength=10&start=1'>Go back to search result</a><br/>
@@ -76,8 +69,6 @@
<t:select t:id="xscale" model="literal:lin,log"/>
<t:label for="yscale"/>
<t:select t:id="yscale" model="literal:lin,log"/>
- <t:label for="sys"/>
- <t:select t:id="sys" model="literal:yes,no"/>
</t:form>
</div>
</html>
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 Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml Wed Oct 21 21:12:06 2009 (r1299)
@@ -84,13 +84,13 @@
<h3 class="datasettitle">
<a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
</h3>
- <p class="altdsformats">
+<!-- <p class="altdsformats"> -->
as:
<a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>
<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:datasetAsHtml dataset="dataset" format="${format}" />
</div>
</t:loop>
Added: trunk/hepdata-webapp/src/main/webapp/IoP.gif
==============================================================================
Binary file. No diff available.
Modified: trunk/hepdata-webapp/src/main/webapp/hepdata.css
==============================================================================
--- trunk/hepdata-webapp/src/main/webapp/hepdata.css Sat Oct 17 14:08:15 2009 (r1298)
+++ trunk/hepdata-webapp/src/main/webapp/hepdata.css Wed Oct 21 21:12:06 2009 (r1299)
@@ -45,7 +45,7 @@
padding-right: 2em;
}
-.navbar
+#.navbar
{
color: #446;
}
@@ -146,6 +146,23 @@
border-right: 1px solid #ccc;
}
+table.plotset
+{
+ border: 1;
+ border-collapse: collapse;
+ padding: 1ex 0;
+ background: #f9f9f3;
+ font-size: 0.8em;
+ border-top: 2px solid #333;
+ border-bottom: 2px solid #333;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+}
+table.plotset td
+{
+ text-align: left;
+}
+
table.dataset td , table.dataset th
{
padding: 0.5em 1em;
@@ -198,3 +215,137 @@
margin: 1em 0;
font-size: 0.8em;
}
+.navbar{
+ color:#FFF;
+ background-color:#571755;
+ padding: 2px 5px 5px 5px;
+ border-bottom:8px solid #dfcedf;
+ text-align:left;
+ font-variant:small-caps;
+ font-size: 1.1em;
+}
+
+.navbar a{
+ font-weight:bold;
+ text-decoration:none;
+ padding: 5px 5px 5px 5px;
+ color:#FFF;
+
+}
+.navbar a:visited{
+ color:#FFF;
+}
+.navbar a:active{
+ color:#FFF;
+}
+.navbar a:hover{
+ margin:0em;
+ padding:5px 5px 5px 5px;
+ background-color:#dfcedf;
+ color:#695;
+ text-decoration:underline;
+}
+.navbar_lower{
+ color:#FFF;
+ background-color:#571755;
+ padding: 5px 5px 5px 5px;
+ text-align:left;
+ font-variant:small;
+ font-size: 1.1em;
+}
+
+.navbar_lower a{
+ font-weight:bold;
+ text-decoration:none;
+ padding: 5px 5px 5px 5px;
+ color:#FFF;
+
+}
+.navbar_lower a:visited{
+ color:#FFF;
+}
+.navbar_lower a:active{
+ color:#FFF;
+}
+.navbar_lower a:hover{
+ margin:0em;
+ padding:5px 5px 5px 5px;
+ background-color:#dfcedf;
+ color:#695;
+ text-decoration:underline;
+}
+body.feedback a {
+ color:#666;
+}
+body.feedback a:hover {
+ color:#695;
+}
+
+body.pdf a {
+ color:#666;
+}
+body.pdf a:hover {
+ color:#695;
+}
+
+body.reaction div.navbar a#nav-reaction {
+ margin:0em;
+ padding:5px 5px 5px 5px;
+ background-color:#dfcedf;
+ color:#666;
+}
+body.reaction div.navbar a#nav-reaction:visited{
+ color:#666;
+}
+
+body.reaction div.navbar a:hover#nav-reaction{
+ color:#695;
+}
+
+body.pdf div.navbar a#nav-pdf {
+ margin:0em;
+ padding:5px 5px 5px 5px;
+ background-color:#dfcedf;
+ color:#666;
+ text-align:right;
+}
+body.pdf div.navbar a#nav-pdf:visited{
+ color:#666;
+}
+
+body.pdf div.navbar a:hover#nav-pdf{
+ color:#695;
+}
+
+
+body.feedback div.navbar a#nav-feedback {
+ margin:0em;
+ padding:5px 5px 5px 5px;
+ background-color:#dfcedf;
+ color:#666;
+ text-align:right;
+}
+body.feedback div.navbar a#nav-feedback:visited{
+ color:#666;
+}
+
+body.feedback div.navbar a:hover#nav-feedback{
+ color:#695;
+}
+
+
+
+
+body.review div.navbar a#nav-review {
+ margin:0em;
+ padding:5px 5px 5px 5px;
+ background-color:#dfcedf;
+ color:#666;
+}
+body.review div.navbar a#nav-review:visited{
+ color:#666;
+}
+
+body.review div.navbar a:hover#nav-review{
+ color:#695;
+}
More information about the HepData-svn
mailing list
|