* Seri-o-meter - Fixed issue with non-numeric season keys - Improved "Life on Mars" logo - Added "Odyssey 5" with suitable font - General update
| /trunk/media/video/series/data.inc |
|---|
| 175,7 → 175,7 |
| // 'ignore' => true, |
| 'channel' => 'BBC 3', |
| 'showtimes' => 'Fr 20:00', |
| 'seen' => array(42, 56, array(60, 62)), |
| 'seen' => array(1, 42, 56, array(60, 62)), |
| 'last_seen' => mktime(20, 0, 0, 12, 19, 2011), |
| 'seasons' => array( |
| 13, 'Special 2005' => 1, |
| 185,10 → 185,23 |
| 13, 'Special 2010' => 1, |
| 13, 'Special 2011' => 1 |
| ), |
| 'episode_list' => 'wiki:en:List_of_Doctor_Who_serials#Eleventh_Doctor', |
| 'episode_list' => 'wiki:en:List_of_Doctor_Who_serials#Ninth_Doctor', |
| 'episodes' => array( |
| // 1 => "Rose", |
| // 14 => "The Christmas Invasion", |
| 1 => "Rose", |
| 2 => "The End of the World", |
| 3 => "The Unquiet Dead", |
| 4 => "Aliens of London", |
| // 5 => "World War Three", |
| // 6 => "Dalek", |
| // 7 => "The Long Game", |
| // 8 => "Father's Day", |
| // 9 => "The Empty Child", |
| // 10 => "The Doctor Dances", |
| // 11 => "Boom Town", |
| 12 => "Bad Wolf", |
| // 13 => "The Parting of the Ways", |
| 14 => "The Christmas Invasion", |
| // 15 => "New Earth", |
| // 28 => "The Runaway Bride", |
| 566,7 → 579,9 |
| '<span class="monk">Monk</span>' => &$monk, |
| '<span class="monk">Monk</span> (de)' => &$monk_de, |
| '<span class="life-on-mars">Life on Mars</span> (de)' => array( |
| '<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( |
| // 'ignore' => true, |
| 'channel' => 'online', |
| 'seen' => array(array(1, 2)), |
| 699,7 → 714,36 |
| '<span class="numb3rs"><span class="gradient">Numb<span title="e">3</span>r<span class="s">s</span></span></span>' => &$numb3rs, |
| // '<span class="numb3rs"><span class="gradient">Numb<span title="e">3</span>r<span class="s">s</span></span></span> (de)' => &$numb3rs_de, |
| '<span class="odyssey5">Odys<span class="s2">s</span><span |
| class="e">e</span><span class="y2">y</span> |
| <span class="five">5</span></span>' => array( |
| 'channel' => 'online', |
| 'seen' => array(array(1, 2)), |
| 'episode_list' => 'wiki:en:Odyssey_5#Episode_list', |
| 'episodes' => array( |
| 1 => 'Pilot', |
| 2 => 'Shatterer', |
| 3 => 'Astronaut Dreams', |
| 4 => 'Time Out of Mind', |
| 5 => 'Symbiosis', |
| 6 => 'The Choices We Make', |
| 7 => 'Rapture', |
| 8 => 'L.D.U. 7', |
| 9 => 'Flux', |
| 10 => 'Kitten', |
| 11 => 'Dark at the End of the Tunnel', |
| 12 => 'Trouble with Harry', |
| 13 => 'Skin', |
| 14 => 'Begotten', |
| 15 => 'Vanishing Point', |
| 16 => 'Follow the Leader', |
| 17 => 'Half-Life', |
| 18 => 'Rage', |
| 19 => 'Fossil' |
| ) |
| ), |
| '<span class="psych">psych</span>' => &$psych, |
| '<span class="quantum-leap"><span class="gradient">Quantum Leap</span></span>' => &$quantum_leap, |
| 821,7 → 865,6 |
| 'episode_list' => 'wiki:en:List_of_Roswell_episodes' |
| ), |
| '<span class="samantha-who"><span class="text"><span class="samantha">Samantha</span>' |
| . ' <span class="who">Who</span></span><span class="q">?</span></span>' => array( |
| 'channel' => 'E4', |
| /trunk/media/video/series/includes/simpsons.php |
|---|
| 5,7 → 5,7 |
| 'channel' => 'Channel 4 / online', |
| 'showtimes' => 'So 14:00–15:05', |
| 'seen' => array( |
| array(1, 9), array(11, 12), array(14, 28), |
| array(1, 9), array(11, 12), array(14, 30), |
| array(63, 64), 95), |
| // 'last_seen' => mktime(21, 30, 0, 8, 3, 2010), |
| 'seasons' => array(13, 22, 24, 22, 22 , 25, 25, 25, 25, 23, 22, |
| /trunk/media/video/series/includes/macgyver.php |
|---|
| 2,7 → 2,7 |
| $macgyver = array( |
| 'channel' => 'online', |
| 'seen' => array(array(1, 8)), |
| 'seen' => array(array(1, 9)), |
| 'seasons' => array(22, 22, 20, 19, 21, 21, 14), |
| 'episode_list' => 'wiki:en:List_of_MacGyver_episodes', |
| 'episodes' => array( |
| /trunk/media/video/series/style.css |
|---|
| 1034,22 → 1034,36 |
| } |
| .life-on-mars { |
| display: inline-block; |
| padding: 0.25em 0.5em; |
| background-color: #c5ae91; |
| background-color: #000; |
| background-image: |
| -webkit-repeating-linear-gradient(left, |
| rgba(179, 157, 129, 0) 0%, rgba(179, 157, 129, 0) 20%, |
| rgba(179, 157, 129, 1) 19%, rgba(179, 157, 129, 1) 21%, |
| rgba(179, 157, 129, 0) 21%, rgba(179, 157, 129, 0) 30%), |
| -webkit-linear-gradient(top, |
| rgba(179, 157, 129, 0) 25%, |
| rgba(179, 157, 129, 1) 26%, rgba(179, 157, 129, 1) 28%, |
| rgba(179, 157, 129, 0) 29%); |
| color: #4C4641; |
| color: rgba(0, 0, 0, 0.6); |
| -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) 38%), |
| -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%); |
| color: #fff; |
| text-shadow: 0 0 0.5px #fff; |
| text-transform: uppercase; |
| -webkit-text-fill-color: transparent; |
| } |
| .life-on-mars .e { |
| letter-spacing: 0.5em; |
| } |
| .life-on-mars .on { |
| text-shadow: 0 0 1px #fff; |
| } |
| .life-on-mars .mars { |
| text-shadow: 0 0 2px #fff; |
| } |
| .macgyver { |
| padding: 0.125em 0.5em; |
| background-color: #080a09; |
| 1204,6 → 1218,36 |
| } */ |
| @font-face { |
| font-family: "Unconform Round"; |
| src: local("Unconform Round"), url(/styles/fonts/UNCON___.TTF); |
| } |
| .odyssey5 { |
| padding: 0.5em 0.5em 0.125em 0.5em; |
| background-color: #000; |
| color: #d1550b; |
| font-family: "Unconform Round", sans-serif; |
| text-transform: uppercase; |
| letter-spacing: 0.125em; |
| } |
| .odyssey5 .s2 { |
| letter-spacing: 0.25em; |
| } |
| .odyssey5 .e { |
| letter-spacing: 0.5em; |
| } |
| .odyssey5 .y2 { |
| letter-spacing: 0.5em; |
| } |
| .odyssey5 .five { |
| letter-spacing: normal; |
| } |
| @font-face { |
| font-family: "Dateline Bold"; |
| src: local("Dateline Bold"), url(/styles/fonts/DatelineBold.ttf); |
| } |
| /trunk/media/video/series/index.php |
|---|
| 46,10 → 46,18 |
| $serie['season_ranges'] = array(); |
| foreach ($serie['seasons'] as $season_key => $season_length) |
| { |
| $serie['season_ranges'][$season_key + 1] = array($episode_count, $episode_count + $season_length - 1); |
| if (is_int($season_key)) |
| { |
| $serie['season_ranges'][$season_key + 1] = array($episode_count, $episode_count + $season_length - 1); |
| } |
| $episode_count += $season_length; |
| } |
| } |
| else |
| { |
| $serie['total'] = max(array_keys($serie['episodes'])); |
| } |
| $serie['percentage'] = 0; |
| if ($serie['total'] > 0) |