badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forward search= to post/view

Browse source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@382 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-07-27 01:57:57 +00:00
parent 7c9740e4d3
commit 77701054ba
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/index/theme.php
View file

@ -31,11 +31,12 @@ class IndexTheme extends Themelet {
$page->set_heading($page_title);
$page->add_block(new Block("Navigation", $nav, "left", 0));
if(count($images) > 0) {
$page->add_block(new Block("Images", $this->build_table($images, $query), "main", 10));
if($query) {
$page->add_block(new Block("Images", $this->build_table($images, "search=$query"), "main", 10));
$this->display_paginator($page, "post/list/$query", null, $this->page_number, $this->total_pages);
}
else {
$page->add_block(new Block("Images", $this->build_table($images, null), "main", 10));
$this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages);
}
}

12
themes/danbooru/index.theme.php
View file

@ -16,7 +16,7 @@ class IndexTheme extends Themelet {
}
else {
$search_string = implode(' ', $this->search_terms);
$query = "/".url_escape($search_string);
$query = url_escape($search_string);
$page_title = html_escape($search_string);
}
@ -25,8 +25,14 @@ class IndexTheme extends Themelet {
$page->set_heading($page_title);
$page->add_block(new Block("Search", $nav, "left", 0));
if(count($images) > 0) {
$page->add_block(new Block("Images", $this->build_table($images, $query), "main", 10));
$this->display_paginator($page, "post/list$query", null, $this->page_number, $this->total_pages);
if($query) {
$page->add_block(new Block("Images", $this->build_table($images, "search=$query"), "main", 10));
$this->display_paginator($page, "post/list/$query", null, $this->page_number, $this->total_pages);
}
else {
$page->add_block(new Block("Images", $this->build_table($images, null), "main", 10));
$this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages);
}
}
else {
$page->add_block(new Block("No Images Found", "No images were found to match the search criteria"));