diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index 9f18c1552..2014988b8 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -67,8 +67,12 @@ window.OpenLP = {
var ul = $("#service-manager > div[data-role=content] > ul[data-role=listview]");
ul.html("");
$.each(data.results.items, function (idx, value) {
+ var text = value["title"];
+ if (value["notes"]) {
+ text += ' - ' + value["notes"];
+ }
var li = $("
").append(
- $("").attr("value", parseInt(idx, 10)).text(value["title"]));
+ $("").attr("value", parseInt(idx, 10)).text(text));
li.attr("uuid", value["id"])
li.children("a").click(OpenLP.setItem);
ul.append(li);
@@ -98,8 +102,8 @@ window.OpenLP = {
} else {
text += slide["text"];
}
- if (slide["notes"]) {
- text += ("" + slide["notes"] + "
");
+ if (slide["slide_notes"]) {
+ text += ("" + slide["slide_notes"] + "
");
}
text = text.replace(/\n/g, '
');
if (slide["img"]) {
diff --git a/openlp/plugins/remotes/html/stage.js b/openlp/plugins/remotes/html/stage.js
index e63025b80..4834b4664 100644
--- a/openlp/plugins/remotes/html/stage.js
+++ b/openlp/plugins/remotes/html/stage.js
@@ -114,8 +114,8 @@ window.OpenLP = {
text += "
";
}
// use notes if available
- if (slide["notes"]) {
- text += '
' + slide["notes"];
+ if (slide["slide_notes"]) {
+ text += '
' + slide["slide_notes"];
}
text = text.replace(/\n/g, "
");
$("#currentslide").html(text);
diff --git a/openlp/plugins/remotes/lib/httprouter.py b/openlp/plugins/remotes/lib/httprouter.py
index 22e2495c0..1313c9f9c 100644
--- a/openlp/plugins/remotes/lib/httprouter.py
+++ b/openlp/plugins/remotes/lib/httprouter.py
@@ -521,7 +521,7 @@ class HttpRouter(RegistryProperties):
if current_item.is_capable(ItemCapabilities.HasDisplayTitle):
item['title'] = str(frame['display_title'])
if current_item.is_capable(ItemCapabilities.HasNotes):
- item['notes'] = str(frame['notes'])
+ item['slide_notes'] = str(frame['notes'])
if current_item.is_capable(ItemCapabilities.HasThumbnails) and \
Settings().value('remotes/thumbnails'):
# If the file is under our app directory tree send the portion after the match
@@ -531,8 +531,6 @@ class HttpRouter(RegistryProperties):
item['text'] = str(frame['title'])
item['html'] = str(frame['title'])
item['selected'] = (self.live_controller.selected_row == index)
- if current_item.notes:
- item['notes'] = item.get('notes', '') + '\n' + current_item.notes
data.append(item)
json_data = {'results': {'slides': data}}
if current_item: