From 47e43404aaab2684f0fe2cfb19db01784289df28 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 16 Jul 2011 11:00:30 +0200 Subject: [PATCH] - added doctype to html - added encoding to html - changed
to
- removed obsolete language attribute --- openlp/core/lib/__init__.py | 2 +- openlp/core/lib/displaytags.py | 2 +- openlp/core/lib/htmlbuilder.py | 8 ++++-- openlp/core/lib/renderer.py | 45 +++++++++++++++++++++--------- openlp/core/lib/serviceitem.py | 6 ++-- openlp/core/ui/printserviceform.py | 2 +- openlp/core/ui/servicemanager.py | 2 +- 7 files changed, 44 insertions(+), 23 deletions(-) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 187226272..7fbd5243c 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -202,7 +202,7 @@ def clean_tags(text): """ Remove Tags from text for display """ - text = text.replace(u'
', u'\n') + text = text.replace(u'
', u'\n') text = text.replace(u'{br}', u'\n') text = text.replace(u' ', u' ') for tag in DisplayTags.get_html_tags(): diff --git a/openlp/core/lib/displaytags.py b/openlp/core/lib/displaytags.py index addab4d75..95ce13bda 100644 --- a/openlp/core/lib/displaytags.py +++ b/openlp/core/lib/displaytags.py @@ -111,7 +111,7 @@ class DisplayTags(object): u'start html': u'', u'end tag': u'{/u}', u'end html': u'', u'protected': True}) base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Break'), - u'start tag': u'{br}', u'start html': u'
', u'end tag': u'', + u'start tag': u'{br}', u'start html': u'
', u'end tag': u'', u'end html': u'', u'protected': True}) DisplayTags.add_html_tags(base_tags) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 1f50e0d65..295a6c1ad 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -35,8 +35,10 @@ from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, \ log = logging.getLogger(__name__) HTMLSRC = u""" + + OpenLP Display -