From: Steinar H. Gunderson Date: Tue, 24 Oct 2017 20:56:32 +0000 (+0200) Subject: Add support for pictures in lower thirds (only used by the quick lower thirds). X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=525ab020c0d57fd40fab90d61a59796e985d978f;p=ultimatescore Add support for pictures in lower thirds (only used by the quick lower thirds). --- diff --git a/bg3.svg b/bg3.svg new file mode 100644 index 0000000..6b2228b --- /dev/null +++ b/bg3.svg @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/foul.png b/foul.png new file mode 100644 index 0000000..e9bdef6 Binary files /dev/null and b/foul.png differ diff --git a/foul.svg b/foul.svg new file mode 100644 index 0000000..cd4b3a5 --- /dev/null +++ b/foul.svg @@ -0,0 +1,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/out.png b/out.png new file mode 100644 index 0000000..c4e43c0 Binary files /dev/null and b/out.png differ diff --git a/out.svg b/out.svg new file mode 100644 index 0000000..02fe295 --- /dev/null +++ b/out.svg @@ -0,0 +1,447 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pick.png b/pick.png new file mode 100644 index 0000000..8e31213 Binary files /dev/null and b/pick.png differ diff --git a/pick.svg b/pick.svg new file mode 100644 index 0000000..8e80656 --- /dev/null +++ b/pick.svg @@ -0,0 +1,447 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/quickl3.js b/quickl3.js index fc96173..afdeb78 100644 --- a/quickl3.js +++ b/quickl3.js @@ -32,6 +32,10 @@ var load_l3 = function(sheet, prefix, cb) "text": text, "subtext": subtext }; + var image = response.values[i][4]; + if (image !== undefined && image.match(/^file:/) !== null) { + l3s[prefix + number].image = image; + } } cb(l3s, sheet); }; @@ -49,6 +53,13 @@ function quicklowerthird() } document.getElementById('lowerthird-headline-content').innerHTML = code.text; document.getElementById('lowerthird-subheading-content').innerHTML = code.subtext; + var img = document.getElementById('lowerthird-img'); + if (code.image !== undefined) { + img.src = code.image; + img.style.display = 'inline'; + } else { + img.style.display = 'none'; + } showlowerthird(); if (state['code'].match(/^C/) === null) { diff --git a/score.css b/score.css index 5e77ae8..8beb27b 100644 --- a/score.css +++ b/score.css @@ -197,6 +197,43 @@ body { -webkit-animation: wipe-in 2.2s ease; clip: rect(0px,0px,200px,0px); } +.lowerthird-picture { + position: fixed; + left: 1085px; + top: 490px; + white-space: nowrap; + border: 0px; + height: 170px; + width: 170px; + color: black; +} +.lowerthird-picture-hidden { + width: 0px; + border-left: 0px; + border-right: 0px; +} +.lowerthird-picture-animate-in { + -webkit-animation: scale-out 1.0s; +} +.lowerthird-picture-animate-out { + -webkit-animation: scale-in-no-border 1.0s; +} +.lowerthird-picture-content { + padding-left: 0px; + position: absolute; +} +.lowerthird-picture-content-hidden { + clip: rect(0px,0px,200px,0px); +} +.lowerthird-picture-content-animate-in { + -webkit-animation: wipe-out 2.0s ease; + -webkit-animation-delay: 0.3s; + -webkit-animation-fill-mode: both; +} +.lowerthird-picture-content-animate-out { + -webkit-animation: wipe-in 2.0s ease; + clip: rect(0px,0px,200px,0px); +} /* these are hidden when actually run in casparcg */ #area { @@ -345,6 +382,14 @@ body { border: 2px solid #ccc; } } +@-webkit-keyframes scale-in-no-border { + 0% { + width: 1050px; + } + 100% { + width: 0px; + } +} @-webkit-keyframes scale-out-small { 0% { width: 0px; diff --git a/score.html b/score.html index b9863db..8203957 100644 --- a/score.html +++ b/score.html @@ -31,11 +31,14 @@
- John Doe
Ola Nordmann + Call on the field: Foul
Commentators, Trøndisk 2016
+
+ +
diff --git a/score.js b/score.js index a479778..5f8771c 100644 --- a/score.js +++ b/score.js @@ -107,10 +107,16 @@ function showlowerthird() g = document.getElementById('lowerthird-subheading-content'); f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px'; + f = document.getElementById('lowerthird-picture'); + g = document.getElementById('lowerthird-picture-content'); + f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px'; + document.getElementById('lowerthird-headline').className = 'lowerthird-headline lowerthird-headline-animate-in'; document.getElementById('lowerthird-headline-content').className = 'lowerthird-headline-content lowerthird-headline-content-animate-in'; document.getElementById('lowerthird-subheading').className = 'lowerthird-subheading lowerthird-subheading-animate-in'; document.getElementById('lowerthird-subheading-content').className = 'lowerthird-subheading-content lowerthird-subheading-content-animate-in'; + document.getElementById('lowerthird-picture').className = 'lowerthird-picture lowerthird-picture-animate-in'; + document.getElementById('lowerthird-picture-content').className = 'lowerthird-picture-content lowerthird-picture-content-animate-in'; lowerthird_visible = true; } @@ -118,6 +124,13 @@ function setandshowlowerthird() { document.getElementById('lowerthird-headline-content').innerHTML = state['text1']; document.getElementById('lowerthird-subheading-content').innerHTML = state['text2']; + var img = document.getElementById('lowerthird-img'); + if (state['image'] === undefined) { + img.style.display = 'none'; + } else { + img.src = state['image']; + img.style.display = 'inline'; + } showlowerthird(); } @@ -128,6 +141,8 @@ function hidelowerthird() document.getElementById('lowerthird-headline-content').className = 'lowerthird-headline-content lowerthird-headline-content-animate-out'; document.getElementById('lowerthird-subheading').className = 'lowerthird-subheading lowerthird-subheading-animate-out'; document.getElementById('lowerthird-subheading-content').className = 'lowerthird-subheading-content lowerthird-subheading-content-animate-out'; + document.getElementById('lowerthird-picture').className = 'lowerthird-picture lowerthird-picture-hidden lowerthird-picture-animate-out'; + document.getElementById('lowerthird-picture-content').className = 'lowerthird-picture-content lowerthird-picture-content-animate-out'; lowerthird_visible = false; } diff --git a/stall.png b/stall.png new file mode 100644 index 0000000..60c0b3e Binary files /dev/null and b/stall.png differ diff --git a/stall.svg b/stall.svg new file mode 100644 index 0000000..13b4b54 --- /dev/null +++ b/stall.svg @@ -0,0 +1,447 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tfk_logo_blandet.png b/tfk_logo_blandet.png new file mode 100644 index 0000000..94f417b Binary files /dev/null and b/tfk_logo_blandet.png differ diff --git a/travel.png b/travel.png new file mode 100644 index 0000000..47058a5 Binary files /dev/null and b/travel.png differ diff --git a/travel.svg b/travel.svg new file mode 100644 index 0000000..5a24d7a --- /dev/null +++ b/travel.svg @@ -0,0 +1,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +