From 3b73013d1dccf84e67a3d4aa5f42611f71887be2 Mon Sep 17 00:00:00 2001 From: Daku Date: Mon, 26 Dec 2011 04:57:59 +0000 Subject: [PATCH 1/8] This should fix the "Undefined variable" error. --- themes/lite/view.theme.php | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php index 0bb17d06..513e9fea 100644 --- a/themes/lite/view.theme.php +++ b/themes/lite/view.theme.php @@ -3,6 +3,7 @@ class CustomViewImageTheme extends ViewImageTheme { public function display_page($image, $editor_parts) { global $page; + $metatags = str_replace(" ", ", ", html_escape($image->get_tag_list())); $page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list())); $page->set_heading(html_escape($image->get_tag_list())); $page->add_html_header(""); From c2ad8322efde3e1284e3810c06bf1cd5a75fed34 Mon Sep 17 00:00:00 2001 From: Daku Date: Mon, 26 Dec 2011 21:29:04 +0000 Subject: [PATCH 2/8] fixed downloading flash with bookmarklet + added comments --- ext/upload/theme.php | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/ext/upload/theme.php b/ext/upload/theme.php index 50895783..bc0991cc 100644 --- a/ext/upload/theme.php +++ b/ext/upload/theme.php @@ -27,7 +27,7 @@ class UploadTheme extends Themelet { if($i==0){ $upload_list .= "
" . - "". + "". "
"; }else{ $upload_list .="
@@ -113,15 +113,31 @@ class UploadTheme extends Themelet { { /* Danbooru > Shimmie Bookmarklet. This "should" work on any site running danbooru, unless for some odd reason they switched around the id's or aren't using post/list. + Most likely this will stop working when Danbooru updates to v2, all depends if they switch the ids or not >_>. + Clicking the link on a danbooru image page should give you something along the lines of: + 'http://www.website.com/shimmie/upload?url="http://sonohara.donmai.us/data/crazylongurl.jpg&tags="too many tags"&rating="s"&source="http://danbooru.donmai.us/post/show/012345/"' + TODO: Possibly make the entire/most of the script into a .js file, and just make the bookmarklet load it on click (Something like that?) */ $title = "Danbooru to " . $config->get_string('title'); - $html .= '

' . - $title . ' (As above, Click on a Danbooru-run image page. (This also grabs the tags, rating & source!))'; + $html .= '

' . + $title . ' (As above, Click on a Danbooru-run image page. (This also grabs the tags/rating/source!))'; } From d9e1b935b0dcad06df0b933c213886f6ba0c9ef7 Mon Sep 17 00:00:00 2001 From: Daku Date: Tue, 27 Dec 2011 12:10:01 +0000 Subject: [PATCH 3/8] +/- buttons should now work in FF, instead of directing you to blank page --- ext/upload/theme.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/upload/theme.php b/ext/upload/theme.php index bc0991cc..fae6501f 100644 --- a/ext/upload/theme.php +++ b/ext/upload/theme.php @@ -27,11 +27,11 @@ class UploadTheme extends Themelet { if($i==0){ $upload_list .= "

" . - "". + "". "
"; }else{ $upload_list .="
- "; }else{ $upload_list .= - "". ""; From 12d4fcf813a6bee3c1b23ae0c790b498d65da693 Mon Sep 17 00:00:00 2001 From: Daku Date: Wed, 28 Dec 2011 03:11:36 +0000 Subject: [PATCH 4/8] related block should now change title depending on what tag list is set to --- ext/tag_list/theme.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php index f0fac49b..54e35f28 100644 --- a/ext/tag_list/theme.php +++ b/ext/tag_list/theme.php @@ -52,8 +52,12 @@ class TagListTheme extends Themelet { $html .= " $count"; } } - - $page->add_block(new Block("Related", $html, "left")); + + if($config->get_string('tag_list_image_type')=="tags"){ + $page->add_block(new Block("Tags", $html, "left"));} + else{ + $page->add_block(new Block("Related Tags", $html, "left")); + } } From b9bd4db41e407da84dd25ec7343f4be6109a2451 Mon Sep 17 00:00:00 2001 From: Daku Date: Wed, 28 Dec 2011 03:13:14 +0000 Subject: [PATCH 5/8] Tag list should now show under the search block, instead of under every other block --- ext/tag_list/theme.php | 4 ++-- themes/danbooru/view.theme.php | 2 +- themes/lite/view.theme.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php index 54e35f28..99d83664 100644 --- a/ext/tag_list/theme.php +++ b/ext/tag_list/theme.php @@ -54,9 +54,9 @@ class TagListTheme extends Themelet { } if($config->get_string('tag_list_image_type')=="tags"){ - $page->add_block(new Block("Tags", $html, "left"));} + $page->add_block(new Block("Tags", $html, "left", 10));} else{ - $page->add_block(new Block("Related Tags", $html, "left")); + $page->add_block(new Block("Related Tags", $html, "left", 10)); } } diff --git a/themes/danbooru/view.theme.php b/themes/danbooru/view.theme.php index e9538640..49663fa4 100644 --- a/themes/danbooru/view.theme.php +++ b/themes/danbooru/view.theme.php @@ -6,7 +6,7 @@ class CustomViewImageTheme extends ViewImageTheme { $page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list())); $page->set_heading(html_escape($image->get_tag_list())); $page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0)); - $page->add_block(new Block("Statistics", $this->build_stats($image), "left", 10)); + $page->add_block(new Block("Statistics", $this->build_stats($image), "left", 15)); $page->add_block(new Block(null, $this->build_image_editor($image, $editor_parts), "main", 10)); $page->add_block(new Block(null, $this->build_pin($image), "main", 11)); } diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php index 513e9fea..5eb9d195 100644 --- a/themes/lite/view.theme.php +++ b/themes/lite/view.theme.php @@ -12,7 +12,7 @@ class CustomViewImageTheme extends ViewImageTheme { $page->add_html_header("get_thumb_link())."\">"); $page->add_html_header("id}"))."\">"); $page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0)); - $page->add_block(new Block("Statistics", $this->build_stats($image), "left", 10)); + $page->add_block(new Block("Statistics", $this->build_stats($image), "left", 15)); $page->add_block(new Block(null, $this->build_image_editor($image, $editor_parts), "main", 10)); $page->add_block(new Block(null, $this->build_pin($image), "main", 11)); } From dc4d156e1a0184ec2e8fc7ab7905e37b744746cc Mon Sep 17 00:00:00 2001 From: Daku Date: Wed, 28 Dec 2011 14:47:02 +0000 Subject: [PATCH 6/8] contact link should now properly link to email --- contrib/home/theme.php | 2 +- themes/danbooru/layout.class.php | 2 +- themes/default/layout.class.php | 2 +- themes/flat/layout.class.php | 2 +- themes/futaba/layout.class.php | 2 +- themes/lite/layout.class.php | 2 +- themes/old_default/layout.class.php | 2 +- themes/warm/layout.class.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/home/theme.php b/contrib/home/theme.php index 1fe601ff..21364625 100644 --- a/contrib/home/theme.php +++ b/contrib/home/theme.php @@ -47,7 +47,7 @@ EOD $counter_html diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php index 5045adcc..cfdcc91f 100644 --- a/themes/danbooru/layout.class.php +++ b/themes/danbooru/layout.class.php @@ -88,7 +88,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; if(empty($this->subheading)) { $subheading = ""; diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php index 3ee91b82..0c733c1b 100644 --- a/themes/default/layout.class.php +++ b/themes/default/layout.class.php @@ -42,7 +42,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; $wrapper = ""; if(strlen($page->heading) > 100) { diff --git a/themes/flat/layout.class.php b/themes/flat/layout.class.php index f0e9a95b..c4fe7a05 100644 --- a/themes/flat/layout.class.php +++ b/themes/flat/layout.class.php @@ -42,7 +42,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; $subheading = empty($page->subheading) ? "" : "
{$page->subheading}
"; $wrapper = ""; diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php index 51f76716..21dacbc5 100644 --- a/themes/futaba/layout.class.php +++ b/themes/futaba/layout.class.php @@ -37,7 +37,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; if(empty($page->subheading)) { $subheading = ""; diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php index c7273ab3..5053515f 100644 --- a/themes/lite/layout.class.php +++ b/themes/lite/layout.class.php @@ -138,7 +138,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; $subheading = empty($page->subheading) ? "" : "
{$page->subheading}
"; $wrapper = ""; diff --git a/themes/old_default/layout.class.php b/themes/old_default/layout.class.php index cb4e6952..5dff2b59 100644 --- a/themes/old_default/layout.class.php +++ b/themes/old_default/layout.class.php @@ -37,7 +37,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; $subheading = empty($page->subheading) ? "" : "
{$page->subheading}
"; $wrapper = ""; diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php index c843eb3a..680bdcc4 100644 --- a/themes/warm/layout.class.php +++ b/themes/warm/layout.class.php @@ -47,7 +47,7 @@ class Layout { $debug = get_debug_info(); - $contact = empty($contact_link) ? "" : "
Contact"; + $contact = empty($contact_link) ? "" : "
Contact"; $subheading = empty($page->subheading) ? "" : "
{$page->subheading}
"; $wrapper = ""; From dff1eef51a0efd17ff7b698470aa506d1d24a737 Mon Sep 17 00:00:00 2001 From: Daku Date: Thu, 29 Dec 2011 22:55:44 +0000 Subject: [PATCH 7/8] make_form now has a onsubmit option --- core/util.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/util.inc.php b/core/util.inc.php index 71a317f3..6c727710 100644 --- a/core/util.inc.php +++ b/core/util.inc.php @@ -254,13 +254,16 @@ function make_http($link) { * * @retval string */ -function make_form($target, $method="POST", $multipart=False, $form_id="") { +function make_form($target, $method="POST", $multipart=False, $form_id="", $onsubmit="") { global $user; $auth = $user->get_auth_html(); $extra = empty($form_id) ? '' : " id='$form_id'"; if($multipart) { $extra .= " enctype='multipart/form-data'"; } + if($onsubmit) { + $extra .= " onsubmit='$onsubmit'"; + } return "
$auth"; } From 0d93f29bce8907e7412f304a694cf84b0ba80ed2 Mon Sep 17 00:00:00 2001 From: Daku Date: Thu, 29 Dec 2011 23:05:09 +0000 Subject: [PATCH 8/8] Delete by Query now requires you to enable the form, aswell as confirm the deletion. --- contrib/admin/theme.php | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/contrib/admin/theme.php b/contrib/admin/theme.php index edd9877d..038b9be7 100644 --- a/contrib/admin/theme.php +++ b/contrib/admin/theme.php @@ -32,12 +32,36 @@ class AdminPageTheme extends Themelet { "; $page->add_block(new Block("Misc Admin Tools", $html)); - + + /* First check + Requires you to click the checkbox to enable the delete by query form */ + $dbqcheck = " + if(document.getElementById("dbqcheck").checked == false){ + document.getElementById("dbqtags").disabled = true; + document.getElementById("dbqsubmit").disabled = true; + }else{ + document.getElementById("dbqtags").disabled = false; + document.getElementById("dbqsubmit").disabled = false; + }"; + + /* Second check + Requires you to confirm the deletion by clicking ok. */ $html = " - ".make_form(make_link("admin_utils"))." + " + + .make_form(make_link("admin_utils"),"post",false,false,"return checkform()")." + - - + + "; $page->add_block(new Block("Delete by Query", $html));