raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

For non-text items, populate verse fields with the filename so remote apps have something useful to display. Update web remote to display the verse tag in the slide controller.

Browse Source 
bzr-revno: 1551
This commit is contained in:
Jonathan Corwin 2011-05-18 07:59:23 +01:00
commit e29e8fa024
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/remotes/html/openlp.js
View File

@ -76,7 +76,9 @@ window.OpenLP = {
var ul = $("#slide-controller > div[data-role=content] > ul[data-role=listview]"); var ul = $("#slide-controller > div[data-role=content] > ul[data-role=listview]");
ul.html(""); ul.html("");
for (idx in data.results.slides) { for (idx in data.results.slides) {
var text = data.results.slides[idx]["text"]; var text = data.results.slides[idx]["tag"];
if (text != "") text = text + ": ";
text = text + data.results.slides[idx]["text"];
text = text.replace(/\n/g, '<br />'); text = text.replace(/\n/g, '<br />');
var li = $("<li data-icon=\"false\">").append( var li = $("<li data-icon=\"false\">").append(
$("<a href=\"#\">").attr("value", parseInt(idx, 10)).html(text)); $("<a href=\"#\">").attr("value", parseInt(idx, 10)).html(text));

4
openlp/plugins/remotes/lib/httpserver.py
View File

@ -412,8 +412,8 @@ class HttpConnection(object):
item[u'html'] = unicode(frame[u'html']) item[u'html'] = unicode(frame[u'html'])
else: else:
item[u'tag'] = unicode(index + 1) item[u'tag'] = unicode(index + 1)
item[u'text'] = u'' item[u'text'] = unicode(frame[u'title'])
item[u'html'] = u'' item[u'html'] = unicode(frame[u'title'])
item[u'selected'] = (self.parent.current_slide == index) item[u'selected'] = (self.parent.current_slide == index)
data.append(item) data.append(item)
json_data = {u'results': {u'slides': data}} json_data = {u'results': {u'slides': data}}