openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #29851
Re: [Merge] lp:~alisonken1/openlp/strings-templates2 into lp:openlp
Review: Needs Fixing
Looks good but one comment which is general across all the code.
Diff comments:
> === modified file 'openlp/core/lib/htmlbuilder.py'
> --- openlp/core/lib/htmlbuilder.py 2016-05-17 13:21:29 +0000
> +++ openlp/core/lib/htmlbuilder.py 2016-06-06 15:26:06 +0000
> @@ -538,15 +538,60 @@
> </script>
> </head>
> <body>
> -<img id="bgimage" class="size" %s />
> -<img id="image" class="size" %s />
> -%s
> +<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 {
> + z-index: 5;
> + position: absolute;
> + display: table;
> + ${stable}
> +}
> +.lyricscell {
> + display: table-cell;
> + word-wrap: break-word;
> + -webkit-transition: opacity 0.4s ease;
> + ${lyrics}
> +}
> +.lyricsmain {
> + ${main}
> +}
> +""")
> +
> +FOOTER_SRC = Template("""
Indent please.
No real rule about indentation but Lyrics_src looks better!
> +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}
> +""")
>
>
> def build_html(item, screen, is_live, background, image=None, plugins=None):
--
https://code.launchpad.net/~alisonken1/openlp/strings-templates2/+merge/296567
Your team OpenLP Core is subscribed to branch lp:openlp.
Follow ups
References
