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

Compare commits

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

7 Commits
1.0 ... 1.4

Author SHA1 Message Date
Jonathan Bernard
bf20564858 Added fullscreen button. 2013-10-28 12:05:49 -05:00
Jonathan Bernard
0a083ba8cc Added button to allow the user to open the config dialog on command. 2013-10-28 11:09:36 -05:00
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
Jonathan Bernard
98b5208adb Updated version number to 1.1 2013-10-09 13:43:22 -05:00
Jonathan Bernard
0224a1cd0a Added version and build numbers to the build process. 2013-10-09 13:32:55 -05:00
Jonathan Bernard
563edb4f5d Added Pause/Continue and Refresh-on-demand. 2013-10-09 13:32:20 -05:00
5 changed files with 102 additions and 8 deletions
Expand all files Collapse all files

15
Makefile
View File

@ -1,10 +1,14 @@
build : VERSION =1.4
BUILD_NUMBER_FILE = build-number.txt
BUILD_NUMBER = $$(cat $(BUILD_NUMBER_FILE))
build : increment-build-number
mkdir -p build/css mkdir -p build/css
cp src/www/*.* build cp src/www/*.* build
cp -r src/www/js build cp -r src/www/js build
cp -r resources/* build/. cp -r resources/* build/.
sass src/www/css/personal-display.scss build/css/personal-display.css sass src/www/css/personal-display.scss build/css/personal-display.css
tar czf personal-display.tar.gz build tar czf personal-display-$(VERSION).$(BUILD_NUMBER).tar.gz build
clean : clean :
rm -r build rm -r build
@ -12,3 +16,10 @@ clean :
local-deploy: build local-deploy: build
cp -r build ~/temp/server cp -r build ~/temp/server
ssh jdb-server 'rm -r ~/public_html/personal-display; mv temp/build ~/public_html/personal-display' ssh jdb-server 'rm -r ~/public_html/personal-display; mv temp/build ~/public_html/personal-display'
increment-build-number:
if ! test -f $(BUILD_NUMBER_FILE); then echo 0 > $(BUILD_NUMBER_FILE); fi
echo $$(($$(cat $(BUILD_NUMBER_FILE)) + 1)) > $(BUILD_NUMBER_FILE)
test-build-number:
touch $(BUILD_NUMBER).text.txt

1
build-number.txt Normal file
View File

@ -0,0 +1 @@
4

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; } } }
}

12
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.4">
</head> </head>
<body> <body>
<section id=current-task> <section id=current-task>
@ -30,6 +32,14 @@
<section id=priorities> <section id=priorities>
<h3>Next Actions (unsorted)</h3> <h3>Next Actions (unsorted)</h3>
</section> </section>
<section id=main-buttons>
<ul>
<li><a href="#" class=pause-continue>Pause Monitoring</a></li>
<li><a href="#" class=refresh>Refresh Now</a></li>
<li><a href="#" class=show-config>Config</a></li>
<li><a href="#" class=toggle-fullscreen>Go Fullscreen</a></li>
</ul>
</section>
<section id=config-dialog> <section id=config-dialog>
<form> <form>
<h3>Configuration</h3> <h3>Configuration</h3>
@ -63,7 +73,7 @@
<div class=button-panel> <div class=button-panel>
<div class=global-config> <div class=global-config>
<label>Refresh (sec): </label> <label>Refresh (sec): </label>
<input type=text class=refresh></div> <input type=text class=refresh-period></div>
<div class=save-button><a href="#">Save and Close</a></div> <div class=save-button><a href="#">Save and Close</a></div>
</div> </div>
<div class=wait-overlay><img src="img/loading-spinner.gif"><br><span></span></div> <div class=wait-overlay><img src="img/loading-spinner.gif"><br><span></span></div>

62
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.4"
PD.hasHTML5LocalStorage = function() { PD.hasHTML5LocalStorage = function() {
try { try {
@ -146,7 +147,7 @@
$(".category-name").parent().remove(); $(".category-name").parent().remove();
_.forEach(PD.gtdCfg.categories, this.makeCategoryItem); } _.forEach(PD.gtdCfg.categories, this.makeCategoryItem); }
this.$el.find('.refresh').val( this.$el.find('.refresh-period').val(
PD.refreshPeriod ? PD.refreshPeriod / 1000 : 15); PD.refreshPeriod ? PD.refreshPeriod / 1000 : 15);
this.$el.fadeIn(); }, this.$el.fadeIn(); },
@ -322,7 +323,7 @@
function(span) { return $(span).text(); }); function(span) { return $(span).text(); });
// Save global data // Save global data
PD.refreshPeriod = parseInt(this.$el.find(".refresh").val()) * 1000; PD.refreshPeriod = parseInt(this.$el.find(".refresh-period").val()) * 1000;
if (PD.hasHTML5LocalStorage()) { if (PD.hasHTML5LocalStorage()) {
localStorage.setItem("tsCfg", JSON.stringify(PD.tsCfg)); localStorage.setItem("tsCfg", JSON.stringify(PD.tsCfg));
@ -337,9 +338,15 @@
PD.Main = Backbone.View.extend({ PD.Main = Backbone.View.extend({
el: $("body"), el: $("body"),
events: {
"click a.refresh" : "refresh",
"click a.pause-continue" : "toggleSync",
"click a.show-config" : "showConfig",
"click a.toggle-fullscreen" : "toggleFullscreen" },
initialize: function() { initialize: function() {
_.bindAll(this, "refresh"); _.bindAll(this, "refresh", "toggleSync");
// Create our config dialog view. // Create our config dialog view.
PD.configDialog = new PD.ConfigDialog(); PD.configDialog = new PD.ConfigDialog();
@ -366,10 +373,11 @@
this.refresh(); this.refresh();
// Schedule future refreshes. // Schedule future refreshes.
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; }
@ -492,6 +500,50 @@
collection.remove(model); }}); collection.remove(model); }});
} }
}); });
if (evt) evt.preventDefault();
},
showConfig: function() { PD.configDialog.show(); },
toggleFullscreen: function(evt) {
var $button = $(evt.target);
if ($button.text() == "Go Fullscreen") {
if (document.documentElement.requestFullscreen) {
document.documentElement.requestFullscreen(); }
else if (document.documentElement.webkitRequestFullscreen) {
document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT); }
else if (document.documentElement.mozRequestFullScreen) {
document.documentElement.mozRequestFullScreen(); }
else { alert ("Not supported by this browser."); }
$button.text("Leave Fullscreen"); }
else {
if (document.exitFullscreen) {
document.exitFullscreen(); }
else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen(); }
else if (document.mozCancelFullscreen) {
document.documentElement.mozCancelFullscreen(); }
else { alert ("Not supported by this browser."); }
$button.text("Go Fullscreen"); } },
toggleSync: function(evt) {
if (PD.refreshIntervalId == null) {
PD.refreshIntervalId = setInterval(this.refresh,
PD.refreshPeriod ? PD.refreshPeriod : 15000);
$('.pause-continue').text('Pause Monitoring'); }
else {
clearInterval(PD.refreshIntervalId);
PD.refreshIntervalId = null;
$('.pause-continue').text('Resume Monitoring'); }
if (evt) evt.preventDefault();
} }
}); });