From a8f634f8f7940f6ec1165c8d98c3b88afacb3fb3 Mon Sep 17 00:00:00 2001 From: Darko Date: Mon, 27 Jul 2015 12:45:13 +0200 Subject: [PATCH] Update search in charisma template to be same as in omicron, add working send to cart and send to my queue buttons to movies page. Fix wrong tags in movies.tpl. --- .../charisma/views/frontend/movies.tpl | 52 +++-- .../charisma/views/frontend/search.tpl | 216 ++++++++---------- .../omicron/views/frontend/movies.tpl | 50 ++-- 3 files changed, 173 insertions(+), 145 deletions(-) diff --git a/www/templates/charisma/views/frontend/movies.tpl b/www/templates/charisma/views/frontend/movies.tpl index eb7afdd69..cbb3849fd 100644 --- a/www/templates/charisma/views/frontend/movies.tpl +++ b/www/templates/charisma/views/frontend/movies.tpl @@ -114,11 +114,16 @@ {$result.title|escape:"htmlall"} -
{if $result.genre != ''}Genre: {$result.genre}, {/if}
+
{if $result.genre != ''} + Genre: + {$result.genre}, {/if}
{if $result.plot != ''}{$result.plot} {/if}
-
{if $result.director != ''}Director: {$result.director} {/if}
-
{if $result.actors != ''}Starring: {$result.actors} {/if}
-
+
{if $result.director != ''}Director: {$result.director} {/if} +
+
{if $result.actors != ''} + Starring: + {$result.actors} {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} {$result.year} @@ -142,10 +147,18 @@ class="fa fa-comment-o"> {$mcomments[$m@index]} Comment{if $mcomments[$m@index] != 1}s{/if} + + {if isset($sabintegrated)} + + {/if}
- {/if} - {/foreach}
+ {/if} + {/foreach} @@ -202,11 +215,16 @@ {$result.title|escape:"htmlall"} -
{if $result.genre != ''}Genre: {$result.genre}, {/if}
+
{if $result.genre != ''} + Genre: + {$result.genre}, {/if}
{if $result.plot != ''}{$result.plot} {/if}
-
{if $result.director != ''}Director: {$result.director} {/if}
-
{if $result.actors != ''}Starring: {$result.actors} {/if}
-
+
{if $result.director != ''}Director: {$result.director} {/if} +
+
{if $result.actors != ''} + Starring: + {$result.actors} {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} {$result.year} @@ -230,10 +248,18 @@ class="fa fa-comment-o"> {$mcomments[$m@index]} Comment{if $mcomments[$m@index] != 1}s{/if} + + {if isset($sabintegrated)} + + {/if}
- {/if} - {/foreach}
+ {/if} + {/foreach} @@ -277,7 +303,7 @@ name="CP{$result.imdbid}" title="Add to CouchPotato" > + src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/couch.png"> {/if} {if isset($isadmin)}
-
-
-
- + +
+
+ +
+
+ + + +
-
- - - -
-
- -
+ +
- +
- + - + - + @@ -88,6 +93,7 @@ +
@@ -105,10 +111,18 @@ Suggestions:

    -
  • Make sure all words are spelled correctly.
    • -
  • Try different keywords.
    • -
  • Try more general keywords.
    • -
  • Try fewer keywords.
    • +
    +
  • Make sure all words are spelled correctly.
    • +
    +
    +
  • Try different keywords.
    • +
    +
    +
  • Try more general keywords.
    • +
    +
    +
  • Try fewer keywords.
    • +
@@ -168,94 +182,35 @@ {$pager} +
- +
- +
- - - - - - - - - - {foreach from=$results item=result} - - + - - {/foreach}
- name
- - Sort Descending - - - Sort Ascending - - 		- category
- - Sort Descending - - - Sort Ascending - - 		- posted
- - Sort Descending - - - Sort Ascending - - 		- size
- - Sort Descending - - - Sort Ascending - - 		- files
- - Sort Descending - - - Sort Ascending - - 		stats
- - Sort Descending - - - Sort Ascending - - 		- - -
-
-   -
-
- {if $sabintegrated} -
- {/if} +
+ + {$result.searchname|escape:"htmlall"|truncate:150:"...":true}
- - {$result.name|escape:"htmlall"|truncate:150:"...":true} -
{release_flag($result.searchname, browse)} {if $result.passwordstatus == 1} - RAR/ZIP Possibly Passworded. + RAR/ZIP Possibly Passworded. {elseif $result.passwordstatus == 2} - RAR/ZIP Possibly Damaged. + RAR/ZIP Possibly Damaged. {elseif $result.passwordstatus == 10} - RAR/ZIP is Passworded. + RAR/ZIP is Passworded. {/if} {if $result.videostatus > 0} {/if} {if $result.nfoid > 0} - Nfo + Nfo {/if} {if $result.imdbid > 0} - Cover + Cover {/if} {if $result.haspreview == 1 && $userdata.canpreview == 1} - Preview{/if} + Preview{/if} {if $result.jpgstatus == 1 && $userdata.canpreview == 1} - Sample{/if} + Sample{/if} {if $result.musicinfoid > 0} - Cover + Cover {/if} {if $result.consoleinfoid > 0} - Cover + Cover {/if} {if $result.rageid > 0} - View Series + View + Series {/if} {if $result.anidbid > 0} - View Anime + View + Anime {/if} {if $result.tvairdate != ""} - Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if} + Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if} {/if} {if $result.group_name != ""} - {$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."} + {$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."} {/if}
- {$result.category_name} + {$result.category_name} {$result.postdate|timeago} @@ -315,24 +286,37 @@ {/if} - {$result.totalpart} + {$result.totalpart} {if $result.rarinnerfilecount > 0}
- {$result.guid} + {$result.guid}
{/if} 		- {$result.comments} cmt{if $result.comments != 1}s{/if} + + {$result.comments} + cmt{if $result.comments != 1}s{/if}
{$result.grabs} grab{if $result.grabs != 1}s{/if} 		- + +
+ +   +
+
+ {if $sabintegrated} +
+ {/if}

+
diff --git a/www/templates/omicron/views/frontend/movies.tpl b/www/templates/omicron/views/frontend/movies.tpl index 082902c8d..cbb3849fd 100644 --- a/www/templates/omicron/views/frontend/movies.tpl +++ b/www/templates/omicron/views/frontend/movies.tpl @@ -114,11 +114,16 @@ {$result.title|escape:"htmlall"} -
{if $result.genre != ''}Genre: {$result.genre}, {/if}
+
{if $result.genre != ''} + Genre: + {$result.genre}, {/if}
{if $result.plot != ''}{$result.plot} {/if}
-
{if $result.director != ''}Director: {$result.director} {/if}
-
{if $result.actors != ''}Starring: {$result.actors} {/if}
-
+
{if $result.director != ''}Director: {$result.director} {/if} +
+
{if $result.actors != ''} + Starring: + {$result.actors} {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} {$result.year} @@ -142,14 +147,18 @@ class="fa fa-comment-o"> {$mcomments[$m@index]} Comment{if $mcomments[$m@index] != 1}s{/if} - + {if isset($sabintegrated)} - + {/if}
- {/if} - {/foreach}
+ {/if} + {/foreach}
@@ -206,11 +215,16 @@ {$result.title|escape:"htmlall"} -
{if $result.genre != ''}Genre: {$result.genre}, {/if}
+
{if $result.genre != ''} + Genre: + {$result.genre}, {/if}
{if $result.plot != ''}{$result.plot} {/if}
-
{if $result.director != ''}Director: {$result.director} {/if}
-
{if $result.actors != ''}Starring: {$result.actors} {/if}
-
+
{if $result.director != ''}Director: {$result.director} {/if} +
+
{if $result.actors != ''} + Starring: + {$result.actors} {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} {$result.year} @@ -234,14 +248,18 @@ class="fa fa-comment-o"> {$mcomments[$m@index]} Comment{if $mcomments[$m@index] != 1}s{/if} - + {if isset($sabintegrated)} - + {/if}
- {/if} - {/foreach}
+ {/if} + {/foreach}