james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'branch_2.3' of ssh://marigold.shishnet.org/git/shimmie2 into branch_2.3

Browse Source
This commit is contained in:
Shish 2009-08-02 09:47:34 +01:00
commit c6636265cb
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/rating/main.php
View File

@ -125,6 +125,11 @@ class Ratings implements Extension {
$set = join(', ', $arr); $set = join(', ', $arr);
$event->add_querylet(new Querylet("rating IN ($set)")); $event->add_querylet(new Querylet("rating IN ($set)"));
} }
if(preg_match("/^rating=(safe|questionable|explicit|unknown)$/", strtolower($event->term), $matches)) {
$text = $matches[1];
$char = $text[0];
$event->add_querylet(new Querylet("rating = ?", array($char)));
}
} }
} }

8
ext/view/theme.php
View File

@ -48,9 +48,13 @@ class ViewImageTheme extends Themelet {
protected function build_navigation(Image $image) { protected function build_navigation(Image $image) {
$h_pin = $this->build_pin($image); $h_pin = $this->build_pin($image);
$h_search = " $h_search = "
<script><!--
$(document).ready(function() {
$(\"#search_input\").DefaultValue(\"Search\");
});
//--></script>
<p><form action='".make_link()."' method='GET'> <p><form action='".make_link()."' method='GET'>
<input id='search_input' name='search' type='text' <input id='search_input' name='search' type='text'>
value='Search' autocomplete='off'>
<input type='submit' value='Find' style='display: none;'> <input type='submit' value='Find' style='display: none;'>
</form> </form>
<div id='search_completions'></div>"; <div id='search_completions'></div>";