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

Merge branch 'master' of github.com:shish/shimmie2

Browse Source
This commit is contained in:
Shish 2012-03-06 19:29:44 +00:00
commit 21ddbb90d9
2 changed files with 137 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
ext/upload/theme.php
View File

@ -12,18 +12,80 @@ class UploadTheme extends Themelet {
public function display_page(Page $page) { public function display_page(Page $page) {
global $config, $page; global $config, $page;
$tl_enabled = ($config->get_string("transload_engine", "none") != "none");
$max_size = $config->get_int('upload_size');
$max_kb = to_shorthand_int($max_size);
$upload_list = $this->h_upload_list_1();
$html = "
".make_form(make_link("upload"), "POST", $multipart=True, 'file_upload')."
<table id='large_upload_form' class='vert'>
$upload_list
<tr><td width='20'>Tags<td colspan='3'><input name='tags' type='text' placeholder='tagme' class='autocomplete_tags'></td></tr>
<tr><td>Source</td><td colspan='3'><input name='source' type='text'></td></tr>
<tr><td colspan='4'><input id='uploadbutton' type='submit' value='Post'></td></tr>
</table>
</form>
<small>(Max file size is $max_kb)</small>
";
$page->set_title("Upload");
$page->set_heading("Upload");
$page->add_block(new NavBlock());
$page->add_block(new Block("Upload", $html, "main", 20));
if($tl_enabled) {
$page->add_block(new Block("Bookmarklets", $this->h_bookmarklets(), "left", 20));
}
}
protected function h_upload_list_1() {
global $config;
$upload_list = "";
$upload_count = $config->get_int('upload_count');
$tl_enabled = ($config->get_string("transload_engine", "none") != "none");
if($tl_enabled) {
$upload_list .= "
<tr>
<td colspan='2'>Files</td>
<td colspan='2'>URLs</td>
</tr>
";
for($i=0; $i<$upload_count; $i++) {
$upload_list .= "
<tr>
<td colspan='2'><input type='file' name='data$i'></td>
<td colspan='2'><input type='text' name='url$i'</td>
</tr>
";
}
}
else {
for($i=0; $i<$upload_count; $i++) {
$upload_list .= "
<tr>
<td colspan='4'><input type='file' name='data$i'></td>
</tr>
";
}
}
return $upload_list;
}
protected function h_upload_List_2() {
global $config;
$tl_enabled = ($config->get_string("transload_engine", "none") != "none"); $tl_enabled = ($config->get_string("transload_engine", "none") != "none");
// Uploader 2.0! // Uploader 2.0!
$upload_list = ""; $upload_list = "";
$upload_count = $config->get_int('upload_count'); $upload_count = $config->get_int('upload_count');
for($i=0; $i<$upload_count; $i++) {
$a = $i+1;
$s = $i-1;
for($i=0; $i<$upload_count; $i++) if($i != 0) {
{
$a=$i+1;
$s=$i-1;
if(!$i==0){
$upload_list .="<tr id='row$i' style='display:none'>"; $upload_list .="<tr id='row$i' style='display:none'>";
}else{ }else{
$upload_list .= "<tr id='row$i'>"; $upload_list .= "<tr id='row$i'>";
@ -31,15 +93,18 @@ class UploadTheme extends Themelet {
$upload_list .= "<td width='15'>"; $upload_list .= "<td width='15'>";
if($i==0){ if($i == 0) {
$js = 'javascript:$(function() { $js = 'javascript:$(function() {
$("#row'.$a.'").show(); $("#row'.$a.'").show();
$("#hide'.$i.'").hide(); $("#hide'.$i.'").hide();
$("#hide'.$a.'").show();});'; $("#hide'.$a.'").show();});';
$upload_list .= "<div id='hide$i'><img id='wrapper' src='ext/upload/minus.png' />" . $upload_list .= "
"<a href='#' onclick='$js'>". <div id='hide$i'>
"<img src='ext/upload/plus.png'></a></div></td>"; <img id='wrapper' src='ext/upload/minus.png' />
<a href='#' onclick='$js'><img src='ext/upload/plus.png'></a>
</div>
";
} else { } else {
$js = 'javascript:$(function() { $js = 'javascript:$(function() {
$("#row'.$i.'").hide(); $("#row'.$i.'").hide();
@ -49,13 +114,15 @@ class UploadTheme extends Themelet {
$("#url'.$i.'").val(""); $("#url'.$i.'").val("");
});'; });';
$upload_list .="<div id='hide$i'> $upload_list .="
<a href='#' onclick='$js'>". <div id='hide$i'>
"<img src='ext/upload/minus.png' /></a>"; <a href='#' onclick='$js'><img src='ext/upload/minus.png' /></a>
";
if($a == $upload_count){ if($a == $upload_count){
$upload_list .="<img id='wrapper' src='ext/upload/plus.png' />"; $upload_list .="<img id='wrapper' src='ext/upload/plus.png' />";
}else{ }
else{
$js1 = 'javascript:$(function() { $js1 = 'javascript:$(function() {
$("#row'.$a.'").show(); $("#row'.$a.'").show();
$("#hide'.$i.'").hide(); $("#hide'.$i.'").hide();
@ -65,16 +132,17 @@ class UploadTheme extends Themelet {
"<a href='#' onclick='$js1'>". "<a href='#' onclick='$js1'>".
"<img src='ext/upload/plus.png' /></a>"; "<img src='ext/upload/plus.png' /></a>";
} }
$upload_list .= "</div></td>"; $upload_list .= "</div>";
} }
$upload_list .= "</td>";
$js2 = 'javascript:$(function() { $js2 = 'javascript:$(function() {
$("#url'.$i.'").hide(); $("#url'.$i.'").hide();
$("#url'.$i.'").val(""); $("#url'.$i.'").val("");
$("#data'.$i.'").show(); });'; $("#data'.$i.'").show(); });';
$upload_list .= $upload_list .= "
"<form><td width='60'><input id='radio_button_a$i' type='radio' name='method' value='file' checked='checked' onclick='$js2' /> File<br>"; <form><td width='60'><input id='radio_button_a$i' type='radio' name='method' value='file' checked='checked' onclick='$js2' /> File<br>";
if($tl_enabled) { if($tl_enabled) {
$js = 'javascript:$(function() { $js = 'javascript:$(function() {
@ -99,58 +167,59 @@ class UploadTheme extends Themelet {
"; ";
} }
$max_size = $config->get_int('upload_size'); return $upload_list;
$max_kb = to_shorthand_int($max_size); }
$html = "
".make_form(make_link("upload"), "POST", $multipart=True, 'file_upload')."
<table id='large_upload_form' class='vert'>
$upload_list
<tr><td></td><td>Tags<td colspan='3'><input name='tags' type='text' placeholder='tagme' class='autocomplete_tags'></td></tr>
<tr><td></td><td>Source</td><td colspan='3'><input name='source' type='text'></td></tr>
<tr><td colspan='4'><input id='uploadbutton' type='submit' value='Post'></td></tr>
</table>
</form>
<small>(Max file size is $max_kb)</small>
";
if($tl_enabled) { protected function h_bookmarklets() {
global $config;
$link = make_http(make_link("upload")); $link = make_http(make_link("upload"));
$main_page = make_http(make_link()); $main_page = make_http(make_link());
$title = $config->get_string('title'); $title = $config->get_string('title');
$max_size = $config->get_int('upload_size');
$max_kb = to_shorthand_int($max_size);
$delimiter = $config->get_bool('nice_urls') ? '?' : '&amp;';
$html = '';
if($config->get_bool('nice_urls')){ $js='javascript:(
$delimiter = '?'; function() {
} else { if(typeof window=="undefined" || !window.location || window.location.href=="about:blank") {
$delimiter = '&amp;'; window.location = "'. $main_page .'";
} }
{ else if(typeof document=="undefined" || !document.body) {
$js='javascript:(function(){if(typeof window=="undefined"||!window.location||window.location.href=="about:blank"){window.location="'. $main_page .'";}else if(typeof document=="undefined"||!document.body){window.location="'. $main_page .'?url="+encodeURIComponent(window.location.href);} else if(window.location.href.match("\/\/'. $_SERVER["HTTP_HOST"] .'.*")){alert("You are already at '. $title .'!");} else{var tags=prompt("Please enter tags","tagme");if(tags!=""&&tags!=null){var link="'. $link . $delimiter .'url="+location.href+"&tags="+tags;var w=window.open(link,"_blank");}}})();'; window.location = "'. $main_page .'?url="+encodeURIComponent(window.location.href);
$html .= '<p><a href=\''.$js.'\'>Upload to '.$title.'</a> (Drag &amp; drop onto your bookmarks toolbar, then click when looking at an image)';
} }
{ else if(window.location.href.match("\/\/'. $_SERVER["HTTP_HOST"] .'.*")) {
/* Imageboard > Shimmie Bookmarklet alert("You are already at '. $title .'!");
This is more or less, an upgraded version of the "Danbooru>Shimmie" bookmarklet. }
At the moment this is known to work with Shimmie/Danbooru/Gelbooru/oreno.imouto/konachan/sankakucomplex. else {
The bookmarklet is now also loaded via the .js file in this folder. var tags = prompt("Please enter tags", "tagme");
*/ if(tags != "" && tags != null) {
//Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported. var link = "'. $link . $delimiter .'url="+location.href+"&tags="+tags;
var w = window.open(link, "_blank");
}
}
}
)();';
$html .= '<a href=\''.$js.'\'>Upload to '.$title.'</a>';
$html .= ' (Drag &amp; drop onto your bookmarks toolbar, then click when looking at an image)';
// Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported.
$supported_ext = "jpg jpeg gif png"; $supported_ext = "jpg jpeg gif png";
if(file_exists("ext/handle_flash")){$supported_ext .= " swf";} if(file_exists("ext/handle_flash")){$supported_ext .= " swf";}
if(file_exists("ext/handle_ico")){$supported_ext .= " ico ani cur";} if(file_exists("ext/handle_ico")){$supported_ext .= " ico ani cur";}
if(file_exists("ext/handle_mp3")){$supported_ext .= " mp3";} if(file_exists("ext/handle_mp3")){$supported_ext .= " mp3";}
if(file_exists("ext/handle_svg")){$supported_ext .= " svg";} if(file_exists("ext/handle_svg")){$supported_ext .= " svg";}
$title = "Booru to " . $config->get_string('title'); $title = "Booru to " . $config->get_string('title');
//CA=0: Ask to use current or new tags | CA=1: Always use current tags | CA=2: Always use new tags // CA=0: Ask to use current or new tags | CA=1: Always use current tags | CA=2: Always use new tags
$html .= '<p><a href="javascript:var ste=&quot;'. $link . $delimiter .'url=&quot;; var supext=&quot;'.$supported_ext.'&quot;; var maxsize=&quot;'.$max_kb.'&quot;; var CA=0; void(document.body.appendChild(document.createElement(&quot;script&quot;)).src=&quot;'.make_http(get_base_href())."/ext/upload/bookmarklet.js".'&quot;)">'. $html .= '<p><a href="javascript:
$title . '</a> (Click when looking at an image page. Works on sites running Shimmie/Danbooru/Gelbooru. (This also grabs the tags/rating/source!))'; var ste=&quot;'. $link . $delimiter .'url=&quot;;
} var supext=&quot;'.$supported_ext.'&quot;;
var maxsize=&quot;'.$max_kb.'&quot;;
var CA=0;
void(document.body.appendChild(document.createElement(&quot;script&quot;)).src=&quot;'.make_http(get_base_href())."/ext/upload/bookmarklet.js".'&quot;)
">'. $title . '</a> (Click when looking at an image page. Works on sites running Shimmie / Danbooru / Gelbooru. (This also grabs the tags / rating / source!))';
} return $html;
$page->set_title("Upload");
$page->set_heading("Upload");
$page->add_block(new NavBlock());
$page->add_block(new Block("Upload", $html, "main", 20));
} }
/* only allows 1 file to be uploaded - for replacing another image file */ /* only allows 1 file to be uploaded - for replacing another image file */

1
themes/default/style.css
View File

@ -142,6 +142,7 @@ UL {
#body { #body {
margin-left: 226px; margin-left: 226px;
margin-right: 16px; margin-right: 16px;
margin-top: 16px;
text-align: center; text-align: center;
height: 1%; height: 1%;
} }