From 08d567f3ecaa54fe0a52c703bec510ecb32e6011 Mon Sep 17 00:00:00 2001 From: Britney Fransen 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 @@ -

%TITLE_LABEL% & %DESCRIPTION_LABEL%

%TITLE%: %DESCRIPTION%

+

%TITLE%

%DESCRIPTION%

%TITLE_PRONOUNCE_LABEL%

%TITLE_PRONOUNCE%

-

%ORIGINAL_AIRDATE_LABEL%

%ORIGINAL_AIRDATE%

-

%EPISODE_LABEL%

%EPISODE%

-

%ADAPTER_LABEL%

%ADAPTER%

-

%GUEST_LABEL%

%GUEST%

-

%CATEGORY_LABEL%

%CATEGORY%

-

%PROGRAMID_LABEL%

%PROGRAMID%

-

%RECORDING_RULE_LABEL%

%RECORDING_RULE%

-

%SEARCH_PHRASE_LABEL%

%SEARCH_PHRASE%

-

%RECORDED_FILE_NAME_LABEL%

%RECORDED_FILE_NAME%

-

%RECORDED_FILE_SIZE_LABEL%

%RECORDED_FILE_SIZE%

-

%RECORDING_PROFILE_LABEL%

%RECORDING_PROFILE%

-

%RECORDING_GROUP_LABEL%

%RECORDING_GROUP%

-

%PLAYBACK_GROUP_LABEL%

%PLAYBACK_GROUP%

+
+
+
+

%ORIGINAL_AIRDATE_LABEL%

%ORIGINAL_AIRDATE%

+

%EPISODE_LABEL%

%EPISODE%

+

%CATEGORY_LABEL%

%CATEGORY%

+

%CATEGORY_TYPE_LABEL%

%CATEGORY_TYPE%

+

%PROGRAMID_LABEL%

%PROGRAMID%

+

%MYTHTV_STATUS_LABEL%

%MYTHTV_STATUS%

+

%RECORDING_RULE_LABEL%

%RECORDING_RULE%

+

%SEARCH_PHRASE_LABEL%

%SEARCH_PHRASE%

+

%RECORDED_FILE_NAME_LABEL%

%RECORDED_FILE_NAME%

+

%RECORDED_FILE_SIZE_LABEL%

%RECORDED_FILE_SIZE%

+
+
+

%RECORDING_PROFILE_LABEL%

%RECORDING_PROFILE%

+

%RECORDING_GROUP_LABEL%

%RECORDING_GROUP%

+

%STORAGE_GROUP_LABEL%

%STORAGE_GROUP%

+

%PLAYBACK_GROUP_LABEL%

%PLAYBACK_GROUP%

+

%LAST_RECORDED_LABEL%

%LAST_RECORDED%

+

%NEXT_RECORDING_LABEL%

%NEXT_RECORDING%

+

%AVERAGE_TIME_SHIFT_LABEL%

%AVERAGE_TIME_SHIFT%

+

%WATCH_LIST_SCORE_LABEL%

%WATCH_LIST_SCORE%

+

%WATCH_LIST_STATUS_LABEL%

%WATCH_LIST_STATUS%

+

%FINDID_LABEL%

%FINDID%

+

%RECORDING_HOST_LABEL%

%RECORDING_HOST%

+
+
+

%ACTORS_LABEL%

%ACTORS%

+

%GUEST_STAR_LABEL%

%GUEST_STAR%

+

%GUEST_LABEL%

%GUEST%

+

%DIRECTOR_LABEL%

%DIRECTOR%

+

%PRODUCER_LABEL%

%PRODUCER%

+

%EXECUTIVE_PRODUCER_LABEL%

%EXECUTIVE_PRODUCER%

+

%WRITER_LABEL%

%WRITER%

+

%HOST_LABEL%

%HOST%

+

%ADAPTER_LABEL%

%ADAPTER%

+

%PRESENTER_LABEL%

%PRESENTER%

+

%COMMENTATOR_LABEL%

%COMMENTATOR%

+
+
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 @@ - - - - - - - -body> -

%TITLE_LABEL% & %DESCRIPTION_LABEL%

%TITLE%: %DESCRIPTION%

-

%TITLE_PRONOUNCE_LABEL%

%TITLE_PRONOUNCE%

-

%ORIGINAL_AIRDATE_LABEL%

%ORIGINAL_AIRDATE%

-

%EPISODE_LABEL%

%EPISODE%

-

%ACTORS_LABEL%

%ACTORS%

-

%GUEST_STAR_LABEL%

%GUEST_STAR%

-

%DIRECTOR_LABEL%

%DIRECTOR%

-

%PRODUCER_LABEL%

%PRODUCER%

-

%EXECUTIVE_PRODUCER_LABEL%

%EXECUTIVE_PRODUCER%

-

%WRITER_LABEL%

%WRITER%

-

%HOST_LABEL%

%HOST%

-

%ADAPTER_LABEL%

%ADAPTER%

-

%PRESENTER_LABEL%

%PRESENTER%

-

%COMMENTATOR_LABEL%

%COMMENTATOR%

-

%GUEST_LABEL%

%GUEST%

-

%CATEGORY_LABEL%

%CATEGORY%

-

%CATEGORY_TYPE_LABEL%

%CATEGORY_TYPE%

-

%PROGRAMID_LABEL%

%PROGRAMID%

-

%MYTHTV_STATUS_LABEL%

%MYTHTV_STATUS%

-

%RECORDING_RULE_LABEL%

%RECORDING_RULE%

-

%LAST_RECORDED_LABEL%

%LAST_RECORDED%

-

%NEXT_RECORDING_LABEL%

%NEXT_RECORDING%

-

%AVERAGE_TIME_SHIFT_LABEL%

%AVERAGE_TIME_SHIFT%

-

%WATCH_LIST_SCORE_LABEL%

%WATCH_LIST_SCORE%

-

%WATCH_LIST_STATUS_LABEL%

%WATCH_LIST_STATUS%

-

%SEARCH_PHRASE_LABEL%

%SEARCH_PHRASE%

-

%FINDID_LABEL%

%FINDID%

-

%RECORDING_HOST_LABEL%

%RECORDING_HOST%

-

%RECORDED_FILE_NAME_LABEL%

%RECORDED_FILE_NAME%

-

%RECORDED_FILE_SIZE_LABEL%

%RECORDED_FILE_SIZE%

-

%RECORDING_PROFILE_LABEL%

%RECORDING_PROFILE%

-

%RECORDING_GROUP_LABEL%

%RECORDING_GROUP%

-

%STORAGE_GROUP_LABEL%

%STORAGE_GROUP%

-

%PLAYBACK_GROUP_LABEL%

%PLAYBACK_GROUP%

- - - -- cgit v0.12