From bbbf0d3435d90fa524aab711035853b344b6f0f6 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 20 May 2011 23:30:20 +0100
Subject: [PATCH] Go live/add to service via list

---
 openlp/core/ui/servicemanager.py       |  2 +-
 openlp/plugins/remotes/html/index.html |  2 +-
 openlp/plugins/remotes/html/openlp.js  | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 358877cc7..94cf621ab 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -757,7 +757,7 @@ class ServiceManager(QtGui.QWidget):
         """
         Called by a signal to select a specific item.
         """
-        self.setItem(int(message[0]))
+        self.setItem(int(message))
 
     def setItem(self, index):
         """
diff --git a/openlp/plugins/remotes/html/index.html b/openlp/plugins/remotes/html/index.html
index bfb0d5ea4..fd7fb3715 100644
--- a/openlp/plugins/remotes/html/index.html
+++ b/openlp/plugins/remotes/html/index.html
@@ -109,7 +109,7 @@
       <input type="search" name="search-text" id="search-text" value="" />
     </div>
     <a href="#" id="search-submit" data-role="button">Search</a>
-    <ul data-role="listview" data-inset="true" data-split-icon="plus">
+    <ul data-role="listview" data-inset="true">
   </div>
 </div>
 </body>
diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index 4688fb499..c75a0cf90 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -219,22 +219,23 @@ window.OpenLP = {
         } 
         else {
             $.each(data.results.items, function (idx, value) {
-              var li = $("<li>");
-              li.append($("<a href=\"#\">").text(value[1]).click(function () {
-                OpenLP.goLive(value[0]);
-              }));
-              li.append($("<a href=\"#\">").click(function () {
-                OpenLP.addToService(value[0]);
-              }));
+              var li = $("<li><ul>").text(value[1]);
+              li.append($("<ul><li><a id=\"go-live\" href=\"#\">Go Live</a></li>" +
+              "<li><a id =\"add-service\" href=\"#\">Add To Service</a></li></ul>"));
+              li.find("a").attr("value", value[0]);
               ul.append(li);
             });
+            ul.find("#go-live").click(OpenLP.goLive);
+            ul.find("#add-service").click(OpenLP.addToService);
         }
         ul.listview("refresh");
       }
     );
     return false;
   },
-  goLive: function (id) {
+  goLive: function (event) {
+    var item = OpenLP.getElement(event);
+    var id = item.attr("value");
     var text = JSON.stringify({"request": {"id": id}});
     $.getJSON(
       "/api/" + $("#search-plugin").val() + "/live",
@@ -242,11 +243,14 @@ window.OpenLP = {
     $.mobile.changePage("slide-controller");
     return false;
   },
-  addToService: function (id) {
+  addToService: function (event) {
+    var item = OpenLP.getElement(event);
+    var id = item.attr("value");
     var text = JSON.stringify({"request": {"id": id}});
     $.getJSON(
       "/api/" + $("#search-plugin").val() + "/add",
       {"data": text})
+    history.back();
     return false;
   }
 }