Merge pull request #448 from shish/theme_breakdown
Make IndexTheme a little easier to customise
This commit is contained in:
commit
9719464c8b
@ -28,37 +28,13 @@ and of course start organising your images :-)
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function display_page(Page $page, $images) {
|
public function display_page(Page $page, $images) {
|
||||||
global $config;
|
$this->display_page_header($page, $images);
|
||||||
|
|
||||||
if(count($this->search_terms) == 0) {
|
|
||||||
$query = null;
|
|
||||||
$page_title = $config->get_string('title');
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$search_string = implode(' ', $this->search_terms);
|
|
||||||
$query = url_escape($search_string);
|
|
||||||
$page_title = html_escape($search_string);
|
|
||||||
if(count($images) > 0) {
|
|
||||||
$page->set_subheading("Page {$this->page_number} / {$this->total_pages}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if($this->page_number > 1 || count($this->search_terms) > 0) {
|
|
||||||
// $page_title .= " / $page_number";
|
|
||||||
}
|
|
||||||
|
|
||||||
$nav = $this->build_navigation($this->page_number, $this->total_pages, $this->search_terms);
|
$nav = $this->build_navigation($this->page_number, $this->total_pages, $this->search_terms);
|
||||||
$page->set_title($page_title);
|
|
||||||
$page->set_heading($page_title);
|
|
||||||
$page->add_block(new Block("Navigation", $nav, "left", 0));
|
$page->add_block(new Block("Navigation", $nav, "left", 0));
|
||||||
|
|
||||||
if(count($images) > 0) {
|
if(count($images) > 0) {
|
||||||
if($query) {
|
$this->display_page_images($page, $images);
|
||||||
$page->add_block(new Block("Images", $this->build_table($images, "#search=$query"), "main", 10, "image-list"));
|
|
||||||
$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, "image-list"));
|
|
||||||
$this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->display_error(404, "No Images Found", "No images were found to match the search criteria");
|
$this->display_error(404, "No Images Found", "No images were found to match the search criteria");
|
||||||
@ -105,5 +81,36 @@ and of course start organising your images :-)
|
|||||||
$table .= "</div>";
|
$table .= "</div>";
|
||||||
return $table;
|
return $table;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function display_page_header(Page $page, $images) {
|
||||||
|
global $config;
|
||||||
|
|
||||||
|
if (count($this->search_terms) == 0) {
|
||||||
|
$page_title = $config->get_string('title');
|
||||||
|
} else {
|
||||||
|
$search_string = implode(' ', $this->search_terms);
|
||||||
|
$page_title = html_escape($search_string);
|
||||||
|
if (count($images) > 0) {
|
||||||
|
$page->set_subheading("Page {$this->page_number} / {$this->total_pages}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($this->page_number > 1 || count($this->search_terms) > 0) {
|
||||||
|
// $page_title .= " / $page_number";
|
||||||
|
}
|
||||||
|
|
||||||
|
$page->set_title($page_title);
|
||||||
|
$page->set_heading($page_title);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function display_page_images(Page $page, $images) {
|
||||||
|
if (count($this->search_terms) > 0) {
|
||||||
|
$query = url_escape(implode(' ', $this->search_terms));
|
||||||
|
$page->add_block(new Block("Images", $this->build_table($images, "#search=$query"), "main", 10, "image-list"));
|
||||||
|
$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, "image-list"));
|
||||||
|
$this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user