Ticket #7196: 7196.diff

mythplugins/mythweb/skins/default/video.css.php

@@ -14 +14 @@
     .video .title {
         font-weight:        bold;
         margin-bottom:      .5em;
-        height:             2.25em;
+        height:             2.5em;
         overflow:           hidden;
     }
 

mythplugins/mythweb/modules/video/edit.php

@@ -45 +45 @@
 //check to see if the form has been submitted
     if (isset($_REQUEST['submit'])) {
         $Video->title       = $_REQUEST['title'];
+        $Video->subtitle    = $_REQUEST['subtitle'];
+        $Video->season      = $_REQUEST['season'];
+        $Video->episode     = $_REQUEST['episode'];
         $Video->director    = $_REQUEST['director'];
         $Video->plot        = $_REQUEST['plot'];
         $Video->category    = $_REQUEST['category'];
@@ -80 +83 @@
 <form method="post" action="<?php echo root_url ?>video/edit" enctype="multipart/form-data">
 Title<br>
 <input name="title" type="text" value="<?php echo htmlspecialchars($Video->title, ENT_QUOTES ); ?>"><br><br>
+Subtitle<br>
+<input name="subtitle" type="text" value="<?php echo htmlspecialchars($Video->subtitle, ENT_QUOTES ); ?>"><br><br>
+Season:<br>
+<input name="season" type="text" size="3" value="<?php echo intval($Video->season); ?>"><br><br>
+Episode:<br>
+<input name="episode" type="text" size="3" value="<?php echo intval($Video->episode); ?>"><br><br>
 Director<br>
 <input name="director" type="text" value="<?php echo htmlspecialchars($Video->director, ENT_QUOTES ); ?>"><br><br>
 Plot<br>

mythplugins/mythweb/modules/video/tmpl/default/video.php

@@ -304 +304 @@
         <div id="<?php echo $video->intid; ?>_categoryid" class="hidden"><?php echo $video->category; ?></div>
         <div id="<?php echo $video->intid; ?>_genre" class="hidden"><?php if (count($video->genres)) foreach ($video->genres as $genre) echo ' '.$genre.' ';?></div>
         <div id="<?php echo $video->intid; ?>_browse" class="hidden"><?php echo $video->browse; ?></div>
-        <div id="<?php echo $video->intid; ?>-title" class="title"><a href="<?php echo $video->url; ?>"><?php echo html_entities($video->title); ?></a></div>
+        <div id="<?php echo $video->intid; ?>-title" class="title">
+            <a href="<?php echo $video->url; ?>"><?php echo html_entities($video->title); ?></a><?php 
+                  if (($video->season > 0) && ($video->episode >= 0)) 
+                      printf('(S%02d E%02d)', $video->season, $video->episode); 
+                  if (strlen($video->subtitle) > 0) 
+                      echo '<br>' . html_entities($video->subtitle); 
+            ?></div>
         <div id="<?php echo $video->intid; ?>_img">                <img <?php if ($_SESSION["show_video_covers"] && file_exists($video->cover_file)) echo 'src="'.$video->cover_url.'"'; echo ' width="'.$video->cover_scaled_width.'" height="'.$video->cover_scaled_height.'"'; ?> alt="<?php echo t('Missing Cover'); ?>"></div>
         <div id="<?php echo $video->intid; ?>-category">           <?php echo $Category_String[$video->category]; ?></div>
         <div id="<?php echo $video->intid; ?>_playtime">           <?php echo nice_length($video->length * 60); ?></div>

mythplugins/mythweb/classes/Video.php

@@ -7 +7 @@
     var $category;
     var $rating;
     var $title;
+    var $subtitle;
+    var $season;
+    var $episode;
     var $director;
     var $inetref;
     var $year;
@@ -40 +43 @@
         $this->category     = $video['category'];
         $this->rating       = $video['rating'];
         $this->title        = $video['title'];
+        $this->subtitle     = $video['subtitle'];
+        $this->season       = $video['season'];
+        $this->episode      = $video['episode'];
         $this->director     = $video['director'];
         $this->inetref      = $video['inetref'];
         $this->year         = $video['year'] ? $video['year'] : 'Unknown';
@@ -89 +95 @@
                                        .(($_SESSION["show_video_covers"] && file_exists($this->cover_url)) ? ' src="data/video_covers/'.basename($this->cover_file).'"' : '')
                                        .'>',
                       'title'       => '<a href="'.$this->url.'">'.$this->title.'</a>',
+                      'subtitle'    => $this->subtitle,
+                      'season'      => $this->season,
+                      'episode'     => $this->episode,
                       'playtime'    => nice_length($this->length * 60),
                       'category'    => strlen($Category_String[$this->category]) ? $Category_String[$this->category] : 'Uncategorized',
                       'imdb'        => ($this->inetref != '00000000') ? '<a href="http://www.imdb.com/Title?'.$this->inetref.'">'.$this->inetref.'</a>' : '',
@@ -110 +119 @@
                            videometadata.category     = ?,
                            videometadata.rating       = ?,
                            videometadata.title        = ?,
+                           videometadata.subtitle     = ?,
+                           videometadata.season       = ?,
+                           videometadata.episode      = ?,
                            videometadata.director     = ?,
                            videometadata.inetref      = ?,
                            videometadata.year         = ?,
@@ -124 +136 @@
                     $this->category,
                     $this->rating,
                     $this->title,
+                    $this->subtitle,
+                    $this->season,
+                    $this->episode,
                     $this->director,
                     $this->inetref,
                     $this->year,