openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/remote into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #596995 in OpenLP: "Remotes Plugin does not work with PPA version"
  https://bugs.launchpad.net/openlp/+bug/596995

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/remote/+merge/61321

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.
-- 
https://code.launchpad.net/~j-corwin/openlp/remote/+merge/61321
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/remote into lp:openlp.

=== modified file 'openlp/plugins/remotes/html/openlp.js'
--- openlp/plugins/remotes/html/openlp.js	2011-05-16 21:01:21 +0000
+++ openlp/plugins/remotes/html/openlp.js	2011-05-17 22:06:00 +0000
@@ -76,7 +76,9 @@
         var ul = $("#slide-controller > div[data-role=content] > ul[data-role=listview]");
         ul.html("");
         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 />');
           var li = $("<li data-icon=\"false\">").append(
             $("<a href=\"#\">").attr("value", parseInt(idx, 10)).html(text));

=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py	2011-05-17 18:48:04 +0000
+++ openlp/plugins/remotes/lib/httpserver.py	2011-05-17 22:06:00 +0000
@@ -412,8 +412,8 @@
                         item[u'html'] = unicode(frame[u'html'])
                     else:
                         item[u'tag'] = unicode(index + 1)
-                        item[u'text'] = u''
-                        item[u'html'] = u''
+                        item[u'text'] = unicode(frame[u'title'])
+                        item[u'html'] = unicode(frame[u'title'])
                     item[u'selected'] = (self.parent.current_slide == index)
                     data.append(item)
             json_data = {u'results': {u'slides': data}}