← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~phill-ridout/openlp/fixes into lp:openlp

 

phill has proposed merging lp:~phill-ridout/openlp/fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


tidied the code, adding spacing and escapes for quotes
fixed the position of the > on the body tag
added css to fix white space arround video
-- 
https://code.launchpad.net/~phill-ridout/openlp/fixes/+merge/29135
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/fixes into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-07-02 16:54:08 +0000
+++ openlp/core/ui/maindisplay.py	2010-07-03 03:20:38 +0000
@@ -43,19 +43,27 @@
 
 #http://www.steveheffernan.com/html5-video-player/demo-video-player.html
 HTMLVIDEO = u"""<html>
-  <script type="text/javascript" charset="utf-8">
+    <head>
+    <style>
+    *{
+        margin: 0;
+        padding:0
+    }
+    </style>
+    <script type=\"text/javascript\" charset=\"utf-8\">
     var video;
     var bodyLoaded = function(){
-        video = document.getElementById("video");
+        video = document.getElementById(\"video\");
         video.volume = 0;
     }
-  </script>
-        <body id=\"body\" onload=\"bodyLoaded();>\"
-        <video id=\"video\" src=\"%s\"
-            autoplay loop width=%s height=%s autobuffer=\"autobuffer\" preload >
-            your browser does not support the video tag
-        </video>
-        </body></html>
+    </script>
+    <body id=\"body\" onload=\"bodyLoaded();\">
+    <video id=\"video\" src=\"%s\"
+        autoplay loop width=\"%s\" height=\"%s\"
+        autobuffer=\"autobuffer\" preload >
+        your browser does not support the video tag
+    </video>
+    </body></html>
     """
 
 class DisplayManager(QtGui.QWidget):


Follow ups