forked from openlp/openlp
More stageview changes
This commit is contained in:
parent
47ddcce190
commit
3e1bdc7475
@ -189,10 +189,10 @@ class Renderer(object):
|
||||
serviceItem.theme = theme_data
|
||||
if self.force_page:
|
||||
# make big page for theme edit dialog to get line count
|
||||
serviceItem.add_from_text(u'', VERSE + VERSE + VERSE, FOOTER)
|
||||
serviceItem.add_from_text(u'', VERSE + VERSE + VERSE)
|
||||
else:
|
||||
self.image_manager.del_image(theme_data.theme_name)
|
||||
serviceItem.add_from_text(u'', VERSE, FOOTER)
|
||||
serviceItem.add_from_text(u'', VERSE)
|
||||
serviceItem.renderer = self
|
||||
serviceItem.raw_footer = FOOTER
|
||||
serviceItem.render(True)
|
||||
|
@ -219,6 +219,8 @@ class ServiceItem(object):
|
||||
``raw_slide``
|
||||
The raw text of the slide.
|
||||
"""
|
||||
if verse_tag:
|
||||
verse_tag = verse_tag.upper()
|
||||
self.service_item_type = ServiceItemType.Text
|
||||
title = title.split(u'\n')[0]
|
||||
self._raw_frames.append(
|
||||
|
@ -30,12 +30,14 @@ body {
|
||||
#currentslide {
|
||||
font-size: 40pt;
|
||||
color: white;
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
|
||||
#nextslide {
|
||||
font-size: 30pt;
|
||||
font-size: 40pt;
|
||||
color: grey;
|
||||
padding-top: 25px;
|
||||
padding-top: 0px;
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
|
||||
#right {
|
||||
|
@ -46,15 +46,21 @@ window.OpenLP = {
|
||||
function (data, status) {
|
||||
OpenLP.currentSlides = data.results.slides;
|
||||
OpenLP.currentSlide = 0;
|
||||
OpenLP.currentTags = Array();
|
||||
var div = $("#verseorder");
|
||||
div.html("");
|
||||
var tag = "";
|
||||
var tags = 0;
|
||||
for (idx in data.results.slides) {
|
||||
idx = parseInt(idx, 10);
|
||||
div.append(" <span>");
|
||||
var tag = data.results.slides[idx]["tag"];
|
||||
if (tag == 'None')
|
||||
tag = idx;
|
||||
$("#verseorder span").last().attr("id", "tag" + idx).text(tag);
|
||||
var prevtag = tag;
|
||||
tag = data.results.slides[idx]["tag"];
|
||||
if (tag != prevtag) {
|
||||
tags = tags + 1;
|
||||
div.append(" <span>");
|
||||
$("#verseorder span").last().attr("id", "tag" + tags).text(tag);
|
||||
}
|
||||
OpenLP.currentTags[idx] = tags;
|
||||
if (data.results.slides[idx]["selected"])
|
||||
OpenLP.currentSlide = idx;
|
||||
}
|
||||
@ -64,17 +70,30 @@ window.OpenLP = {
|
||||
},
|
||||
updateSlide: function() {
|
||||
$("#verseorder span").removeClass("currenttag");
|
||||
$("#tag" + OpenLP.currentSlide).addClass("currenttag");
|
||||
var text = OpenLP.currentSlides[OpenLP.currentSlide]["text"];
|
||||
$("#tag" + OpenLP.currentTags[OpenLP.currentSlide]).addClass("currenttag");
|
||||
var slide = OpenLP.currentSlides[OpenLP.currentSlide];
|
||||
var text = slide["text"];
|
||||
text = text.replace(/\n/g, '<br />');
|
||||
$("#currentslide").html(text);
|
||||
text = "";
|
||||
if (OpenLP.currentSlide < OpenLP.currentSlides.length - 1) {
|
||||
text = OpenLP.currentSlides[OpenLP.currentSlide + 1]["text"];
|
||||
for (var idx = OpenLP.currentSlide + 1; idx < OpenLP.currentSlides.length; idx++) {
|
||||
var prevslide = slide;
|
||||
slide = OpenLP.currentSlides[idx];
|
||||
if (slide["tag"] != prevslide["tag"])
|
||||
text = text + '<p class="nextslide">';
|
||||
text = text + slide["text"];
|
||||
if (slide["tag"] != prevslide["tag"])
|
||||
text = text + '</p>';
|
||||
else
|
||||
text = text + '<br />';
|
||||
}
|
||||
text = text.replace(/\n/g, '<br />');
|
||||
$("#nextslide").html(text);
|
||||
}
|
||||
else
|
||||
$("#nextslide").html("Next: " + OpenLP.nextSong);
|
||||
text = '<p class="nextslide">Next: ' + OpenLP.nextSong + '</p>';
|
||||
$("#nextslide").html(text);
|
||||
},
|
||||
updateClock: function() {
|
||||
var div = $("#clock");
|
||||
|
@ -115,7 +115,6 @@ import os
|
||||
import urlparse
|
||||
import re
|
||||
from pprint import pformat
|
||||
from lxml import html
|
||||
|
||||
try:
|
||||
import json
|
||||
@ -402,9 +401,11 @@ class HttpConnection(object):
|
||||
for index, frame in enumerate(current_item.get_frames()):
|
||||
item = {}
|
||||
if current_item.is_text():
|
||||
item[u'tag'] = unicode(frame[u'verseTag'])
|
||||
text = unicode(frame[u'html'].replace('<br>', '\n'))
|
||||
item[u'text'] = html.fromstring(text).text_content()
|
||||
if frame[u'verseTag']:
|
||||
item[u'tag'] = unicode(frame[u'verseTag'])
|
||||
else:
|
||||
item[u'tag'] = unicode(index)
|
||||
item[u'text'] = unicode(frame[u'text'])
|
||||
item[u'html'] = unicode(frame[u'html'])
|
||||
else:
|
||||
item[u'tag'] = unicode(index)
|
||||
|
Loading…
Reference in New Issue
Block a user