diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 9b9160f3e..3fd7906f7 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -176,8 +176,8 @@ body {
return text.clientHeight;
}
- function show_footer(text){
- document.getElementById('footer').innerHTML(text);
+ function show_footer(footertext){
+ document.getElementById('footer').innerHTML(footertext);
}
function show_text(newtext){
@@ -314,6 +314,7 @@ def build_html(item, screen, alert):
build_lyrics(item),
u'true' if theme and theme.display_slideTransition else u'false',
image)
+ print html
return html
def build_lyrics(item):
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index b617362f3..9c6632650 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -91,6 +91,22 @@ class RenderManager(object):
u'start html':u'', \
u'end tag':u'{/g}', u'end html':u'', \
u'protected':False})
+ self.html_expands.append({u'desc':u'Pink', u'start tag':u'{pk}', \
+ u'start html':u'', \
+ u'end tag':u'{/pk}', u'end html':u'', \
+ u'protected':False})
+ self.html_expands.append({u'desc':u'Orange', u'start tag':u'{o}', \
+ u'start html':u'', \
+ u'end tag':u'{/o}', u'end html':u'', \
+ u'protected':False})
+ self.html_expands.append({u'desc':u'Purple', u'start tag':u'{pp}', \
+ u'start html':u'', \
+ u'end tag':u'{/pp}', u'end html':u'', \
+ u'protected':False})
+ self.html_expands.append({u'desc':u'White', u'start tag':u'{w}', \
+ u'start html':u'', \
+ u'end tag':u'{/w}', u'end html':u'', \
+ u'protected':False})
self.html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}', \
u'start html':u'', \
u'end tag':u'{/su}', u'end html':u'', \
@@ -243,8 +259,8 @@ class RenderManager(object):
serviceItem.theme = themedata
serviceItem.add_from_text(u'', verse, footer)
serviceItem.render_manager = self
- serviceItem.render(True)
serviceItem.raw_footer = footer
+ serviceItem.render(True)
self.display.buildHtml(serviceItem)
frame, raw_html = serviceItem.get_rendered_frame(0)
preview = self.display.text(raw_html)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index c548ff179..bbb2e1c2b 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -178,7 +178,7 @@ class MainDisplay(DisplayWidget):
or not self.isVisible():
shrink = True
else:
- shrink = False
+ shrink = False
js = u'show_alert("%s", "%s")' % (
text.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'),
u'top' if shrink else u'')
@@ -315,13 +315,13 @@ class MainDisplay(DisplayWidget):
self.serviceItem = serviceItem
html = build_html(self.serviceItem, self.screen, self.parent.alertTab)
self.webView.setHtml(html)
- if serviceItem.footer and serviceItem.foot_text:
+ if serviceItem.foot_text and serviceItem.foot_text:
self.footer(serviceItem.foot_text)
def footer(self, text):
log.debug(u'footer')
js = "show_footer('" + \
- text.replace("\\", "\\\\").replace("\'", "\\\'") + "')"
+ text.replace("\\", "\\\\").replace("\'", "\\\'") + "')"
self.frame.evaluateJavaScript(js)
def hideDisplay(self, mode=HideMode.Screen):