Author: rgardler
Date: Sat Nov 5 16:01:13 2011
New Revision: 1197975
URL: http://svn.apache.org/viewvc?rev=1197975&view=rev
Log:
use jqeury to fix the footer not javascript
Modified:
incubator/wookie/trunk/widgets/templates/base/index.html
incubator/wookie/trunk/widgets/templates/base/scripts/controller.js
incubator/wookie/trunk/widgets/templates/browse/index.html
incubator/wookie/trunk/widgets/templates/itemDetail/index.html
Modified: incubator/wookie/trunk/widgets/templates/base/index.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/index.html?rev=1197975&r1=1197974&r2=1197975&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/base/index.html Sat Nov 5
16:01:13 2011
@@ -34,7 +34,7 @@
<body>
<div data-role="page" class="type-home" id="home" data-theme="d" >
- <div class="header" data-role="header">
+ <div class="header" data-role="header" data-position="fixed">
${content.header}
</div> <!-- /header -->
@@ -44,7 +44,7 @@
</div> <!-- /content-primary -->
</div> <!-- /content -->
- <div data-role="footer" class="footer" id="footer">
+ <div data-role="footer" class="footer" id="footer" data-position="fixed">
${content.footer}
</div> <!-- /footer -->
</div> <!-- /page -->
Modified: incubator/wookie/trunk/widgets/templates/base/scripts/controller.js
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/scripts/controller.js?rev=1197975&r1=1197974&r2=1197975&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/scripts/controller.js
(original)
+++ incubator/wookie/trunk/widgets/templates/base/scripts/controller.js Sat Nov
5 16:01:13 2011
@@ -34,11 +34,6 @@ var ${widget.shortname}_controller = {
* Update the display
*/
update:function() {
- var viewport = ${widget.shortname}_controller.getViewport();
- var header = $(".header").outerHeight(true);
- var footer = $(".footer").outerHeight(true);
- var space = $(".ui-content").outerHeight(true) -
$(".ui-content").height();
- $(".content-primary").height(viewport.height - space - header - footer);
},
/**
Modified: incubator/wookie/trunk/widgets/templates/browse/index.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/index.html?rev=1197975&r1=1197974&r2=1197975&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/browse/index.html Sat Nov 5
16:01:13 2011
@@ -39,7 +39,7 @@
<body>
<div data-role="page" class="type-home" id="home" data-theme="d">
- <div class="header" data-role="header">
+ <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>
@@ -109,7 +109,7 @@
</div>
<!-- /content -->
- <div data-role="footer" class="footer">
+ <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>
Modified: incubator/wookie/trunk/widgets/templates/itemDetail/index.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/index.html?rev=1197975&r1=1197974&r2=1197975&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/index.html Sat Nov 5
16:01:13 2011
@@ -38,7 +38,7 @@
<body>
<div data-role="page" class="type-home" id="home" data-theme="d">
- <div class="header" data-role="header">
+ <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>
@@ -112,7 +112,7 @@
</div>
<!-- /content -->
- <div data-role="footer" class="footer">
+ <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>
