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

Merge pull request #684 from DanielOaks/develop+danbooru2-fixes

Browse source 
Minor danbooru2 theme fixes
This commit is contained in:
Shish 2019-09-29 15:47:09 +01:00 committed by GitHub
commit 1314c3990a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
themes/danbooru2/index.theme.php
View file

@ -7,31 +7,15 @@ class CustomIndexTheme extends IndexTheme
*/ */
public function display_page(Page $page, array $images) public function display_page(Page $page, array $images)
{ {
global $config; $this->display_page_header($page, $images);
if (count($this->search_terms) == 0) {
$query = null;
$page_title = $config->get_string(SetupConfig::TITLE);
} else {
$search_string = implode(' ', $this->search_terms);
$query = url_escape($search_string);
$page_title = html_escape($search_string);
}
$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("Search", $nav, "left", 0)); $page->add_block(new Block("Search", $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));
$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 { } else {
$page->add_block(new Block("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");
} }
} }

2
themes/danbooru2/layout.class.php
View file

@ -1,7 +1,7 @@
<?php <?php
/** /**
* Name: Danbooru 2 Theme * Name: Danbooru 2 Theme
* Author: Bzchan <bzchan@animemahou.com>, updated by Daniel Oaks <danneh@danneh.net> * Author: Bzchan <bzchan@animemahou.com>, updated by Daniel Oaks <daniel@danieloaks.net>
* Link: https://code.shishnet.org/shimmie2/ * Link: https://code.shishnet.org/shimmie2/
* License: GPLv2 * License: GPLv2
* Description: This is a simple theme changing the css to make shimme * Description: This is a simple theme changing the css to make shimme

11
themes/danbooru2/style.css
View file

@ -16,22 +16,21 @@ margin:0;
padding:0 1rem 0 2rem; padding:0 1rem 0 2rem;
} }
HEADER ul#navbar li { HEADER ul#navbar li {
margin:0;
}
HEADER ul#navbar li a {
display:inline-block; display:inline-block;
margin:0 0.15rem; margin:0 0.15rem;
padding:0.4rem 0.6rem; padding:0.4rem 0.6rem;
} }
HEADER ul#navbar li:first-child {
margin-left: -0.6rem;
}
HEADER ul#navbar li:first-child a { HEADER ul#navbar li:first-child a {
margin-left: -0.6rem;
color: #FF3333; color: #FF3333;
font-weight: bold; font-weight: bold;
} }
HEADER ul#navbar li.current-page { HEADER ul#navbar li a.current-page {
background-color:#EEEEFF; background-color:#EEEEFF;
border-radius:0.2rem 0.2rem 0 0; border-radius:0.2rem 0.2rem 0 0;
}
HEADER ul#navbar li.current-page a {
font-weight:bold; font-weight:bold;
} }
HEADER ul#subnavbar { HEADER ul#subnavbar {