[HepData-svn] r1522 - trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: whalley
Date: Thu Mar 15 16:15:07 2012
New Revision: 1522

Log:
redoing displays with expand/hide

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

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	Thu Mar 15 16:14:23 2012	(r1521)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Thu Mar 15 16:15:07 2012	(r1522)
@@ -17,7 +17,7 @@
 <script type="text/javascript">
 function ExpandClicked(dom_element, expanded_url, expand_url){
   var startingPoint = dom_element.parentNode.parentNode.nextSibling;
- 
+
   dom_element.src = (dom_element.src.indexOf(expanded_url) != -1) ? expand_url: expanded_url;
 
   while (startingPoint){
@@ -190,12 +190,48 @@
       </t:if>
       
       <t:loop source="datasetsnew" value="dataset">
-        <div class="datasetbox">
-          <h3 class="datasettitle">
-            <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
-          </h3>
+
+         <t:if test="longFormat">
+         <div>
+         <div>
+           <div class="datasetbox">
+                    <!--     <h3 class="datasettitle"> -->
+                <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
+                ( <t:displayDatasetLocation ds="dataset" /> )
+         <!--     </h3> -->
+         <img  onClick="ExpandClicked(this,'${asset:context:button_expand.png}','${asset:context:button_hide.png}');" 
+                  src ="${asset:context:button_hide.png}"/> 
+          <!-- <p class="altdsformats"> -->
+            or 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>, 
+          <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,  
+          <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a> or 
+          <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">jhepwork</a>  
+          <!-- </p> -->
+          <t:displayDatasetComments ds="dataset" />
+
+          </div>
+            </div><div>
+             <div><t:datasetAsHtml dataset="dataset" format="${format}" /></div>
+        </div>
+        </div>
+         
+         <t:parameter name="else">
+
+         <div>
+         <div>
+           <div class="datasetbox">
+                    <!--     <h3 class="datasettitle"> -->
+                <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
+                 ( <t:displayDatasetLocation ds="dataset" /> )
+        <!--     </h3> -->
+         <img  onClick="ExpandClicked(this,'${asset:context:button_expand.png}','${asset:context:button_hide.png}');" 
+                  src ="${asset:context:button_expand.png}"/> 
           <!-- <p class="altdsformats"> -->
-          as:
+            or 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>, 
@@ -204,8 +240,17 @@
           <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a> or 
           <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">jhepwork</a>  
           <!-- </p> -->
-          <t:datasetAsHtml dataset="dataset" format="${format}" />
+          <t:displayDatasetComments ds="dataset" />
+          </div>
+            </div><div class="hidden">
+             <div><t:datasetAsHtml dataset="dataset" format="${format}" /></div>
+        </div>
         </div>
+
+         </t:parameter>
+         </t:if>
+         
+
       </t:loop>
       <t:if test="isMultiPage">
         <p>