openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/render into lp:~trb143/openlp/renderer.

Requested reviews:
  OpenLP Core (openlp-core)


Fix footer display, and fix a few CSS errors.
For merging in Tim's branch, not trunk.
-- 
https://code.launchpad.net/~j-corwin/openlp/render/+merge/33464
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/render into lp:~trb143/openlp/renderer.

=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py	2010-08-22 07:39:23 +0000
+++ openlp/core/lib/htmlbuilder.py	2010-08-23 22:27:42 +0000
@@ -177,7 +177,7 @@
     }
 
     function show_footer(footertext){
-        document.getElementById('footer').innerHTML(footertext);
+        document.getElementById('footer').innerHTML = footertext;
     }
 
     function show_text(newtext){
@@ -341,8 +341,8 @@
     outline = u'display: none;'
     shadow = u'display: none;'
     if theme:
-        lyricscommon =  u'width: %spx; height: %spx; word-wrap: break-word  ' \
-            u'font-family %s; font-size: %spx; color: %s; line-height: %d%%' % \
+        lyricscommon =  u'width: %spx; height: %spx; word-wrap: break-word;  ' \
+            u'font-family: %s; font-size: %spx; color: %s; line-height: %d%%' % \
             (item.main.width(), item.main.height(),
             theme.font_main_name, theme.font_main_proportion,
             theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
@@ -397,7 +397,7 @@
     font-family: %s;
     font-size: %spx;
     color: %s;
-    align: %s;
+    text-align: %s;
     """
     theme = item.themedata
     if not theme:
@@ -423,7 +423,7 @@
     style = """
     width: %s;
     vertical-align: %s;
-    font-family %s;
+    font-family: %s;
     font-size: %spx;
     color: %s;
     background-color: %s;