From 08d567f3ecaa54fe0a52c703bec510ecb32e6011 Mon Sep 17 00:00:00 2001 From: Britney Fransen <brfransen@gmail.com> Date: Sat, 23 Nov 2013 11:34:10 -0600 Subject: linhes-theme: rearrange progdetails_page1.html. page2 isn't needed anymore. refs #940. --- abs/core/linhes-theme/PKGBUILD | 9 ++-- abs/core/linhes-theme/progdetails_page1.html | 63 +++++++++++++++++++++------- abs/core/linhes-theme/progdetails_page2.html | 49 ---------------------- 3 files changed, 51 insertions(+), 70 deletions(-) delete mode 100644 abs/core/linhes-theme/progdetails_page2.html diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index f261ac0..cb2f5a4 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.1 -pkgrel=3 +pkgrel=4 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -13,7 +13,7 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' source=("git://github.com/MythTV-Themes/TintedGlass.git" `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'background.png' 'qt-background.png' 'tux_thoughts.png' - 'progdetails_page1.html' 'progdetails_page2.html') + 'progdetails_page1.html') package() { THEMEROOT=usr/share/mythtv/themes @@ -43,7 +43,7 @@ package() { #copy in progdetails mkdir -p $pkgdir/$THEMEROOT/LinHES/htmls - rsync -pL $srcdir/progdetails_page*.html $pkgdir/$THEMEROOT/LinHES/htmls/ + rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/ msg "Modifying yellows and blue to LinHES yellow and blue" #yellow @@ -64,5 +64,4 @@ md5sums=('SKIP' 'cbe5f663ebb5d51abe811f81dafec303' '12d26a786fde397348653128a6d7676a' '2bd09b8049aaf5ba21db5baf3a0ce077' - 'cc2b5da9ad34704d773f3235bf686835' - 'be7853c2c9598481368c10f0eb5ad43f') + '93db934881cb438fc76ae544d4eee432') diff --git a/abs/core/linhes-theme/progdetails_page1.html b/abs/core/linhes-theme/progdetails_page1.html index 57b5a52..2f904c8 100644 --- a/abs/core/linhes-theme/progdetails_page1.html +++ b/abs/core/linhes-theme/progdetails_page1.html @@ -4,27 +4,58 @@ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> <style type="text/css"> body {background-color:#1a1a1a;} - h1 {font-family:DejaVu Sans;font-size:1.6em;font-style: normal;color:#ebb81c;margin-top: -5pt} - p {font-family:DejaVu Sans;font-size:1.6em;font-style: normal;color:#ffffff;margin-top: -10pt} + h1 {font-family:DejaVu Sans;font-size:1.6em;font-style: normal;color:#ebb81c;margin-top: -5pt;text-align: center;} + p {font-family:DejaVu Sans;font-size:1.6em;font-style: normal;color:#ffffff;margin-top: -10pt;text-align: center;} + hr {border:1px solid #1a1a1a;background-color:#e6e6e6;height:3px;margin-top: -10pt;margin-bottom: 13pt} + #wrap {width:100%;margin:0px auto;} + .col {float:left;width:33%;} </style> </head> <body> - <h1>%TITLE_LABEL% & %DESCRIPTION_LABEL%</h1> <p>%TITLE%: %DESCRIPTION%</p> + <h1>%TITLE%</h1><p>%DESCRIPTION%</p> <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p> - <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p> - <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p> - <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p> - <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p> - <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p> - <h1>%PROGRAMID_LABEL%</h1> <p>%PROGRAMID%</p> - <h1>%RECORDING_RULE_LABEL%</h1> <p>%RECORDING_RULE%</p> - <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p> - <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p> - <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p> - <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p> - <h1>%RECORDING_GROUP_LABEL%</h1> <p>%RECORDING_GROUP%</p> - <h1>%PLAYBACK_GROUP_LABEL%</h1> <p>%PLAYBACK_GROUP%</p> + <hr /> + <div id="wrap"> + <div class="col"> + <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p> + <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p> + <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p> + <h1>%CATEGORY_TYPE_LABEL%</h1> <p>%CATEGORY_TYPE%</p> + <h1>%PROGRAMID_LABEL%</h1> <p>%PROGRAMID%</p> + <h1>%MYTHTV_STATUS_LABEL%</h1> <p>%MYTHTV_STATUS%</p> + <h1>%RECORDING_RULE_LABEL%</h1> <p>%RECORDING_RULE%</p> + <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p> + <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p> + <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p> + </div> + <div class="col"> + <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p> + <h1>%RECORDING_GROUP_LABEL%</h1> <p>%RECORDING_GROUP%</p> + <h1>%STORAGE_GROUP_LABEL%</h1> <p>%STORAGE_GROUP%</p> + <h1>%PLAYBACK_GROUP_LABEL%</h1> <p>%PLAYBACK_GROUP%</p> + <h1>%LAST_RECORDED_LABEL%</h1> <p>%LAST_RECORDED%</p> + <h1>%NEXT_RECORDING_LABEL%</h1> <p>%NEXT_RECORDING%</p> + <h1>%AVERAGE_TIME_SHIFT_LABEL%</h1> <p>%AVERAGE_TIME_SHIFT%</p> + <h1>%WATCH_LIST_SCORE_LABEL%</h1> <p>%WATCH_LIST_SCORE%</p> + <h1>%WATCH_LIST_STATUS_LABEL%</h1> <p>%WATCH_LIST_STATUS%</p> + <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p> + <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p> + </div> + <div class="col"> + <h1>%ACTORS_LABEL%</h1> <p>%ACTORS%</p> + <h1>%GUEST_STAR_LABEL%</h1> <p>%GUEST_STAR%</p> + <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p> + <h1>%DIRECTOR_LABEL%</h1> <p>%DIRECTOR%</p> + <h1>%PRODUCER_LABEL%</h1> <p>%PRODUCER%</p> + <h1>%EXECUTIVE_PRODUCER_LABEL%</h1> <p>%EXECUTIVE_PRODUCER%</p> + <h1>%WRITER_LABEL%</h1> <p>%WRITER%</p> + <h1>%HOST_LABEL%</h1> <p>%HOST%</p> + <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p> + <h1>%PRESENTER_LABEL%</h1> <p>%PRESENTER%</p> + <h1>%COMMENTATOR_LABEL%</h1> <p>%COMMENTATOR%</p> + </div> + </div> </body> </html> diff --git a/abs/core/linhes-theme/progdetails_page2.html b/abs/core/linhes-theme/progdetails_page2.html deleted file mode 100644 index c499557..0000000 --- a/abs/core/linhes-theme/progdetails_page2.html +++ /dev/null @@ -1,49 +0,0 @@ -<!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:#1a1a1a;} - h1 {font-family:DejaVu Sans;font-size:1.6em;font-style: normal;color:#ebb81c;margin-top: -5pt} - p {font-family:DejaVu Sans;font-size:1.6em;font-style: normal;color:#ffffff;margin-top: -10pt} - </style> -</head> - -body> - <h1>%TITLE_LABEL% & %DESCRIPTION_LABEL%</h1> <p>%TITLE%: %DESCRIPTION%</p> - <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p> - <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p> - <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p> - <h1>%ACTORS_LABEL%</h1> <p>%ACTORS%</p> - <h1>%GUEST_STAR_LABEL%</h1> <p>%GUEST_STAR%</p> - <h1>%DIRECTOR_LABEL%</h1> <p>%DIRECTOR%</p> - <h1>%PRODUCER_LABEL%</h1> <p>%PRODUCER%</p> - <h1>%EXECUTIVE_PRODUCER_LABEL%</h1> <p>%EXECUTIVE_PRODUCER%</p> - <h1>%WRITER_LABEL%</h1> <p>%WRITER%</p> - <h1>%HOST_LABEL%</h1> <p>%HOST%</p> - <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p> - <h1>%PRESENTER_LABEL%</h1> <p>%PRESENTER%</p> - <h1>%COMMENTATOR_LABEL%</h1> <p>%COMMENTATOR%</p> - <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p> - <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p> - <h1>%CATEGORY_TYPE_LABEL%</h1> <p>%CATEGORY_TYPE%</p> - <h1>%PROGRAMID_LABEL%</h1> <p>%PROGRAMID%</p> - <h1>%MYTHTV_STATUS_LABEL%</h1> <p>%MYTHTV_STATUS%</p> - <h1>%RECORDING_RULE_LABEL%</h1> <p>%RECORDING_RULE%</p> - <h1>%LAST_RECORDED_LABEL%</h1> <p>%LAST_RECORDED%</p> - <h1>%NEXT_RECORDING_LABEL%</h1> <p>%NEXT_RECORDING%</p> - <h1>%AVERAGE_TIME_SHIFT_LABEL%</h1> <p>%AVERAGE_TIME_SHIFT%</p> - <h1>%WATCH_LIST_SCORE_LABEL%</h1> <p>%WATCH_LIST_SCORE%</p> - <h1>%WATCH_LIST_STATUS_LABEL%</h1> <p>%WATCH_LIST_STATUS%</p> - <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p> - <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p> - <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p> - <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p> - <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p> - <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p> - <h1>%RECORDING_GROUP_LABEL%</h1> <p>%RECORDING_GROUP%</p> - <h1>%STORAGE_GROUP_LABEL%</h1> <p>%STORAGE_GROUP%</p> - <h1>%PLAYBACK_GROUP_LABEL%</h1> <p>%PLAYBACK_GROUP%</p> -</body> - -</html> -- cgit v0.12