forked from openlp/openlp
remove link on remote, add /stage shortcut plus tidies and refix
This commit is contained in:
parent
03380fb40f
commit
547b58e7b5
@ -43,7 +43,6 @@
|
|||||||
<a href="#service-manager" data-role="button" data-icon="arrow-r" data-iconpos="right">Service Manager</a>
|
<a href="#service-manager" data-role="button" data-icon="arrow-r" data-iconpos="right">Service Manager</a>
|
||||||
<a href="#slide-controller" data-role="button" data-icon="arrow-r" data-iconpos="right">Slide Controller</a>
|
<a href="#slide-controller" data-role="button" data-icon="arrow-r" data-iconpos="right">Slide Controller</a>
|
||||||
<a href="#alerts" data-role="button" data-icon="arrow-r" data-iconpos="right">Alerts</a>
|
<a href="#alerts" data-role="button" data-icon="arrow-r" data-iconpos="right">Alerts</a>
|
||||||
<a href="files/stage.html" data-role="button" rel="external">Stage View</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -113,6 +113,7 @@ window.OpenLP = {
|
|||||||
$.getJSON(
|
$.getJSON(
|
||||||
"/api/poll",
|
"/api/poll",
|
||||||
function (data, status) {
|
function (data, status) {
|
||||||
|
var prevItem = OpenLP.currentItem;
|
||||||
OpenLP.currentSlide = data.results.slide;
|
OpenLP.currentSlide = data.results.slide;
|
||||||
OpenLP.currentItem = data.results.item;
|
OpenLP.currentItem = data.results.item;
|
||||||
if ($("#service-manager").is(":visible")) {
|
if ($("#service-manager").is(":visible")) {
|
||||||
@ -130,6 +131,10 @@ window.OpenLP = {
|
|||||||
$("#service-manager div[data-role=content] ul[data-role=listview]").listview("refresh");
|
$("#service-manager div[data-role=content] ul[data-role=listview]").listview("refresh");
|
||||||
}
|
}
|
||||||
if ($("#slide-controller").is(":visible")) {
|
if ($("#slide-controller").is(":visible")) {
|
||||||
|
if (prevItem != OpenLP.currentItem) {
|
||||||
|
OpenLP.loadController();
|
||||||
|
return;
|
||||||
|
}
|
||||||
var idx = 0;
|
var idx = 0;
|
||||||
$("#slide-controller div[data-role=content] ul[data-role=listview] li").attr("data-theme", "c").removeClass("ui-btn-up-e").addClass("ui-btn-up-c");
|
$("#slide-controller div[data-role=content] ul[data-role=listview] li").attr("data-theme", "c").removeClass("ui-btn-up-e").addClass("ui-btn-up-c");
|
||||||
$("#slide-controller div[data-role=content] ul[data-role=listview] li a").each(function () {
|
$("#slide-controller div[data-role=content] ul[data-role=listview] li a").each(function () {
|
||||||
|
@ -54,14 +54,6 @@ body {
|
|||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
#service {
|
|
||||||
font-size: 16pt;
|
|
||||||
color: lightblue;
|
|
||||||
text-align: right;
|
|
||||||
white-space: nowrap;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#verseorder {
|
#verseorder {
|
||||||
font-size: 30pt;
|
font-size: 30pt;
|
||||||
color: green;
|
color: green;
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
<div id="right">
|
<div id="right">
|
||||||
<div id="clock"></div>
|
<div id="clock"></div>
|
||||||
<div id="notes"></div>
|
<div id="notes"></div>
|
||||||
<div id="service"></div>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="verseorder"></div>
|
<div id="verseorder"></div>
|
||||||
<div id="currentslide"></div>
|
<div id="currentslide"></div>
|
||||||
|
@ -27,15 +27,13 @@ window.OpenLP = {
|
|||||||
function (data, status) {
|
function (data, status) {
|
||||||
OpenLP.nextSong = "";
|
OpenLP.nextSong = "";
|
||||||
$("#notes").html("");
|
$("#notes").html("");
|
||||||
var div = $("#service");
|
|
||||||
div.html("");
|
|
||||||
for (idx in data.results.items) {
|
for (idx in data.results.items) {
|
||||||
idx = parseInt(idx, 10);
|
idx = parseInt(idx, 10);
|
||||||
div.append(data.results.items[idx]["title"] + "<br />");
|
|
||||||
if ((data.results.items[idx]["selected"]) &&
|
if ((data.results.items[idx]["selected"]) &&
|
||||||
(data.results.items.length > idx + 1)) {
|
(data.results.items.length > idx + 1)) {
|
||||||
$("#notes").html(data.results.items[idx]["notes"]);
|
$("#notes").html(data.results.items[idx]["notes"]);
|
||||||
OpenLP.nextSong = data.results.items[idx + 1]["title"];
|
OpenLP.nextSong = data.results.items[idx + 1]["title"];
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OpenLP.updateSlide();
|
OpenLP.updateSlide();
|
||||||
|
@ -34,6 +34,9 @@ the remotes.
|
|||||||
``/``
|
``/``
|
||||||
Go to the web interface.
|
Go to the web interface.
|
||||||
|
|
||||||
|
``/stage``
|
||||||
|
Show the stage view.
|
||||||
|
|
||||||
``/files/{filename}``
|
``/files/{filename}``
|
||||||
Serve a static file.
|
Serve a static file.
|
||||||
|
|
||||||
@ -241,6 +244,7 @@ class HttpConnection(object):
|
|||||||
self.parent = parent
|
self.parent = parent
|
||||||
self.routes = [
|
self.routes = [
|
||||||
(u'^/$', self.serve_file),
|
(u'^/$', self.serve_file),
|
||||||
|
(u'^/(stage)$', self.serve_file),
|
||||||
(r'^/files/(.*)$', self.serve_file),
|
(r'^/files/(.*)$', self.serve_file),
|
||||||
(r'^/api/poll$', self.poll),
|
(r'^/api/poll$', self.poll),
|
||||||
(r'^/api/controller/(live|preview)/(.*)$', self.controller),
|
(r'^/api/controller/(live|preview)/(.*)$', self.controller),
|
||||||
@ -312,6 +316,8 @@ class HttpConnection(object):
|
|||||||
log.debug(u'serve file request %s' % filename)
|
log.debug(u'serve file request %s' % filename)
|
||||||
if not filename:
|
if not filename:
|
||||||
filename = u'index.html'
|
filename = u'index.html'
|
||||||
|
elif filename == u'stage':
|
||||||
|
filename = u'stage.html'
|
||||||
path = os.path.normpath(os.path.join(self.parent.html_dir, filename))
|
path = os.path.normpath(os.path.join(self.parent.html_dir, filename))
|
||||||
if not path.startswith(self.parent.html_dir):
|
if not path.startswith(self.parent.html_dir):
|
||||||
return HttpResponse(code=u'404 Not Found')
|
return HttpResponse(code=u'404 Not Found')
|
||||||
|
Loading…
Reference in New Issue
Block a user