Author: rgardler
Date: Wed Nov 16 14:36:57 2011
New Revision: 1202722
URL: http://svn.apache.org/viewvc?rev=1202722&view=rev
Log:
allow various parts of the content to be overwritten
Added:
incubator/wookie/trunk/widgets/templates/itemDetail/content_footer.html
incubator/wookie/trunk/widgets/templates/itemDetail/content_header.html
incubator/wookie/trunk/widgets/templates/itemDetail/content_primary.html
Modified:
incubator/wookie/trunk/widgets/templates/itemDetail/index.html
incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml
Added: incubator/wookie/trunk/widgets/templates/itemDetail/content_footer.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/content_footer.html?rev=1202722&view=auto
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/content_footer.html
(added)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/content_footer.html Wed
Nov 16 14:36:57 2011
@@ -0,0 +1,3 @@
+<div class="content">© University of Oxford</div>
+<a class="button" href="#help" data-role="button" data-rel="dialog"
+ data-transition="pop" data-icon="info" data-iconpos="left">Help</a>
Added: incubator/wookie/trunk/widgets/templates/itemDetail/content_header.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/content_header.html?rev=1202722&view=auto
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/content_header.html
(added)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/content_header.html Wed
Nov 16 14:36:57 2011
@@ -0,0 +1,4 @@
+<img class="logo" src="images/myExperiment_logo_32h.png"
+ alt="MyExperiment" title="MyExperiment Logo" />
+<div class="header_title" id="view_title">${widget.name}</div>
+
Added: incubator/wookie/trunk/widgets/templates/itemDetail/content_primary.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/content_primary.html?rev=1202722&view=auto
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/content_primary.html
(added)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/content_primary.html
Wed Nov 16 14:36:57 2011
@@ -0,0 +1,54 @@
+<div id="detail">
+ <p>NOTE: this section will be replaced by dynamic content when
+ the widget is run.</p>
+ <div class="overview">
+ <div class="thumbnail">
+ <img
+
src="http://www.myexperiment.org/workflows/16/versions/7/previews/medium.png";
+ /
+ alt="Preview image of the workflow" width="160">
+ </div>
+ <div class="meta-data">
+ <h3>Title</h3>
+ <p>Uploaded by:</p>
+ <div class="update-rating">
+ <div class="update"
+ <p>Last Updated</p>
+ </div>
+ <div class="rating">
+ <p>Rating</p>
+ </div>
+ </div>
+ <div class="clearer"/>
+ <div class="version-info">
+ <p>Version</p>
+ <p>Type</p>
+ <p>Licence</p>
+ </div>
+ </div>
+ <div class="description">
+ <p>This workflow searches for genes which reside in a QTL
+ (Quantitative Trait Loci) region in the mouse, Mus musculus. The
+ workflow requires an input of: a chromosome name or number; a
+ QTL start base pair position; QTL end base pair position. Data
+ is then extracted from BioMart to annotate each of the genes
+ found in this region. The Entrez and UniProt identifiers are
+ then sent to KEGG to obtain KEGG gene identifiers. The KEGG gene
+ identifiers are then used to searcg for pathways in the KEGG
+ pathway database.</p>
+ </div>
+</div>
+
+<div class="clear">
+ <div class="boxed">
+ <p>Created on</p>
+ <p>Viewed</p>
+ <p>Downloaded</p>
+ </div>
+
+ <div class="boxed">
+ <p>Tags:</p>
+ <p>Groups</p>
+ </div>
+</div>
+
Modified: incubator/wookie/trunk/widgets/templates/itemDetail/index.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/index.html?rev=1202722&r1=1202721&r2=1202722&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/index.html Wed Nov 16
14:36:57 2011
@@ -37,90 +37,30 @@
</head>
<body>
- <div data-role="page" class="type-home" id="home" data-theme="d">
- <div class="header" data-role="header" data-position="fixed">
- <img class="logo" src="images/myExperiment_logo_32h.png"
- alt="MyExperiment" title="MyExperiment Logo" />
- <div class="header_title"
id="view_title">${widget.name}</div>
- </div>
- <!-- /header -->
-
- <div data-role="content">
-
- <div data-role="collapsible" class="content-secondary"
data-theme="c"
-
data-content-theme="c">${content.secondary.actions}</div>
- <!-- /content-secondary -->
-
- <div class="content-primary" id="content-primary">
- <div id="detail">
- <p>NOTE: this section will be replaced
by dynamic content when
- the widget is run.</p>
- <div class="overview">
- <div class="thumbnail">
- <img
-
src="http://www.myexperiment.org/workflows/16/versions/7/previews/medium.png";
- /
- alt="Preview image of the workflow"
width="160">
- </div>
- <div class="meta-data">
- <h3>Title</h3>
- <p>Uploaded by:</p>
- <div
class="update-rating">
- <div
class="update"
- <p>Last
Updated</p>
- </div>
- <div
class="rating">
-
<p>Rating</p>
- </div>
- </div>
- <div class="clearer"/>
- <div
class="version-info">
- <p>Version</p>
- <p>Type</p>
- <p>Licence</p>
- </div>
- </div>
- <div class="description">
- <p>This workflow
searches for genes which reside in a QTL
- (Quantitative
Trait Loci) region in the mouse, Mus musculus. The
- workflow
requires an input of: a chromosome name or number; a
- QTL start base
pair position; QTL end base pair position. Data
- is then
extracted from BioMart to annotate each of the genes
- found in this
region. The Entrez and UniProt identifiers are
- then sent to
KEGG to obtain KEGG gene identifiers. The KEGG gene
- identifiers are
then used to searcg for pathways in the KEGG
- pathway
database.</p>
- </div>
- </div>
-
- <div class="clear">
-
- <div class="boxed">
- <p>Created on</p>
- <p>Viewed</p>
- <p>Downloaded</p>
- </div>
-
- <div class="boxed">
- <p>Tags:</p>
- <p>Groups</p>
- </div>
- </div>
- </div>
- </div>
- <!-- /content-primary -->
- </div>
- <!-- /content -->
-
- <div data-role="footer" class="footer" data-position="fixed">
- <div class="content">© University of Oxford</div>
- <a class="button" href="#help" data-role="button"
data-rel="dialog"
- data-transition="pop" data-icon="info"
data-iconpos="left">Help</a>
+ <div data-role="page" class="type-home" id="home" data-theme="d">
+ <div class="header" data-role="header" data-position="fixed">
+ ${content.header}
+ </div>
+
+
+ <div data-role="content">
+
+ <div data-role="collapsible" class="content-secondary" data-theme="c"
+ data-content-theme="c">
+ ${content.secondary}
+ </div>
+
+ <div class="content-primary" id="content-primary">
+ ${content.primary}
+ </div>
+ </div>
+ </div>
+
+ <div data-role="footer" class="footer" data-position="fixed">
+ ${content.footer}
+ </div>
- </div>
- <!-- /footer -->
- </div>
- <!-- /page -->
+</div>
<div data-role="dialog" id="help">
<div data-role="header">
Modified: incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml?rev=1202722&r1=1202721&r2=1202722&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml
(original)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml Wed
Nov 16 14:36:57 2011
@@ -23,13 +23,13 @@
<echo message="| Initialising template properties"/>
<echo message="+------------------------------------------"/>
- <loadfile property="content.header"
- srcFile="content_header.html"
- failonerror="false">
- <filterchain>
- <expandproperties/>
- </filterchain>
- </loadfile>
+ <loadfile property="content.header"
+ srcFile="content_header.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.header"
srcFile="${template.dir}/${template.name}/content_header.html"
@@ -57,6 +57,24 @@
</filterchain>
</loadfile>
+ <!-- load content from widget definition -->
+ <loadfile property="content.secondary"
+ srcFile="content_secondary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
+ <!-- load content from template definition -->
+ <loadfile property="content.secondary"
+ srcFile="${template.dir}/${template.name}/content_secondary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
<loadfile property="content.footer"
srcFile="content_footer.html"
failonerror="false">
![http://www.myexperiment.org/workflows/16/versions/7/previews/medium.png"](http://www.myexperiment.org/workflows/16/versions/7/previews/medium.png"){kind=link}