diff --git a/Changelog b/Changelog index f350bb70f..37b2990ae 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2016-02-17 DariusIII + Chg: Rename category for smarty to catCLass to prevent conflicts Upd: Update getCategoryExclusion and getCategoryExclusionNames functions. Fix: Fix Gamma theme headermenu when coverview is disabled Chg: Change position of browse groups from headermenu to left side menu diff --git a/www/pages/Page.php b/www/pages/Page.php index f070aae1c..44f0b1aae 100644 --- a/www/pages/Page.php +++ b/www/pages/Page.php @@ -51,7 +51,7 @@ class Page extends BasePage $parentcatlist = $category->getForMenu(); $this->smarty->assign('parentcatlist',$parentcatlist); - $this->smarty->assign('category', $category); + $this->smarty->assign('catClass', $category); $searchStr = ''; if ($this->page == 'search' && isset($_REQUEST["id"])) $searchStr = (string) $_REQUEST["id"]; diff --git a/www/themes/Charisma/templates/headermenu.tpl b/www/themes/Charisma/templates/headermenu.tpl index 964f6f5ec..2356bb38e 100755 --- a/www/themes/Charisma/templates/headermenu.tpl +++ b/www/themes/Charisma/templates/headermenu.tpl @@ -2,7 +2,7 @@
{if $loggedin == "true"} {foreach $parentcatlist as $parentcat} - {if $parentcat.id == {$category::TV_ROOT}} + {if $parentcat.id == {$catClass::TV_ROOT}}
  • @@ -20,7 +20,7 @@
    • {/if} - {if $parentcat.id == {$category::MOVIE_ROOT}} + {if $parentcat.id == {$catClass::MOVIE_ROOT}}
  • @@ -30,7 +30,7 @@ {if $userdata.movieview == "1"}
  • {$parentcat.title}
    • {elseif $userdata.movieview != "1"} -
  • {$parentcat.title}
    • +
  • {$parentcat.title}
    • {/if}
  • In Theatre
    • @@ -48,7 +48,7 @@ {/if} - {if $parentcat.id == {$category::GAME_ROOT}} + {if $parentcat.id == {$catClass::GAME_ROOT}}
  • @@ -58,7 +58,7 @@ {if $userdata.consoleview == "1"}
  • {$parentcat.title}
    • {elseif $userdata.consoleview != "1"} -
  • {$parentcat.title}
    • +
  • {$parentcat.title}
    • {/if}
    {if $userdata.consoleview == "1"} @@ -74,7 +74,7 @@ {/if} - {if $parentcat.id == {$category::PC_ROOT}} + {if $parentcat.id == {$catClass::PC_ROOT}}
  • @@ -84,12 +84,12 @@ {if $userdata.gameview == "1"}
  • {$parentcat.title}
    • {elseif $userdata.gameview != "1"} -
  • {$parentcat.title}
    • +
  • {$parentcat.title}
    • {/if}
    {if $userdata.gameview == "1"} {foreach $parentcat.subcatlist as $subcat} - {if $subcat.id == {$category::PC_GAMES}} + {if $subcat.id == {$catClass::PC_GAMES}}
  • {$subcat.title}
    • {else} @@ -105,7 +105,7 @@ {/if} - {if $parentcat.id == {$category::MUSIC_ROOT}} + {if $parentcat.id == {$catClass::MUSIC_ROOT}}
  • @@ -115,7 +115,7 @@ {if $userdata.musicview == "1"}
  • {$parentcat.title}
    • {elseif $userdata.musicview != "1"} -
  • {$parentcat.title}
    • +
  • {$parentcat.title}
    • {/if}
    {if $userdata.musicview == "1"} @@ -130,7 +130,7 @@ {/if} - {if $parentcat.id == {$category::BOOKS_ROOT}} + {if $parentcat.id == {$catClass::BOOKS_ROOT}}
  • @@ -140,7 +140,7 @@ {if $userdata.bookview == "1"}
  • {$parentcat.title}
    • {elseif $userdata.bookview != "1"} -
  • {$parentcat.title}
    • +
  • {$parentcat.title}
    • {/if}
    {foreach $parentcat.subcatlist as $subcat} @@ -149,7 +149,7 @@ {/if} - {if $parentcat.id == {$category::XXX_ROOT}} + {if $parentcat.id == {$catClass::XXX_ROOT}}
  • @@ -159,12 +159,12 @@ {if $userdata.xxxview == "1"}
  • {$parentcat.title}
    • {elseif $userdata.xxxview != "1"} -
  • {$parentcat.title}
    • +
  • {$parentcat.title}
    • {/if}
    {if $userdata.xxxview == "1"} {foreach $parentcat.subcatlist as $subcat} - {if $subcat.id == {$category::XXX_DVD} OR $subcat.id == {$category::XXX_WMV} OR $subcat.id == {$category::XXX_XVID} OR $subcat.id == {$category::XXX_X264}} + {if $subcat.id == {$catClass::XXX_DVD} OR $subcat.id == {$catClass::XXX_WMV} OR $subcat.id == {$catClass::XXX_XVID} OR $subcat.id == {$catClass::XXX_X264}}
  • {$subcat.title}
    • {else} @@ -186,9 +186,9 @@ Other diff --git a/www/themes/Charisma/templates/predb.tpl b/www/themes/Charisma/templates/predb.tpl index bc4b96a61..3d1b92551 100755 --- a/www/themes/Charisma/templates/predb.tpl +++ b/www/themes/Charisma/templates/predb.tpl @@ -57,37 +57,37 @@ {* Xbox 360 *} {if $result.category == 'XBOX360'} Console + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::GAME_XBOX360}">Console Xbox 360 {/if} {* Movies *} {if in_array($result.category, array('Movies'))} Movies + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MOVIE_ROOT}">Movies {/if} {* SD *} {if in_array($result.category, array('movies-sd', 'Movies: STD', 'XVid'))} Movies + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MOVIE_SD}">Movies SD {/if} {* HD *} {if in_array($result.category, array('Movies: HD', 'X264'))} Movies + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MOVIE_HD}">Movies HD {/if} {* BluRay *} {if in_array($result.category, array('BLURAY'))} Movies + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MOVIE_BLURAY}">Movies BluRay {/if} {* DVD *} {if in_array($result.category, array('DVDR', 'Movies: DVD'))} DVD + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MOVIE_DVD}">DVD {/if} {* Audio *} {if in_array($result.category, array('music-audio'))} @@ -97,109 +97,109 @@ {* MP3 *} {if in_array($result.category, array('MP3', 'Music: MP3'))} MP3 + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MUSIC_MP3}">MP3 {/if} {* Video *} {if in_array($result.category, array('MVid', 'Music: MVid'))} Music + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MUSIC_VIDEO}">Music Videos {/if} {* Audiobook *} {if in_array($result.category, array('audiobook', 'Audiobook'))} Audiobook + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MUSIC_AUDIOBOOK}">Audiobook {/if} {* Lossless *} {if in_array($result.category, array('FLAC', 'Music: FLAC'))} Lossless + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::MUSIC_LOSSLESS}">Lossless Music {/if} {* PC *} {* 0day *} {if in_array($result.category, array('0DAY', 'APPS', 'Apps: PC', 'Apps: Linux', 'DOX'))} PC + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::PC_0DAY}">PC 0DAY {/if} {* Mac *} {if in_array($result.category, array('Apps: MAC', 'Games: MAC'))} PC + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::PC_MAC}">PC Mac {/if} {* Phone-Other *} {if in_array($result.category, array('Apps: Phone', 'PDA'))} Phone + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::PC_PHONE_OTHER}">Phone Other {/if} {* Games *} {if in_array($result.category, array('GAMES', 'Games: PC', 'Games: Other'))} PC + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::PC_GAME}">PC Games {/if} {* TV *} {if in_array($result.category, array('TV'))} TV + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::TV_ROOT}">TV {/if} {* SD *} {if in_array($result.category, array('TV-DVDRIP', 'tv-sd', 'TV: STD', 'TV-XVid'))} SDTV + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::TV_SD}">SDTV {/if} {* HD *} {if in_array($result.category, array('tv-hd', 'TV: HD', 'TV-x264', 'TV-X264'))} HDTV + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::TV_HD}">HDTV {/if} {* XXX *} {if in_array($result.category, array('XXX'))} XXX + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::XXX_ROOT}">XXX {/if} {* DVD *} {if in_array($result.category, array('XXX: DVD'))} XXX + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::XXX_DVD}">XXX DVD {/if} {* XviD *} {if in_array($result.category, array('XXX: SD-CLIPS', 'XXX: MOVIES-SD'))} XXX + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::XXX_XVID}">XXX SD {/if} {* x264 *} {if in_array($result.category, array('XXX: HD-CLIPS', 'XXX: MOVIES-HD'))} XXX + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::XXX_X264}">XXX HD {/if} {* Other *} {if in_array($result.category, array('xxx-videos'))} XXX + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::XXX_OTHER}">XXX Other {/if} {* Imageset *} {if in_array($result.category, array('XXX-IMGSET'))} XXX + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::XXX_IMAGESET}">XXX Imagesets {/if} {* Books *} {if in_array($result.category, array('EBOOK'))} Ebooks + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::BOOKS_ROOT}">Ebooks {/if} {* Other *} {if in_array($result.category, array('Other: E-Books'))} Ebooks + href="{$smarty.const.WWW_TOP}/browse?t={$catClass::BOOKS_UNKNOWN}">Ebooks Other {/if} {if in_array($result.category, array('', 'PRE'))} diff --git a/www/themes/Charisma/templates/rss.tpl b/www/themes/Charisma/templates/rss.tpl index c0b95c5e4..75db4c35b 100755 --- a/www/themes/Charisma/templates/rss.tpl +++ b/www/themes/Charisma/templates/rss.tpl @@ -64,7 +64,7 @@ {$release.searchname} .nfo {/if} - {if isset($release.parentCategoryid) && $release.parentCategoryid == {$category::MOVIE_ROOT}} + {if isset($release.parentCategoryid) && $release.parentCategoryid == {$catClass::MOVIE_ROOT}} {if $release.imdbid != ""}
  • Imdb Info: