Subversion Repositories LCARS

Compare Revisions

Last modification

Regard whitespace Rev 204 → Rev 205

/branches/live/media/video/series/data.inc
24,6 → 24,7
include_once 'includes/remington-steele.php';
include_once 'includes/scrubs.php';
include_once 'includes/seaquest.php';
include_once 'includes/seven-days.php';
include_once 'includes/simpsons.php';
include_once 'includes/sliders.php';
include_once 'includes/stargate.php';
163,6 → 164,45
. '<span class="hidden">:</span>'
. ' <span class="fc">Final Conflict</span><span class="glare"></span></span>' => &$efc,
 
'<span class="eli-stone"><span class="eli">Eli</span> <span class="stone">Stone</span>' => array(
// 'ignore' => true,
'channel' => 'online',
// 'showtimes' => 'Fr 20:00',
'seen' => array(1),
// 'last_seen' => mktime(20, 0, 0, 12, 19, 2011),
'seasons' => array(13, 13),
'episode_list' => 'wiki:en:List_of_Eli_Stone_episodes',
'episodes' => array(
1 => "Faith",
2 => "Freedom",
3 => "Father Figure",
4 => "Wake Me Up Before You Go-Go",
5 => "One More Try",
6 => "Something To Save",
7 => "Heal the Pain",
8 => "Praying for Time",
9 => "I Want Your Sex",
10 => "Heartbeat",
11 => "Patience",
12 => "Waiting for That Day",
13 => "Soul Free",
 
14 => "The Path",
15 => "Grace",
16 => "Unwritten",
17 => "Should I Stay, or Should I Go?",
18 => "The Humanitarian",
19 => "Happy Birthday Nate",
20 => "Help!",
21 => "Owner of a Lonely Heart",
22 => "Two Ministers",
23 => "Sonoma",
24 => "Mortal Combat",
25 => "Tailspin",
26 => "Flight Path"
)
),
 
'<span class="eureka"><span class="eur">Eur</span><span class="e">e</span>'
. '<span class="ka">ka</span></span></span>' => array(
// 'ignore' => true,
864,11 → 904,11
</span><span id="dsv">DSV</span></span>' => &$seaQuest,
 
'<span class="sherlock">Sherlock</span>' => array(
'channel' => 'BBC 1',
'showtimes' => 'Mi 21:30',
'channel' => 'BBC One (HD)',
// 'showtimes' => 'Mi 21:30',
'seen' => array(array(1, 3)),
'last_seen' => mktime(21, 30, 0, 8, 3, 2011),
'seasons' => array(3, 3),
'seasons' => array(3, 3, 'Special' => 1, 3),
'episode_list' => 'http://bbc.co.uk/sherlock',
'episodes' => array(
1 => 'A Study in Pink',
875,12 → 915,20
2 => 'The Blind Banker',
3 => 'The Great Game',
 
4 => "A Scandal in Belgravia (01.01.2012)",
5 => "The Hounds of Baskerville (08.01.2012)",
6 => "The Reichenbach Fall (15.01.2012)",
4 => "A Scandal in Belgravia",
5 => "The Hounds of Baskerville",
6 => "The Reichenbach Fall",
 
7 => 'Many Happy Returns',
 
8 => "The Empty Hearse",
9 => "The Sign of Three",
10 => "His Last Vow",
)
),
 
'<span class="seven-days">Seven Day<span class="s">s</span></span>' => &$seven_days,
 
'<span class="simpsons" id="simpsons"><span class="text"><span>The</span> <span>Simpsons</span></span></span>' => &$simpsons,
// '<span class="simpsons"><span class="text"><span>The</span> <span>Simpsons</span></span></span> (de)' => &$simpsons_de,
 
/branches/live/media/video/series/includes/remington-steele.php
4,7 → 4,7
// 'ignore' => true,
'channel' => 'online',
// 'showtimes' => 'Mi–Fr 21:00',
'seen' => array(array(1, 7)),
'seen' => array(array(1, 11)),
// 'last_seen' => mktime(21, 0, 0, 9, 8, 2011),
'seasons' => array(22, 22, 22, 22, 6),
'episodes' => array(
/branches/live/media/video/series/includes/moonlighting.php
4,7 → 4,7
// 'ignore' => true,
'channel' => 'online',
// 'showtimes' => 'Mi–Fr 21:00',
'seen' => array(array(1, 5)),
'seen' => array(array(1, 8)),
// 'last_seen' => mktime(21, 0, 0, 9, 8, 2011),
'seasons' => array(6, 18, 15, 14, 13),
'episodes' => array(
/branches/live/media/video/series/includes/sliders.php
4,7 → 4,7
// 'ignore' => true,
'channel' => 'online',
// 'showtimes' => 'Mi–Fr 21:00',
'seen' => array(array(1, 7)),
'seen' => array(array(1, 11)),
// 'last_seen' => mktime(21, 0, 0, 9, 8, 2011),
'seasons' => array(10, 13, 25, 22, 18),
'episodes' => array(
/branches/live/media/video/series/includes/stargate.php
4,7 → 4,7
// 'ignore' => true,
'channel' => 'YouTube',
'showtimes' => 'N/A',
'seen' => array(array(1, 17)),
'seen' => array(array(1, 24)),
'seasons' => array(22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 'TV Movies' => 2),
'episodes' => array(
1 => "Children of the Gods, Part 1",
26,11 → 26,11
17 => "Enigma",
18 => "Solitudes",
19 => "Tin Man",
20 => "There but for the grace of God",
21 => "Politics",
22 => "Within the Serpent’s Grasp",
20 => "There but for the grace of God (1)",
21 => "Politics (2)",
22 => "Within the Serpent’s Grasp (3)",
 
23 => "The Serpent’s Lair",
23 => "The Serpent’s Lair (4)",
24 => "In the Line of Duty",
25 => "Prisoners",
26 => "The Gamekeeper",
/branches/live/media/video/series/includes/seven-days.php
0,0 → 1,81
<?php
 
$seven_days = array(
// 'ignore' => true,
'channel' => 'online',
// 'showtimes' => 'Mi–Fr 21:00',
'seen' => array(array(1, 2)),
// 'last_seen' => mktime(21, 0, 0, 9, 8, 2011),
'seasons' => array(21, 23, 22),
'episodes' => array(
1 => "Pilot, Part I",
2 => "Pilot, Part II",
3 => "The Gettysburg Virus",
4 => "Come Again?",
5 => "Vows",
6 => "Doppelganger, Part I",
7 => "Doppelganger, Part II",
8 => "Shadow Play",
9 => "As Time Goes By",
10 => "Sleepers",
11 => "HAARP Attack",
12 => "Last Card Up",
13 => "Last Breath",
14 => "Parkergeist",
15 => "Daddy's Girl",
16 => "There's Something About Olga",
17 => "A Dish Best Served Cold",
18 => "Vegas Heist",
19 => "EBEs",
20 => "Walter",
21 => "Lifeboat",
 
22 => "The Football",
23 => "Pinball Wizard",
24 => "Parker.com",
25 => "For The Children",
26 => "Two Weddings and a Funeral",
27 => "Walk Away",
28 => "Sister's Keeper",
29 => "The Collector",
30 => "Love and Other Disasters",
31 => "The Devil and the Deep Blue Sea",
32 => "Time Gremlin",
33 => "Buried Alive",
34 => "The Backstepper's Apprentice",
35 => "Déjà Vu All Over Again",
36 => "Space Station Down",
37 => "The Cuban Missile",
38 => "X-35 Needs Changing",
39 => "Brother, Can You Spare a Bomb?",
40 => "Pope Parker",
41 => "Witch Way to the Prom",
42 => "Mr. Donovan's Neighborhood",
43 => "Playmates and Presidents",
44 => "The Cure",
 
45 => "Stairway to Heaven",
46 => "Peacekeepers",
47 => "Rhino",
48 => "The Dunwych Madness",
49 => "Olga's Excellent Vacation",
50 => "Deloris Demands",
51 => "The Fire Last Time",
52 => "Tracker",
53 => "Top Dog",
54 => "Adam & Eve & Adam",
55 => "Head Case",
56 => "Raven",
57 => "The First Freshman",
58 => "Revelation",
59 => "Crystal Blue Persuasion",
60 => "Empty Quiver",
61 => "Kansas",
62 => "The Final Countdown",
63 => "The Brink",
64 => "Sugar Mountain",
65 => "Born in the USSR",
66 => "Live: From Death Row"
),
'episode_list' => 'wiki:en:List_of_Seven_Days_episodes'
);
/branches/live/media/video/series/style.css
629,6 → 629,52
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25);
}
 
.eli-stone {
padding: 0.5em 0.5em 0.125em 0.5em;
background-color: black;
color: #80878d;
font-weight: bold;
line-height: 1em;
text-transform: lowercase;
}
 
.eli-stone .eli,
.eli-stone .stone {
position: relative;
display: block;
text-align: right;
}
 
.eli-stone .eli {
padding-right: 0.125em;
font-size: 150%;
}
 
.eli-stone .eli:after {
content: "Eli";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding-right: 0.125em;
color: transparent;
-webkit-text-fill-color: #dfe6f0;
-webkit-mask-image: -webkit-linear-gradient(top left, rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.25));
}
 
.eli-stone .stone:after {
content: "Stone";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
color: transparent;
-webkit-text-fill-color: #dfe6f0;
-webkit-mask-image: -webkit-linear-gradient(top left, rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.25));
}
 
@font-face {
font-family: "Interstate";
src: local("Interstate"), url(/styles/fonts/non-free/interstate_ultra-black_condensed.ttf);
1607,6 → 1653,7
padding-top: 0.25em;
padding-left: 0.25em;
font-family: "a_Futura Orto", sans-serif;
text-align: right;
text-transform: uppercase;
}
 
1631,6 → 1678,7
display: block;
font-weight: bold;
line-height: 0.75em;
text-align: right;
}
 
.samantha-who .q {
1826,6 → 1874,66
}
 
@font-face {
font-family: 'Jura-Demi-Bold';
src:url('/styles/fonts/Jura-Demi-Bold.ttf.woff') format('woff'),
url('/styles/fonts/Jura-Demi-Bold.ttf.svg#Jura-Demi-Bold') format('svg'),
url('/styles/fonts/Jura-Demi-Bold.ttf.eot'),
url('/styles/fonts/Jura-Demi-Bold.ttf.eot?#iefix') format('embedded-opentype');
font-weight: normal;
font-style: normal;
}
 
.seven-days {
position: relative;
padding: 1em 1em 0.75em;
background-color: #020401;
color: #f7fbe0;
font-family: 'Jura-Demi-Bold', sans-serif;
font-size: 80%;
font-weight: bold;
text-transform: uppercase;
letter-spacing: 1em;
white-space: nowrap;
}
 
.seven-days:before {
position: absolute;
left: 0;
top: -0.125em;
right: 0;
bottom: 0;
padding-left: 0.75em;
display: block;
color: #191955;
content: "7";
font-size: 350%;
font-weight: 900;
text-align: center;
}
 
.seven-days:after {
position: absolute;
left: 0;
top: -0.125em;
right: 0;
bottom: 0;
padding-left: 0.75em;
display: block;
content: "7";
font-size: 350%;
font-weight: 900;
text-align: center;
color: transparent;
-webkit-text-fill-color: #f7fbe0;
-webkit-mask-image: -webkit-linear-gradient(bottom left,
rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0.75) 60%);
}
 
.seven-days .s {
letter-spacing: normal;
}
 
@font-face {
font-family: "London Tube";
src: local("P22 Johnston Underground"), url(/styles/fonts/non-free/p22-johnston-underground.ttf);
}
/branches/live/media/video/series
Property changes:
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
Reverse-merged /trunk/media/video/series:r198-201