diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index c193f124b..c898c955f 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -72,10 +72,10 @@ HTMLSRC = u"""
-
+
-
+
@@ -136,13 +136,8 @@ def build_blank(width, height):
Screen height
"""
blank = """
- #blank {
- position: absolute;
- left: 0px;
- top: 0px;
- width: %spx;
- height: %spx;
- z-index:10;
+ #blank { position: absolute; left: 0px; top: 0px;
+ width: %spx; height: %spx; z-index:10;
}
"""
return blank % (width, height)
@@ -157,19 +152,13 @@ def build_image(width, height):
Screen height
"""
image = """
- #image {
- position: absolute;
- left: 0px;
- top: 0px;
- width: %spx;
- height: %spx;
- z-index:2;
+ #image { position: absolute; left: 0px; top: 0px;
+ width: %spx; height: %spx; z-index:2;
}
"""
return image % (width, height)
def build_image_src(image):
- #
image_src = """
"""
@@ -236,7 +225,7 @@ def build_lyrics(item):
def build_footer(item):
lyrics = """
- #footer {position: absolute; %s z-index:3; %s; %s }
+ #footer {position: absolute; %s z-index:5; %s; %s }
"""
theme = item.themedata
lyrics_html = u''
@@ -269,7 +258,7 @@ def build_footer(item):
def build_alert(width, alertTab):
alert = """
#alert { position: absolute; left: 0px; top: 70px;
- width: %spx; height: 10px; z-index:4; font-size: %spx;
+ width: %spx; height: 10px; z-index:6; font-size: %spx;
}
#alert p {
background-color: %s;
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 6a917e046..648d05c89 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -202,13 +202,17 @@ class MainDisplay(DisplayWidget):
"document.getElementById('video').style.visibility = 'hidden'")
self.frame.evaluateJavaScript(
"document.getElementById('image').style.visibility = 'visible'")
- self.frame.findFirstElement('img').setAttribute(
- 'src', unicode('data:image/png;base64,%s' % image_to_byte(image)))
+ self.frame.findFirstElement(u'img').setAttribute(
+ u'src', unicode(u'data:image/png;base64,%s' % image_to_byte(image)))
- def reset(self):
- log.debug(u'reset')
- self.frame.findFirstElement('img').setAttribute(
- 'src', unicode('data:image/png;base64,%s' % image_to_byte(self.serviceItem.bg_frame)))
+ def resetImage(self):
+ log.debug(u'resetImage')
+ self.frame.findFirstElement(u'img').setAttribute(
+ u'src', unicode(u'data:image/png;base64,%s' % image_to_byte(self.serviceItem.bg_frame)))
+
+ def resetVideo(self):
+ log.debug(u'resetVideo')
+ self.frame.findFirstElement('img').setAttribute(u'src',u'display: none;' )
def video(self, videoPath, noSound=False):
log.debug(u'video')
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 1372e0e01..93271a604 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -177,7 +177,7 @@ class ImageMediaItem(MediaManagerItem):
def onResetClick(self):
self.resetButton.setVisible(False)
- self.parent.liveController.display.reset()
+ self.parent.liveController.display.resetImage()
def onReplaceClick(self):
if check_item_selected(self.listView,
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index cd68c7e2f..4504dc455 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -107,7 +107,7 @@ class MediaMediaItem(MediaManagerItem):
def onResetClick(self):
self.resetButton.setVisible(False)
- self.parent.liveController.display.reset()
+ self.parent.liveController.display.resetVideo()
def onReplaceClick(self):
if check_item_selected(self.listView,