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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Tue Nov 24 10:43:02 2009
New Revision: 1317

Log:
some minot tidying up

Modified:
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml
   trunk/hepdata-webapp/src/main/webapp/hepdata.css

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 17 10:03:32 2009	(r1316)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml	Tue Nov 24 10:43:02 2009	(r1317)
@@ -18,7 +18,7 @@
 
 <h2>Help on Interpreting the Search Result</h2>
 <p/>
-The results of a successful search are initially displayed as a short summary of each record listed roughly in reverse chronological order (ie most recent first).  10 records are displayed per page with the option to move on to the next 10, go to the previous 10 or jump to the last 10.
+The results of a successful search are initially displayed as a short summary of each record listed roughly in reverse chronological order (ie most recent first).  20 records are displayed per page with the option to move on to the next 20, go to the previous 20 or jump to the last 20.
 <p/>
 The summary comprises:
 <ul>
@@ -32,18 +32,21 @@
 </ul>
 Selecting the "Full Data Record" link (or the "author" link) will display the complete Reaction Database entry for that publication. 
 <p/>
-[<i>Selecting the "List of Tables" will display only the data table headers for that publication from which there are links to the complete data entry for individual tables.</i>]
+[<i>Selecting the "Short data record" will display only the data table headers for that publication from which there are links to the complete data entry for individual tables.</i>]
 <p/>
 In the full data record after initial data comments and information about overall systematic errors (if available) are the data tables themselves roughly corresponding to the data tables and figures in the papers, (the 'Location:xxx'  shows which table, figure or page the data come from). 
 <p/>
-The format of the tables is primarily for visual inspection and links at the bottom of the "y" columns allow other possibilities:
+The format of the tables is primarily for visual inspection and links at the bottom of the "y" columns  and the other output options below the 'Table' number allow other output possibilities:
 
 <dl>
-<dt><b>Numbers</b></dt><dd>Outputs the data as numbers without the .html extras.</dd>
+<dt><b>plain text</b><dd>As it says, without the html additions</dd></dt>
+<dt><b>AIDA</b><dd>Output in AIDA (xml) format</dd></dt>
+<dt><b>PyROOT</b><dd>Output in Python ROOT format</dd></dt>
 <dt><b>Plot</b></dt><dd>Display a single plot of that set of data. This takes you to another display in which, as well as the plot, various other information is shown as well as option to replot the data changing the type of axes (lin/log), with/without systematic errors, and the option to output the plot to a 'pdf' file.  You can also add this plot to the selected list for later plotting with the 'Add to selected plot list' button</dd>
-<dt><b>Select Plot</b></dt><dd>Selects that dataset for later plotting with data from this or any other dataset in the database. </dd>
+<dt><b>SelectPlot</b></dt><dd>Selects that dataset for later plotting with data from this or any other dataset in the database. </dd>
 </dl>
 
+
 <b>Making Composite Plots</b>
 <p/>
 One of the new features of the new Reaction Database is the ablility to combine data from any record into one composite plot, thus allowing easy visual comparisons. As mentioned above this is accomplished using the "Select Plot" link on the full record display or the "Add to selected plot list" on the Plot display.  Doing either of these will take you to the "current list of selected plots" page which has options to display the combined plot as well as to manipulate the datasets by removing them from the list or rescaling them with a scalefactor.  The summary link will display more information on the individual dataset. Again there are various options to alter the axes types and save the plot in a 'pdf' file. Other links allow easy movement back and forward to the datasets and plotting page.   The list of current selected plots is specific to aa user/session and remains active for the complete user session, which generally means until the browser is exitted.      

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 17 10:03:32 2009	(r1316)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/Search.tml	Tue Nov 24 10:43:02 2009	(r1317)
@@ -15,7 +15,6 @@
       <a href="#" t:type="pagelink" t:page="search" t:context="prevcontext">Previous</a>&nbsp;|&nbsp;
       <a href="#" t:type="pagelink" t:page="search" t:context="nextcontext">Next</a>&nbsp;|&nbsp;
       <a href="#" t:type="pagelink" t:page="search" t:context="lastcontext">Last</a>&nbsp;|&nbsp;
-      <a href="#" t:type="pagelink" t:page="index">Home</a>
     </t:if>
 
 

Modified: trunk/hepdata-webapp/src/main/webapp/hepdata.css
==============================================================================
--- trunk/hepdata-webapp/src/main/webapp/hepdata.css	Tue Nov 17 10:03:32 2009	(r1316)
+++ trunk/hepdata-webapp/src/main/webapp/hepdata.css	Tue Nov 24 10:43:02 2009	(r1317)
@@ -24,11 +24,11 @@
 
 h1 
 { 
-  color: #336;
+  color: #446;
   font-weight: bold;
 }
 
-h1 a:link, h1 a:visited, h1 a:hover 
+h1 a:link, h1 a:visited  a:hover
 { 
   color: #336;
   text-decoration: none;