forked from openlp/openlp
Beauty spa for the htmlbuilder
This commit is contained in:
parent
2443b94eda
commit
5fe54b5907
|
|
@ -398,55 +398,54 @@ from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, Vertic
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
HTML_SRC = Template("""
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>OpenLP Display</title>
|
||||
<style>
|
||||
*{
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>OpenLP Display</title>
|
||||
<style>
|
||||
*{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
overflow: hidden;
|
||||
-webkit-user-select: none;
|
||||
}
|
||||
body {
|
||||
}
|
||||
body {
|
||||
${bg_css};
|
||||
}
|
||||
.size {
|
||||
}
|
||||
.size {
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
top: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
#black {
|
||||
}
|
||||
#black {
|
||||
z-index: 8;
|
||||
background-color: black;
|
||||
display: none;
|
||||
}
|
||||
#bgimage {
|
||||
}
|
||||
#bgimage {
|
||||
z-index: 1;
|
||||
}
|
||||
#image {
|
||||
}
|
||||
#image {
|
||||
z-index: 2;
|
||||
}
|
||||
${css_additions}
|
||||
#footer {
|
||||
}
|
||||
${css_additions}
|
||||
#footer {
|
||||
position: absolute;
|
||||
z-index: 6;
|
||||
${footer_css}
|
||||
}
|
||||
/* lyric css */
|
||||
${lyrics_css}
|
||||
sup {
|
||||
}
|
||||
/* lyric css */${lyrics_css}
|
||||
sup {
|
||||
font-size: 0.6em;
|
||||
vertical-align: top;
|
||||
position: relative;
|
||||
top: -0.3em;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
var timer = null;
|
||||
var transition = ${transitions};
|
||||
${js_additions}
|
||||
|
|
@ -535,63 +534,63 @@ sup {
|
|||
function show_text_completed(){
|
||||
return (timer == null);
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<img id="bgimage" class="size" ${bg_image} />
|
||||
<img id="image" class="size" ${image} />
|
||||
${html_additions}
|
||||
<div class="lyricstable"><div id="lyricsmain" style="opacity:1" class="lyricscell lyricsmain"></div></div>
|
||||
<div id="footer" class="footer"></div>
|
||||
<div id="black" class="size"></div>
|
||||
</body>
|
||||
</html>
|
||||
""")
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<img id="bgimage" class="size" ${bg_image} />
|
||||
<img id="image" class="size" ${image} />
|
||||
${html_additions}
|
||||
<div class="lyricstable"><div id="lyricsmain" style="opacity:1" class="lyricscell lyricsmain"></div></div>
|
||||
<div id="footer" class="footer"></div>
|
||||
<div id="black" class="size"></div>
|
||||
</body>
|
||||
</html>
|
||||
""")
|
||||
|
||||
LYRICS_SRC = Template("""
|
||||
.lyricstable {
|
||||
.lyricstable {
|
||||
z-index: 5;
|
||||
position: absolute;
|
||||
display: table;
|
||||
${stable}
|
||||
}
|
||||
.lyricscell {
|
||||
}
|
||||
.lyricscell {
|
||||
display: table-cell;
|
||||
word-wrap: break-word;
|
||||
-webkit-transition: opacity 0.4s ease;
|
||||
${lyrics}
|
||||
}
|
||||
.lyricsmain {
|
||||
}
|
||||
.lyricsmain {
|
||||
${main}
|
||||
}
|
||||
""")
|
||||
}
|
||||
""")
|
||||
|
||||
FOOTER_SRC = Template("""
|
||||
left: ${left}px;
|
||||
bottom: ${bottom}px;
|
||||
width: ${width}px;
|
||||
font-family: ${family};
|
||||
font-size: ${size}pt;
|
||||
color: ${color};
|
||||
text-align: left;
|
||||
white-space: ${space};
|
||||
""")
|
||||
left: ${left}px;
|
||||
bottom: ${bottom}px;
|
||||
width: ${width}px;
|
||||
font-family: ${family};
|
||||
font-size: ${size}pt;
|
||||
color: ${color};
|
||||
text-align: left;
|
||||
white-space: ${space};
|
||||
""")
|
||||
|
||||
LYRICS_FORMAT_SRC = Template("""
|
||||
${justify}word-wrap: break-word;
|
||||
text-align: ${align};
|
||||
vertical-align: ${valign};
|
||||
font-family: ${font};
|
||||
font-size: ${size}pt;
|
||||
color: ${color};
|
||||
line-height: ${line}%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-bottom: ${bottom};
|
||||
padding-left: ${left}px;
|
||||
width: ${width}px;
|
||||
height: ${height}px;${font_style}${font_weight}
|
||||
""")
|
||||
${justify}word-wrap: break-word;
|
||||
text-align: ${align};
|
||||
vertical-align: ${valign};
|
||||
font-family: ${font};
|
||||
font-size: ${size}pt;
|
||||
color: ${color};
|
||||
line-height: ${line}%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-bottom: ${bottom};
|
||||
padding-left: ${left}px;
|
||||
width: ${width}px;
|
||||
height: ${height}px;${font_style}${font_weight}
|
||||
""")
|
||||
|
||||
|
||||
def build_html(item, screen, is_live, background, image=None, plugins=None):
|
||||
|
|
@ -737,7 +736,7 @@ def build_lyrics_format_css(theme_data, width, height):
|
|||
valign = VerticalType.Names[theme_data.display_vertical_align]
|
||||
left_margin = (int(theme_data.font_main_outline_size) * 2) if theme_data.font_main_outline else 0
|
||||
# fix tag incompatibilities
|
||||
justify = '' if (theme_data.display_horizontal_align == HorizontalType.Justify) else 'white-space:pre-wrap;\n'
|
||||
justify = '' if (theme_data.display_horizontal_align == HorizontalType.Justify) else ' white-space: pre-wrap;\n'
|
||||
padding_bottom = '0.5em' if (theme_data.display_vertical_align == VerticalType.Bottom) else '0'
|
||||
return LYRICS_FORMAT_SRC.substitute(justify=justify,
|
||||
align=align,
|
||||
|
|
@ -750,8 +749,8 @@ def build_lyrics_format_css(theme_data, width, height):
|
|||
left=left_margin,
|
||||
width=width,
|
||||
height=height,
|
||||
font_style='\nfont-style:italic;' if theme_data.font_main_italics else '',
|
||||
font_weight='\nfont-weight:bold;' if theme_data.font_main_bold else '')
|
||||
font_style='\n font-style: italic;' if theme_data.font_main_italics else '',
|
||||
font_weight='\n font-weight: bold;' if theme_data.font_main_bold else '')
|
||||
|
||||
|
||||
def build_footer_css(item, height):
|
||||
|
|
|
|||
|
|
@ -14,55 +14,54 @@ from tests.functional import MagicMock, patch
|
|||
from tests.helpers.testmixin import TestMixin
|
||||
|
||||
HTML = """
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>OpenLP Display</title>
|
||||
<style>
|
||||
*{
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>OpenLP Display</title>
|
||||
<style>
|
||||
*{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
overflow: hidden;
|
||||
-webkit-user-select: none;
|
||||
}
|
||||
body {
|
||||
}
|
||||
body {
|
||||
;
|
||||
}
|
||||
.size {
|
||||
}
|
||||
.size {
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
top: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
#black {
|
||||
}
|
||||
#black {
|
||||
z-index: 8;
|
||||
background-color: black;
|
||||
display: none;
|
||||
}
|
||||
#bgimage {
|
||||
}
|
||||
#bgimage {
|
||||
z-index: 1;
|
||||
}
|
||||
#image {
|
||||
}
|
||||
#image {
|
||||
z-index: 2;
|
||||
}
|
||||
plugin CSS
|
||||
#footer {
|
||||
}
|
||||
plugin CSS
|
||||
#footer {
|
||||
position: absolute;
|
||||
z-index: 6;
|
||||
dummy: dummy;
|
||||
}
|
||||
/* lyric css */
|
||||
|
||||
sup {
|
||||
}
|
||||
/* lyric css */
|
||||
sup {
|
||||
font-size: 0.6em;
|
||||
vertical-align: top;
|
||||
position: relative;
|
||||
top: -0.3em;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
var timer = null;
|
||||
var transition = false;
|
||||
plugin JS
|
||||
|
|
@ -151,64 +150,64 @@ sup {
|
|||
function show_text_completed(){
|
||||
return (timer == null);
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<img id="bgimage" class="size" style="display:none;" />
|
||||
<img id="image" class="size" style="display:none;" />
|
||||
plugin HTML
|
||||
<div class="lyricstable"><div id="lyricsmain" style="opacity:1" class="lyricscell lyricsmain"></div></div>
|
||||
<div id="footer" class="footer"></div>
|
||||
<div id="black" class="size"></div>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<img id="bgimage" class="size" style="display:none;" />
|
||||
<img id="image" class="size" style="display:none;" />
|
||||
plugin HTML
|
||||
<div class="lyricstable"><div id="lyricsmain" style="opacity:1" class="lyricscell lyricsmain"></div></div>
|
||||
<div id="footer" class="footer"></div>
|
||||
<div id="black" class="size"></div>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
BACKGROUND_CSS_RADIAL = 'background: -webkit-gradient(radial, 5 50%, 100, 5 50%, 5, from(#000000), to(#FFFFFF)) fixed'
|
||||
LYRICS_CSS = """
|
||||
.lyricstable {
|
||||
.lyricstable {
|
||||
z-index: 5;
|
||||
position: absolute;
|
||||
display: table;
|
||||
left: 10px; top: 20px;
|
||||
}
|
||||
.lyricscell {
|
||||
}
|
||||
.lyricscell {
|
||||
display: table-cell;
|
||||
word-wrap: break-word;
|
||||
-webkit-transition: opacity 0.4s ease;
|
||||
lyrics_format_css
|
||||
}
|
||||
.lyricsmain {
|
||||
}
|
||||
.lyricsmain {
|
||||
text-shadow: #000000 5px 5px;
|
||||
}
|
||||
"""
|
||||
}
|
||||
"""
|
||||
LYRICS_OUTLINE_CSS = ' -webkit-text-stroke: 0.125em #000000; -webkit-text-fill-color: #FFFFFF; '
|
||||
LYRICS_FORMAT_CSS = """
|
||||
word-wrap: break-word;
|
||||
text-align: justify;
|
||||
vertical-align: bottom;
|
||||
font-family: Arial;
|
||||
font-size: 40pt;
|
||||
color: #FFFFFF;
|
||||
line-height: 108%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-bottom: 0.5em;
|
||||
padding-left: 2px;
|
||||
width: 1580px;
|
||||
height: 810px;
|
||||
font-style:italic;
|
||||
font-weight:bold;
|
||||
"""
|
||||
word-wrap: break-word;
|
||||
text-align: justify;
|
||||
vertical-align: bottom;
|
||||
font-family: Arial;
|
||||
font-size: 40pt;
|
||||
color: #FFFFFF;
|
||||
line-height: 108%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-bottom: 0.5em;
|
||||
padding-left: 2px;
|
||||
width: 1580px;
|
||||
height: 810px;
|
||||
font-style: italic;
|
||||
font-weight: bold;
|
||||
"""
|
||||
FOOTER_CSS_BASE = """
|
||||
left: 10px;
|
||||
bottom: 0px;
|
||||
width: 1260px;
|
||||
font-family: Arial;
|
||||
font-size: 12pt;
|
||||
color: #FFFFFF;
|
||||
text-align: left;
|
||||
white-space: %s;
|
||||
"""
|
||||
left: 10px;
|
||||
bottom: 0px;
|
||||
width: 1260px;
|
||||
font-family: Arial;
|
||||
font-size: 12pt;
|
||||
color: #FFFFFF;
|
||||
text-align: left;
|
||||
white-space: %s;
|
||||
"""
|
||||
FOOTER_CSS = FOOTER_CSS_BASE % ('nowrap')
|
||||
FOOTER_CSS_WRAP = FOOTER_CSS_BASE % ('normal')
|
||||
FOOTER_CSS_INVALID = ''
|
||||
|
|
@ -257,6 +256,8 @@ class Htmbuilder(TestCase, TestMixin):
|
|||
# WHEN: Create the html.
|
||||
html = build_html(item, screen, is_live, background, plugins=plugins)
|
||||
|
||||
self.maxDiff = None
|
||||
|
||||
# THEN: The returned html should match.
|
||||
self.assertEqual(html, HTML, 'The returned html should match')
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue