Subversion Repositories LCARS

Compare Revisions

Last modification

Ignore whitespace Rev 201 → Rev 202

/branches/live/media/video/series/index.php
1,9 → 1,9
<?php
 
require_once 'Application.php';
chdir('application');
// require_once 'models/databases/seriometer/SeriOMeterDb.php';
 
// require_once 'application/models/databases/seriometer/SeriOMeterDb.php';
 
$application = \PointedEars\PHPX\Application::getInstance();
// $application->setDefaultDatabase(
// $application->registerDatabase('seriometer', new SeriOMeterDb()));
/branches/live/media/video/series/data.inc
440,7 → 440,7
. ' <span class="ster">Ster</span><span class="ntag">ntag</span>'
. '<span class="ebuec">ebüc</span><span class="her">her</span>'
. '</span></span>' => array(
'channel' => 'zdf_neo',
// 'channel' => 'zdf_neo',
'seen' => array(array(1, 2)),
'last_seen' => mktime(23, 35, 0, 10, 22, 2011),
'seasons' => array(6, 8),
508,15 → 508,14
'<span class="monk">Monk</span>' => &$monk,
'<span class="monk">Monk</span> (de)' => &$monk_de,
 
'<span class="life-on-mars"><span class="life">Lif<span
class="e">e</span></span> <span class="on">on</span>
<span class="mars">Mars</span></span>' => array(
'<span class="life-on-mars"><span class="life">Lif<span class="e">e</span></span>
<span class="life-on"><span class="on">on</span> <span class="mars">Mars</span></span></span>' => array(
// 'ignore' => true,
'channel' => 'online',
'seen' => array(array(1, 2)),
// 'last_seen' => mktime(21, 0, 0, 9, 8, 2011),
'seasons' => array(8, 8),
// 'episode_list' => 'wiki:en:List_of_Life_on_Mars_episodes',
'episode_list' => 'wiki:en:List_of_Life_on_Mars_(UK_TV_series)_episodes',
'episodes' => array(
1 => "Erinnerungen aus der Zukunft",
2 => "Zeugenschutz",
921,8 → 920,8
)
),
 
'<span class="stargate en"><span>St<span class="a">a</span>rgat<span>e</span></span> <span>SG&middot;<span>1</span></span></span>' => &$stargate,
'<span class="stargate de"><span>St<span class="a">a</span>rgate</span> <span>Komm<span class="a">a</span>ndo SG-1</span></span>' => &$stargate_de,
'<span class="stargate en"><span>S<span class="t">t</span><span class="a">a</span>rg<span class="a2">a</span>t<span>e</span></span> <span>SG-<span>1</span></span></span>' => &$stargate,
'<span class="stargate de"><span>St<span class="a">a</span>rg<span class="a2">a</span>te</span> <span>Komm<span class="a">a</span>ndo SG-1</span></span>' => &$stargate_de,
 
'<span class="stargate atlantis"><span class="stargate"><span>St<span class="a">a</span>rg<span class="a">a</span>t<span>e</span></span></span>'
. ' <span class="atlantis"><span class="a">A</span>tlanti<span>s</span></span>' => &$stargate_atlantis,
/branches/live/media/video/series/application/views/IndexView.php
24,7 → 24,7
*/
public function __construct ($template)
{
parent::__construct('application/layouts/index/index.phtml');
parent::__construct('layouts/index/index.phtml');
 
require_once 'Zend/Loader/StandardAutoloader.php';
$loader = new Zend\Loader\StandardAutoloader(array('autoregister_zf' => true));
/branches/live/media/video/series/application/layouts/index/index.phtml
103,7 → 103,7
if (e && e.shiftKey && e.ctrlKey)
{
var key = this.textContent.toLowerCase()
.replace(/[&:.,()–]/g, "").replace(/\s+/g, "-")
.replace(/[&:.,()–]/g, "").replace(/[\s·]+/g, "-")
.replace("-de", "");
 
if (typeof _getProperty == "undefined")
214,7 → 214,7
<td<?php if ($recommended) { ?> class="recommended"<?php } ?>>
<div><?php echo $this->_('Watched:'); ?> <?php
echo $this->getCoverage($serie->seen) . ' ('. $serie->count;
?> von <?php $total = $serie->total; echo $total; ?> Episoden)<?php
?> von <?php $total = $serie->total; echo $total; ?> <?php echo $this->_('episodes'); ?>)<?php
if ($serie->last_seen)
{
?>; zuletzt am <?php
/branches/live/media/video/series/application/models/mappers/SeriesMapper.php
1,6 → 1,6
<?php
 
require_once 'application/models/Series.php';
require_once 'models/Series.php';
 
class SeriesMapper extends \PointedEars\PHPX\Db\Mapper
{
/branches/live/media/video/series/application/models/Series.php
1,6 → 1,6
<?php
 
require_once 'application/models/databases/seriometer/tables/SeriesTable.php';
require_once 'models/databases/seriometer/tables/SeriesTable.php';
 
class Series extends \PointedEars\PHPX\Model
{
/branches/live/media/video/series/application/controllers/IndexController.php
1,7 → 1,7
<?php
 
require_once 'application/views/IndexView.php';
require_once 'application/models/mappers/SeriesMapper.php';
require_once 'views/IndexView.php';
require_once 'models/mappers/SeriesMapper.php';
 
class IndexController extends \PointedEars\PHPX\Controller
{
17,7 → 17,7
 
public function indexAction ()
{
require_once 'data.inc';
require_once '../data.inc';
 
$min_percentage = 100;
$min_series = null;
49,7 → 49,7
 
private function oldIndexAction ()
{
require_once 'data.inc';
require_once '../data.inc';
 
$min_percentage = 100;
$min_series = null;
/branches/live/media/video/series/includes/remington-steele.php
1,10 → 1,10
<?php
 
$remington_steele = array(
// 'ignore' => true,
// 'ignore' => true,
'channel' => 'online',
// 'showtimes' => 'Mi–Fr 21:00',
// 'seen' => array(array(1, 2)),
'seen' => array(array(1, 7)),
// '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(1),
'seen' => array(array(1, 5)),
// 'last_seen' => mktime(21, 0, 0, 9, 8, 2011),
'seasons' => array(6, 18, 15, 14, 13),
'episodes' => array(
/branches/live/media/video/series/includes/alf.php
1,8 → 1,8
<?php
 
$serien['<span class="alf">ALF</span>'] = array(
'channel' => 'Tele 5',
'showtimes' => 'Sa 14:05–15:30',
'channel' => 'online',
// 'showtimes' => 'Sa 14:05–15:30',
'seen' => array(array(1, 21)),
'seasons' => array(26, 26, 26, 24),
'episode_list' => 'wiki:Liste der Alf-Episoden',
/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, 2)),
'seen' => array(array(1, 7)),
// '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,8 → 4,195
// 'ignore' => true,
'channel' => 'YouTube',
'showtimes' => 'N/A',
'seen' => array(array(1, 44)),
'seasons' => array(22, 22, 22, 22, 22, 22, 22, 20, 20, 20),
'seen' => array(array(1, 17)),
'seasons' => array(22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 'TV Movies' => 2),
'episodes' => array(
1 => "Children of the Gods, Part 1",
2 => "Children of the Gods, Part 2",
3 => "The Enemy Within",
4 => "Emancipation",
5 => "The Broca Divide",
6 => "The First Commandment",
7 => "Cold Lazarus",
8 => "The Nox",
9 => "Brief Candle",
10 => "Thor’s Hammer",
11 => "The Torment of Tantalus",
12 => "Bloodlines",
13 => "Fire and Water",
14 => "Hathor",
15 => "Singularity",
16 => "Cor-Ai",
17 => "Enigma",
18 => "Solitudes",
19 => "Tin Man",
20 => "There but for the grace of God",
21 => "Politics",
22 => "Within the Serpent’s Grasp",
 
23 => "The Serpent’s Lair",
24 => "In the Line of Duty",
25 => "Prisoners",
26 => "The Gamekeeper",
27 => "Need",
28 => "Thor’s Chariot",
29 => "Message in a Bottle",
30 => "Family",
31 => "Secrets",
32 => "Bane",
33 => "The Tok’ra, Part 1",
34 => "The Tok’ra, Part 2",
35 => "Spirits",
36 => "Touchstone",
37 => "A Matter of Time",
38 => "The Fifth Race",
39 => "Serpent’s Song",
40 => "Holiday",
41 => "One False Step",
42 => "Show and Tell",
43 => "1969",
44 => "Out of Mind",
 
45 => "Into the Fire",
46 => "Seth",
47 => "Fair Game",
48 => "Legacy",
49 => "Learning Curve",
50 => "Point of View",
51 => "Deadman Switch",
52 => "Demons",
53 => "Rules of Engagement",
54 => "Forever in a Day",
55 => "Past and Presence",
56 => "Jolinar’s Memories",
57 => "The Devil You Know",
58 => "Foothold",
59 => "Pretense",
60 => "Urgo",
61 => "A Hundred Days",
62 => "Shades of Grey",
63 => "New Ground",
64 => "Maternal Instinct",
65 => "Crystal Skull",
66 => "Nemesis",
 
67 => "Small Victories",
68 => "The other Side",
69 => "Upgrades",
70 => "Crossroads",
71 => "Divide and Conquer",
72 => "Window of Opportunity",
73 => "Watergate",
74 => "The First Ones",
75 => "Scorched Earth",
76 => "Beneath the Surface",
77 => "Point of No Return",
78 => "Tangent",
79 => "The Curse",
// 80 => "Serpent's Venom",
81 => "Chain Reaction",
82 => "2010",
83 => "Absolute Power",
84 => "The Light",
85 => "Prodigy",
86 => "Entity / Child's Play",
87 => "Double Jeopardy",
88 => "Exodus",
 
89 => "Enemies",
90 => "Threshold",
91 => "Ascencion",
92 => "The fifth Man",
93 => "Red Sky",
94 => "The Rite of Passage",
95 => "Beast of Burden",
96 => "The Tomb",
97 => "Between two Fires",
98 => "2001",
99 => "Desperate Measures",
100 => "Wormhole X-Treme",
101 => "Proving Ground",
102 => "48 Hours",
103 => "Summit",
104 => "Last Stand",
105 => "Fail Safe",
// 106 => "The Warrior",
107 => "Menace",
108 => "The Sentinel",
109 => "Meridian",
110 => "Revelations",
 
111 => "Redemption, part 1",
112 => "Redemption, part 2",
113 => "Descent",
114 => "Frozen",
115 => "Nightwalkers",
116 => "Abyss",
117 => "Shadow Play",
118 => "The Other Guys",
119 => "Allegiance",
120 => "The Cure",
121 => "Prometheus",
122 => "Unnatural Selection",
123 => "Sight Unseen",
124 => "Smoke and Mirrors",
125 => "Paradise Lost",
126 => "Metamorphosis",
127 => "Disclosure",
128 => "Forsaken",
129 => "Changeling",
130 => "Memento",
131 => "Prophecy",
132 => "Full Circle",
 
133 => "Fallen",
134 => "Home coming",
135 => "Fragile Balance",
136 => "Orpheus",
137 => "Revisions",
138 => "Lifeboat",
139 => "Enemy Mine",
140 => "Space Race",
141 => "Avenger 2.0",
142 => "Birthright",
143 => "Evolution, part 1",
144 => "Evolution, part 2",
145 => "Grace",
146 => "Fallout",
147 => "Chimera",
148 => "Death Knell",
149 => "Heroes, part 1",
150 => "Heroes, part 2",
151 => "Resurrection",
152 => "Inauguration",
153 => "The Lost City, part 1",
154 => "The Lost City, part 2",
 
// 155 => "New Order, part 1",
// 156 => "New Order, part 2",
157 => "Lockdown",
158 => "Zero Hour",
159 => "Icon",
160 => "Avatar",
161 => "Affinity",
162 => "Covenant",
163 => "Sacrifices",
164 => "Endgame",
165 => "Gemini",
// 166 => "Prometheus Unbound",
// 167 => "It's good to be King",
// 168 => "Full Alert",
// 169 => "Citizen Joe",
// 170 => "Reckoning, part 1",
// 171 => "Reckoning, part 2",
// 172 => "Threads",
// 173 => "Moebius, part 1",
// 174 => "Moebius, part 2",
 
/* Made-for-TV movies */
214 => "The Ark of Truth",
215 => "Continuum"
),
'episode_list' => 'wiki:en:List_of_Stargate_SG-1_episodes'
);
 
39,7 → 226,7
20 => "Die Invasion, Teil 1 (There but for the grace of God)",
21 => "Die Invasion, Teil 2 (Politics)",
22 => "Die Invasion, Teil 3 (Within the Serpent’s Grasp)",
 
23 => "Die Invasion, Teil 4 (The Serpent’s Lair)",
24 => "Freund oder Feind? (In the Line of Duty)",
25 => "Zerstörerin der Welten (Prisoners)",
62,7 → 249,7
42 => "Neue Feinde (Show and Tell)",
43 => "1969 (1969)",
44 => "Die Höhle des Löwen, Teil 1 (Out of Mind)",
 
45 => "Die Höhle des Löwen, Teil 2 (Into the Fire)",
46 => "Seth (Seth)",
47 => "Die Saat des Verrats (Fair Game)",
85,7 → 272,7
64 => "Harsesis’ Rettung (Maternal Instinct) (23.05.2011 18:10)",
65 => "Der Kristallschädel (Crystal Skull)",
66 => "Nemesis, Teil 1 (Nemesis)",
 
67 => "Nemesis, Teil 2 (Small Victories)",
68 => "Die andere Seite der Medaille (The other Side)",
69 => "Das Vermächtnis der Antiker (Upgrades)",
108,7 → 295,7
86 => "Die falsche Wahl (Entity / Child's Play)",
87 => "Doppelter Einsatz (Double Jeopardy)",
88 => "Exodus (Exodus)",
 
89 => "Todfeinde (Enemies)",
90 => "Teal'cs Prüfung (Threshold)",
91 => "Das Opfer (Ascencion)",
131,7 → 318,7
108 => "Der Wächter (The Sentinel)",
109 => "Die Entscheidung (Meridian)",
110 => "Das Geheimnis der Asgard (Revelations)",
 
111 => "Die Wiedergutmachung, Teil 1 (Redemption, part 1)",
112 => "Die Wiedergutmachung, Teil 2 (Redemption, part 2)",
113 => "Notlandung (Descent)",
154,7 → 341,7
130 => "Vergangenheit (Memento)",
131 => "Jonas’ Visionen (Prophecy)",
132 => "Der Kreis schließt sich (Full Circle)",
 
133 => "Alles auf eine Karte, Teil 1 (Fallen) (25.08.2011 18:10)",
134 => "Alles auf eine Karte, Teil 2 (Home coming)",
135 => "Der falsche Klon (Fragile Balance)",
177,7 → 364,7
152 => "Der Neue Präsident (Inauguration)",
153 => "Die verlorene Stadt, Teil 1 (The lost City, part 1)",
154 => "Die verlorene Stadt, Teil 2 (The lost City, part 2)",
 
// 155 => "Neue Machtverhältnisse, Teil 1 (New Order, part 1)",
// 156 => "Neue Machtverhältnisse, Teil 2 (New Order, part 2)",
157 => "Colonel Vaselov (Lockdown)",
317,7 → 504,7
// 38 => 'Michael (Michael)',
// 39 => 'Inferno (Inferno)',
40 => 'Die Verbündeten (DVD) / Das Bündnis (RTL 2) (Allies)',
 
41 => "Niemandsland (No Man's Land)",
42 => "Ein schlechter Plan (Misbegotten)",
42 => "Der Zaubertrank (Irresistible)",
360,7 → 547,7
// 18 => "Die Luzianer-Allianz (Subversion)",
// 19 => "Feindlicher Übergriff – Teil 1 (Incursion (1))",
// 20 => "Feindlicher Übergriff – Teil 2 (Incursion (2))",
 
21 => "Intervention – Teil 3 (Intervention (3))",
22 => "Nachwirkungen (Aftermath)",
23 => "Angedockt (Awakening)",
/branches/live/media/video/series/includes/futurama.php
1,8 → 1,8
<?php
 
$futurama = array(
'channel' => 'VIVA.de',
'showtimes' => 'Mo-Fr 21:45',
'channel' => 'online',
// 'showtimes' => 'Mo-Fr 21:45',
'seen' => array(array(1, 22), 65),
'seasons' => array(13, 19, 22, 18, 16, 26, 26),
'episode_list' => 'wiki:Liste_der_Futurama-Episoden',
/branches/live/media/video/series/style.css
60,6 → 60,14
text-align: right;
}
 
th > span,
th > :link > span,
th > :visited > span
{
display: inline-block;
text-align: center;
}
 
td:first-child {
width: 1em;
border: none;
92,7 → 100,7
}
 
.akte-x {
padding: 1em 0.25em 0.6em 0.25em;
padding: 0.5em 0.25em 0em 0.25em;
<?php
/*
background-image: -(o-|)linear-gradient(12deg,
251,7 → 259,6
}
 
.buffy {
display: inline-block;
padding: 0.75em 0.5em 0.5em 0.5em;
background-color: #000700;
<?php Mixins::radial_gradient('background-image', 'circle, #6d7a9c 35%, transparent 45%'); ?>
292,7 → 299,6
 
.charmed {
position: relative;
display: inline-block;
background-color: #080E32;
color: rgb(223, 229, 251);
color: rgba(255, 255, 255, 0.75);
410,7 → 416,6
}
 
.countdown-x {
display: inline-block;
font-family: "ITC Serif Gothic LT Heavy", sans-serif;
line-height: 0.9em;
text-align: center;
427,7 → 432,6
}
 
.dead-zone {
display: inline-block;
background-color: black;
background-image: -webkit-radial-gradient(50% 20%, 20% 100%, white, transparent 75%);
color: white;
530,7 → 534,6
 
.efc {
position: relative;
display: inline-block;
background-color: #000;
background-image:
/* Terra */
707,7 → 710,6
}
 
.firefly {
display: inline-block;
padding: 0.4em 0.8em 0.4em 0.95em;
background-color: #762109;
<?php
774,7 → 776,6
}
 
.fringe {
display: inline-block;
padding: 0.125em 0.5em 0.125em 0.5em;
background-color: #000;
background-image: -moz-radial-gradient(center, #D6DBD3 4%, #7d9b9d 60%, black);
997,9 → 998,8
}
 
.heroes {
display: inline-block;
position: relative;
padding: 0.325em 0.75em 0.2em 0.75em;
padding: 0.3em 0.75em 0.3em 0.75em;
background-color: black;
color: #fff;
font-family: "SKM Avant Garde Two", sans-serif;
1085,7 → 1085,6
}
 
.ijon-tichy {
display: inline-block;
padding: 0.25em 0.5em;
background-color: #000;
color: #B9B7BA;
1202,7 → 1201,6
}
 
.it-crowd {
display: inline-block;
position: relative;
padding: 0.125em 0.75em 0.125em 0.5em;
background-color: black;
1230,13 → 1228,15
background-color: #000;
background-image:
-webkit-linear-gradient(left,
rgba(255, 255, 255, 0) 35%,
rgba(255, 255, 255, 1) 35%, rgba(255, 255, 255, 1) 36%,
rgba(255, 255, 255, 0) 37%),
rgba(255, 255, 255, 0) 44%,
rgba(255, 255, 255, 1) 45%,
rgba(255, 255, 255, 1) 46%,
rgba(255, 255, 255, 0) 47%),
-webkit-linear-gradient(top,
rgba(255, 255, 255, 0) 81%,
rgba(255, 255, 255, 1) 81%, rgba(255, 255, 255, 1) 89%,
rgba(255, 255, 255, 0) 89%);
rgba(255, 255, 255, 0) 48%,
rgba(255, 255, 255, 1) 48%,
rgba(255, 255, 255, 1) 52%,
rgba(255, 255, 255, 0) 52%);
color: #fff;
font-weight: bold;
text-shadow: 0 0 0.5px #fff;
1244,15 → 1244,31
-webkit-text-fill-color: transparent;
}
 
.life-on-mars .life {
vertical-align: top;
display: inline-block;
}
 
.life-on-mars .e {
letter-spacing: 0.5em;
}
.life-on-mars .life-on {
display: inline-block;
text-align: left;
}
.life-on-mars .on {
display: inline-block;
text-align: left;
text-shadow: 0 0 1px #fff;
}
 
.life-on-mars .mars {
display: block;
position: relative;
top: 0.25em;
text-align: left;
text-shadow: 0 0 2px #fff;
}
 
1331,24 → 1347,15
 
.moonlighting {
padding: 0.125em 0.5em;
background-color: #933;
<?php Mixins::linear_gradient('background-image', '#5c3345, #6c2013'); ?>
color: #916ba6;
background-color: #672522;
<?php Mixins::linear_gradient('background-image', '#672b24, #652313'); ?>
color: #f2f4ff;
color: rgba(242, 244, 255, 0.97);
font: 116% "Futura Condensed", sans-serif;
<?php Mixins::prefix_property('outline', '', '1px solid #fff', array('-webkit-', '')); ?>
text-shadow:
/* glow */
-1px 0 1px white,
0 -1px 1px white,
1px 0 1px white,
0 1px 1px white,
/* outline */
-1px 0 white,
0 -1px white,
1px 0 white,
0 1px white;
text-shadow: 0 0 5px rgba(219, 227, 236, 0.5);
text-transform: uppercase;
-webkit-text-fill-color: rgba(123, 134, 255, 0.53);
-webkit-text-stroke: 1px rgba(242, 244, 255, 0.97);
}
 
@font-face {
1478,7 → 1485,6
 
.quantum-leap {
position: relative;
display: inline-block;
left: 0;
top: 0;
padding: 0.5em 0.5em 0.25em 0.5em;
1549,7 → 1555,6
}
 
.remington-steele {
display: inline-block;
background-color: white;
color: #506BA6;
font: bold 104% MicroExtendFLF-Bold, sans-serif;
1564,7 → 1569,6
}
 
.roswell {
display: inline-block;
padding: 0.25em 0.5em 0.125em 0.5em;
background-color: #000;
<?php
1587,7 → 1591,6
}
 
.samantha-who {
display: inline-block;
padding: 0.125em 0.25em 0.125em 0.25em;
background-color: #000;
color: #e3e5e2;
1669,7 → 1672,6
 
.seaQuest {
position: relative;
display: inline-block;
padding-top: 1.5em;
background-color: #00001e;
<?php
1846,7 → 1848,6
 
.simpsons {
position: relative;
display: inline-block;
min-width: 6em;
min-height: 2em;
padding: 0.125em 0.25em;
1934,7 → 1935,6
}
 
.space-above-beyond {
display: inline-block;
background-color: #222723;
color: #A7B2C4;
padding: 0.25em 0.5em;
1976,7 → 1976,6
}
 
.stargate {
display: inline-block;
font-family: "Stargate", serif;
font-size: 122%;
text-align: center;
1991,6 → 1990,12
letter-spacing: 0.125em;
}
 
.stargate.en span .t,
.stargate.en span .a2
{
letter-spacing: 0.03125em;
}
 
.stargate.en span span:last-child {
letter-spacing: normal;
}
1997,13 → 2002,17
 
.stargate.en > span:first-child {
padding-bottom: 0;
border-bottom: 1px solid black;
/* border-bottom: 1px solid black; */
}
 
.stargate.en > span:last-child {
padding-top: 0.125em;
/* padding-top: 0.125em; */
}
 
.stargate.de span .a2 {
letter-spacing: -0.03125em;
}
 
.stargate.de > span:last-child {
font-size: 64%;
}
2072,7 → 2081,6
}
 
.star-trek-tng {
display: inline-block;
padding: 0.25em 0.5em 0.25em 0.5em;
background-color: #000;
color: #2D7BCD;
2146,7 → 2154,6
}
 
.visitors {
display: inline-block;
position: relative;
padding: 0.5em 0.5em 0.25em 0.5em;
background-color: #000;
/branches/live/media/video/series
Property changes:
Added: svn:mergeinfo
Merged /trunk/media/video/series:r198-201