jdb/personal-display
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jdb:1.1
Branches Tags
jdb:main
jdb:1.4 jdb:1.3 jdb:1.2 jdb:1.1 jdb:1.0
..
compare: jdb:1.3
Branches Tags
jdb:main
jdb:1.4 jdb:1.3 jdb:1.2 jdb:1.1 jdb:1.0

2 Commits
1.1 ... 1.3

Author SHA1 Message Date
Jonathan Bernard
9bd00cdab7 Added versioning to HTML and JavaScript. 2013-10-09 14:22:17 -05:00
Jonathan Bernard
60e76118e3 Styled refresh and pause/continue buttons. Fixed link behavior. 2013-10-09 14:16:47 -05:00
4 changed files with 34 additions and 5 deletions
Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION =1.1 VERSION =1.3
BUILD_NUMBER_FILE = build-number.txt BUILD_NUMBER_FILE = build-number.txt
BUILD_NUMBER = $$(cat $(BUILD_NUMBER_FILE)) BUILD_NUMBER = $$(cat $(BUILD_NUMBER_FILE))

20
src/www/css/personal-display.scss
View File

@ -250,3 +250,23 @@ body > section {
margin: 0; margin: 0;
padding: 0 } } padding: 0 } }
} }
#main-buttons {
border-top: solid 2px $accent1;
ul {
list-style: none;
padding: 0;
margin: 0;
li {
display: inline-block;
margin: 0;
a {
border: $accent2 solid thin;
border-radius: 5px;
display: block;
cursor: pointer;
padding: 0.1rem 0.3rem; } } }
}

2
src/www/index.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
<meta charset="utf-8">
<title>What I am Doing</title> <title>What I am Doing</title>
<link rel="stylesheet" href="css/personal-display.css" type="text/css"> <link rel="stylesheet" href="css/personal-display.css" type="text/css">
<link href='//fonts.googleapis.com/css?family=Play|Advent+Pro' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Play|Advent+Pro' rel='stylesheet' type='text/css'>
@ -20,6 +21,7 @@
<script src="js/personal-display.js" type="text/javascript" defer></script> <script src="js/personal-display.js" type="text/javascript" defer></script>
<meta name="viewport" content="width=device-width, user-scalable=no"> <meta name="viewport" content="width=device-width, user-scalable=no">
<meta name=version content="1.3">
</head> </head>
<body> <body>
<section id=current-task> <section id=current-task>

15
src/www/js/personal-display.js
View File

@ -2,6 +2,7 @@
var root = this; var root = this;
var PD = root.PersonalDisplay = {}; var PD = root.PersonalDisplay = {};
PD.version = "1.3"
PD.hasHTML5LocalStorage = function() { PD.hasHTML5LocalStorage = function() {
try { try {
@ -338,7 +339,7 @@
el: $("body"), el: $("body"),
events: { events: {
"click a.refresh" : "refresh" "click a.refresh" : "refresh",
"click a.pause-continue" : "toggleSync" }, "click a.pause-continue" : "toggleSync" },
initialize: function() { initialize: function() {
@ -373,7 +374,7 @@
PD.refreshIntervalId = setInterval(this.refresh, PD.refreshPeriod ? PD.refreshPeriod : 15000); PD.refreshIntervalId = setInterval(this.refresh, PD.refreshPeriod ? PD.refreshPeriod : 15000);
}, },
refresh: function() { refresh: function(evt) {
// If the dialog is still open we skip this sync to give the user // If the dialog is still open we skip this sync to give the user
// a chance to finish configuration. // a chance to finish configuration.
if ($("#config-dialog").is(":visible")) { return; } if ($("#config-dialog").is(":visible")) { return; }
@ -496,9 +497,11 @@
collection.remove(model); }}); collection.remove(model); }});
} }
}); });
if (evt) evt.preventDefault();
}, },
toggleSync: function() { toggleSync: function(evt) {
if (PD.refreshIntervalId == null) { if (PD.refreshIntervalId == null) {
PD.refreshIntervalId = setInterval(this.refresh, PD.refreshIntervalId = setInterval(this.refresh,
PD.refreshPeriod ? PD.refreshPeriod : 15000); PD.refreshPeriod ? PD.refreshPeriod : 15000);
@ -506,7 +509,11 @@
else { else {
clearInterval(PD.refreshIntervalId); clearInterval(PD.refreshIntervalId);
PD.refreshIntervalId = null; PD.refreshIntervalId = null;
$('.pause-continue').text('Resume Monitoring'); } } $('.pause-continue').text('Resume Monitoring'); }
if (evt) evt.preventDefault();
}
}); });
PD.main = new PD.Main(); PD.main = new PD.Main();