4 files changed, 68 insertions, 27 deletions
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index d317765..d600f7d 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.4
-pkgrel=8
+pkgrel=9
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,7 +15,7 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
 source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml'
         'bubble_background.png' 'preview.png' 'blank_coverart.png'
         'checkmark.png' 'error.png' 'gears.png' 'question.png' 'warning.png'
-         'progdetails_page1.html.patch' 'progdetails_page2.html.patch'
+        'progdetails_page1.html'
         'LHLogo.png' 'LHLogoAndText.png')
 install=$pkgname.install
 
@@ -52,14 +52,13 @@ package() {
         patch -N -i ${srcdir}/$i || return 1
         echo "-----------------------------"
     done
-    cd $pkgdir/$THEMEROOT/LinHES/htmls/
-    patch -N -i ${srcdir}/progdetails_page1.html.patch || return 1
-    patch -N -i ${srcdir}/progdetails_page2.html.patch || return 1
     cd $startdir
     msg "--------------------------done applying patches-------------------------"
 
     msg "Copy *.xml and adding backgrounds and images for LinHES"
     rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/
+    rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/
+    rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/progdetails_page2.html
     rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/*
     rsync -pL $srcdir/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png
     rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/
@@ -114,7 +113,6 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          'e8dee86a10ce7c4423a97305b38b4668'
          'e8ac15e38b3dc99c9e889e439ba356de'
          'e8cf0d3a55ba3be47deae55c05432141'
-         '759c9f34ecc6b9039e00fc12b384dd7b'
-         'd331710be0dab8cbec77c70278f92146'
+         'bcc89120aba113ca204534dbbbaee60d'
          'b51ef0cbf8ed2d3a8c1a8257a89aceff'
          '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/progdetails_page1.html b/abs/core/linhes-theme/progdetails_page1.html
new file mode 100644
index 0000000..76ce9d0
--- /dev/null
+++ b/abs/core/linhes-theme/progdetails_page1.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+    <style type="text/css">
+        body {background-color:#0a0a0e;}
+        h1 {font-family:Overlock;font-size:1.6em;font-style: normal;color:#ebb81c;margin-top: -5pt;text-align: center;}
+        h2 {font-family:Overlock;font-size:1.5em;font-style: normal;color:#ebb81c;margin-top: -5pt;text-align: center;}
+        p  {font-family:Overlock;font-size:1.4em;font-style: normal;color:#e6e6e6;margin-top: -10pt;text-align: center;}
+        hr {border:1px solid #0a0a0e;background-color:#7e8082;height:3px;margin-top: -10pt;margin-bottom: 13pt}
+        #wrap {width:100%;margin:0px auto;}
+        .col {float:left;width:33%;}
+    </style>
+</head>
+
+<body>
+    <h1>%TITLE%</h1><p>%DESCRIPTION%</p>
+    <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p>
+    <hr />
+    <div id="wrap">
+        <div class="col">
+            <h2>%ORIGINAL_AIRDATE_LABEL%</h2> <p>%ORIGINAL_AIRDATE%</p>
+            <h2>%SEASON_LABEL%/%EPISODE_LABEL%</h2> <p>S%SEASON%/E%EPISODE%</p>
+            <h2>%CATEGORY_LABEL%</h2> <p>%CATEGORY%</p>
+            <h2>%CATEGORY_TYPE_LABEL%</h2> <p>%CATEGORY_TYPE%</p>
+            <h2>%PROGRAMID_LABEL%</h2> <p>%PROGRAMID%</p>
+            <h2>%MYTHTV_STATUS_LABEL%</h2> <p>%MYTHTV_STATUS%</p>
+            <h2>%RECORDING_RULE_LABEL%</h2> <p>%RECORDING_RULE%</p>
+            <h2>%SEARCH_PHRASE_LABEL%</h2> <p>%SEARCH_PHRASE%</p>
+            <h2>%RECORDED_FILE_NAME_LABEL%</h2> <p>%RECORDED_FILE_NAME%</p>
+            <h2>%RECORDED_FILE_SIZE_LABEL%</h2> <p>%RECORDED_FILE_SIZE%</p>
+        </div>
+        <div class="col">
+            <h2>%RECORDING_PROFILE_LABEL%</h2> <p>%RECORDING_PROFILE%</p>
+            <h2>%RECORDING_GROUP_LABEL%</h2> <p>%RECORDING_GROUP%</p>
+            <h2>%STORAGE_GROUP_LABEL%</h2> <p>%STORAGE_GROUP%</p>
+            <h2>%PLAYBACK_GROUP_LABEL%</h2> <p>%PLAYBACK_GROUP%</p>
+            <h2>%LAST_RECORDED_LABEL%</h2> <p>%LAST_RECORDED%</p>
+            <h2>%NEXT_RECORDING_LABEL%</h2> <p>%NEXT_RECORDING%</p>
+            <h2>%AVERAGE_TIME_SHIFT_LABEL%</h2> <p>%AVERAGE_TIME_SHIFT%</p>
+            <h2>%WATCH_LIST_SCORE_LABEL%</h2> <p>%WATCH_LIST_SCORE%</p>
+            <h2>%WATCH_LIST_STATUS_LABEL%</h2> <p>%WATCH_LIST_STATUS%</p>
+            <h2>%FINDID_LABEL%</h2> <p>%FINDID%</p>
+            <h2>%RECORDING_HOST_LABEL%</h2> <p>%RECORDING_HOST%</p>
+            <h2>%RECORDING_INPUT_LABEL%</h2> <p>%RECORDING_INPUT%</p>
+        </div>
+        <div class="col">
+            <h2>%ACTORS_LABEL%</h2> <p>%ACTORS%</p>
+            <h2>%GUEST_STAR_LABEL%</h2> <p>%GUEST_STAR%</p>
+            <h2>%GUEST_LABEL%</h2> <p>%GUEST%</p>
+            <h2>%DIRECTOR_LABEL%</h2> <p>%DIRECTOR%</p>
+            <h2>%PRODUCER_LABEL%</h2> <p>%PRODUCER%</p>
+            <h2>%EXECUTIVE_PRODUCER_LABEL%</h2> <p>%EXECUTIVE_PRODUCER%</p>
+            <h2>%WRITER_LABEL%</h2> <p>%WRITER%</p>
+            <h2>%HOST_LABEL%</h2> <p>%HOST%</p>
+            <h2>%ADAPTER_LABEL%</h2> <p>%ADAPTER%</p>
+            <h2>%PRESENTER_LABEL%</h2> <p>%PRESENTER%</p>
+            <h2>%COMMENTATOR_LABEL%</h2> <p>%COMMENTATOR%</p>
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/abs/core/linhes-theme/progdetails_page1.html.patch b/abs/core/linhes-theme/progdetails_page1.html.patch
deleted file mode 100644
index 1098733..0000000
--- a/abs/core/linhes-theme/progdetails_page1.html.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- progdetails_page1.html.orig	2016-10-10 19:58:30.445542674 +0000
-+++ progdetails_page1.html	2016-10-10 19:59:13.280088646 +0000
-@@ -42,6 +42,7 @@
-             <h2>%WATCH_LIST_STATUS_LABEL%</h2> <p>%WATCH_LIST_STATUS%</p>
-             <h2>%FINDID_LABEL%</h2> <p>%FINDID%</p>
-             <h2>%RECORDING_HOST_LABEL%</h2> <p>%RECORDING_HOST%</p>
-+            <h2>%RECORDING_INPUT_LABEL%</h2> <p>%RECORDING_INPUT%</p>
-         </div>
-         <div class="col">
-             <h2>%ACTORS_LABEL%</h2> <p>%ACTORS%</p>
diff --git a/abs/core/linhes-theme/progdetails_page2.html.patch b/abs/core/linhes-theme/progdetails_page2.html.patch
deleted file mode 100644
index bd1703d..0000000
--- a/abs/core/linhes-theme/progdetails_page2.html.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- htmls/progdetails_page2.html.orig	2016-10-10 19:59:43.816200423 +0000
-+++ htmls/progdetails_page2.html	2016-10-10 19:59:22.072302460 +0000
-@@ -42,6 +42,7 @@
-             <h2>%WATCH_LIST_STATUS_LABEL%</h2> <p>%WATCH_LIST_STATUS%</p>
-             <h2>%FINDID_LABEL%</h2> <p>%FINDID%</p>
-             <h2>%RECORDING_HOST_LABEL%</h2> <p>%RECORDING_HOST%</p>
-+            <h2>%RECORDING_INPUT_LABEL%</h2> <p>%RECORDING_INPUT%</p>
-         </div>
-         <div class="col">
-             <h2>%ACTORS_LABEL%</h2> <p>%ACTORS%</p>