3 Commits
1.0 ... 1.1

4 changed files with 40 additions and 8 deletions

View File

@ -1,10 +1,14 @@
build :
VERSION =1.1
BUILD_NUMBER_FILE = build-number.txt
BUILD_NUMBER = $$(cat $(BUILD_NUMBER_FILE))
build : increment-build-number
mkdir -p build/css
cp src/www/*.* build
cp -r src/www/js build
cp -r resources/* build/.
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 :
rm -r build
@ -12,3 +16,10 @@ clean :
local-deploy: build
cp -r build ~/temp/server
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 @@
0

View File

@ -30,6 +30,12 @@
<section id=priorities>
<h3>Next Actions (unsorted)</h3>
</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>
</ul>
</section>
<section id=config-dialog>
<form>
<h3>Configuration</h3>
@ -63,7 +69,7 @@
<div class=button-panel>
<div class=global-config>
<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>
<div class=wait-overlay><img src="img/loading-spinner.gif"><br><span></span></div>

View File

@ -146,7 +146,7 @@
$(".category-name").parent().remove();
_.forEach(PD.gtdCfg.categories, this.makeCategoryItem); }
this.$el.find('.refresh').val(
this.$el.find('.refresh-period').val(
PD.refreshPeriod ? PD.refreshPeriod / 1000 : 15);
this.$el.fadeIn(); },
@ -322,7 +322,7 @@
function(span) { return $(span).text(); });
// 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()) {
localStorage.setItem("tsCfg", JSON.stringify(PD.tsCfg));
@ -337,9 +337,13 @@
PD.Main = Backbone.View.extend({
el: $("body"),
events: {
"click a.refresh" : "refresh"
"click a.pause-continue" : "toggleSync" },
initialize: function() {
_.bindAll(this, "refresh");
_.bindAll(this, "refresh", "toggleSync");
// Create our config dialog view.
PD.configDialog = new PD.ConfigDialog();
@ -366,7 +370,7 @@
this.refresh();
// Schedule future refreshes.
setInterval(this.refresh, PD.refreshPeriod ? PD.refreshPeriod : 15000);
PD.refreshIntervalId = setInterval(this.refresh, PD.refreshPeriod ? PD.refreshPeriod : 15000);
},
refresh: function() {
@ -492,7 +496,17 @@
collection.remove(model); }});
}
});
}
},
toggleSync: function() {
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'); } }
});
PD.main = new PD.Main();