Permalink
Browse files

Tweak to supplied patches to Issue #92.

* Added some <baseurl>'s to the DirectionScreen and MainScreen templates.
* Changed the calling of the setRefresh to just reflect the time to run it, as
the URL wasn't being used.
* Added the jQueryMobile Library to the DirectionScreen template.
  • Loading branch information...
1 parent 79d0ed8 commit 1801bc27c7f2d8b16b57391c7b854fafb056ff33 @JonTheNiceGuy JonTheNiceGuy committed Aug 14, 2012
View
@@ -1,4 +1,4 @@
-function setRefresh(url, timeout) {
+function setRefresh(timeout) {
setInterval(function() {
$.mobile.changePage(
window.location.href,
@@ -4,11 +4,13 @@
<head>
<title>Direction Screen</title>
<link rel="stylesheet" type="text/css" href="../Media/directions.css" />
+ <link rel="stylesheet" href="<!--SM:$SiteConfig.baseurl:SM-->media/JQM/jquery.mobile-1.1.1.min.css">
<script type="text/javascript" src="<!--SM:$SiteConfig.baseurl:SM-->media/JQM/jquery-1.7.1.min.js"></script>
+ <script type="text/javascript" src="<!--SM:$SiteConfig.baseurl:SM-->media/JQM/jquery.mobile-1.1.1.min.js"></script>
<script type="text/javascript" src="<!--SM:$SiteConfig.baseurl:SM-->media/jQueryClock/jquery.jclock.js"></script>
- <script src="media/refresh.js"></script>
- <script type="text/Javascript">
- window.onload = setRefresh("directionscreen", 60000);
+ <script type="text/javascript" src="<!--SM:$SiteConfig.baseurl:SM-->media/refresh.js"></script>
+ <script type="text/javascript">
+ window.onload = setRefresh(60000);
</script>
</head>
<body>
@@ -1,13 +1,13 @@
<html>
<head>
<title></title>
-<link rel="stylesheet" href="media/css.css" type="text/css">
-<link rel="stylesheet" href="media/JQM/jquery.mobile-1.1.1.min.css">
-<script src="media/JQM/jquery-1.7.1.min.js"></script>
-<script src="media/JQM/jquery.mobile-1.1.1.min.js"></script>
-<script src="media/refresh.js"></script>
+<link rel="stylesheet" href="<!--SM:$SiteConfig.baseurl:SM-->media/css.css" type="text/css">
+<link rel="stylesheet" href="<!--SM:$SiteConfig.baseurl:SM-->media/JQM/jquery.mobile-1.1.1.min.css">
+<script src="<!--SM:$SiteConfig.baseurl:SM-->media/JQM/jquery-1.7.1.min.js"></script>
+<script src="<!--SM:$SiteConfig.baseurl:SM-->media/JQM/jquery.mobile-1.1.1.min.js"></script>
+<script src="<!--SM:$SiteConfig.baseurl:SM-->media/refresh.js"></script>
<script type="text/Javascript">
- window.onload = setRefresh("mainscreen", 60000);
+ window.onload = setRefresh(60000);
</script>
</head>
@@ -37,7 +37,7 @@
<!--SM:if isset($timeout):SM-->
<script src="media/refresh.js"></script>
<script type="text/Javascript">
- window.onload = setRefresh("<!--SM:$smarty.server.SERVER_NAME:SM-->", <!--SM:$timeout:SM-->);
+ window.onload = setRefresh(<!--SM:$timeout:SM-->);
</script>
<!--SM:/if:SM-->
</head>

0 comments on commit 1801bc2

Please sign in to comment.