svnno****@sourc*****
svnno****@sourc*****
2009年 8月 30日 (日) 10:50:00 JST
Revision: 42
http://sourceforge.jp/projects/xoopstokita/svn/view?view=rev&revision=42
Author: tokita
Date: 2009-08-30 10:50:00 +0900 (Sun, 30 Aug 2009)
Log Message:
-----------
アップãƒãƒ¼ãƒ‰ã§ã€ä¸€æ‹¬å…¥åŠ›ã€å€‹åˆ¥å…¥åŠ›ãŒãˆã‚‰å¾—るよã†ã«ã—ãŸ
Modified Paths:
--------------
spicky/trunc/xoops_trust_path/modules/spicky/language/japanese/main.php
spicky/trunc/xoops_trust_path/modules/spicky/main/paint.php
spicky/trunc/xoops_trust_path/modules/spicky/main/upload.php
spicky/trunc/xoops_trust_path/modules/spicky/templates/paint.html
spicky/trunc/xoops_trust_path/modules/spicky/templates/upload2.html
Added Paths:
-----------
spicky/trunc/xoops_trust_path/modules/spicky/templates/upload_form_part.html
Modified: spicky/trunc/xoops_trust_path/modules/spicky/language/japanese/main.php
===================================================================
--- spicky/trunc/xoops_trust_path/modules/spicky/language/japanese/main.php 2009-08-30 00:04:45 UTC (rev 41)
+++ spicky/trunc/xoops_trust_path/modules/spicky/language/japanese/main.php 2009-08-30 01:50:00 UTC (rev 42)
@@ -131,3 +131,6 @@
define('_MD_SPICKY_DRAGDROP', 'Firefox + <a href="https://addons.mozilla.org/ja/firefox/addon/2190" target="_blank">dragdropupload</a> アドオンを使うことで、ドラッグ＆ドロップで複数ファイルを
一度にアップロードすることが可能です。');
+define('_MD_SPICKY_UPLOAD_BATCH', '一括入力');
+define('_MD_SPICKY_UPLOAD_MULTI', '個別入力');
+
Modified: spicky/trunc/xoops_trust_path/modules/spicky/main/paint.php
===================================================================
--- spicky/trunc/xoops_trust_path/modules/spicky/main/paint.php 2009-08-30 00:04:45 UTC (rev 41)
+++ spicky/trunc/xoops_trust_path/modules/spicky/main/paint.php 2009-08-30 01:50:00 UTC (rev 42)
@@ -18,6 +18,10 @@
$xoopsTpl->assign('mydirname', $mydirname);
+$upload_url = XOOPS_URL . '/modules/' . $mydirname . '/index.php?page=paint_upload&width=' . $image_width . '&image_height=' . $image_height;
+$upload_url = urlencode($upload_url);
+$xoopsTpl->assign('upload_url', $upload_url);
+
if (isset($_GET['paint_from_id'])) {
$image = spicky_get_image($_GET['paint_from_id']);
$image_data = spicky_create_image_url($mydirname, $image);
@@ -79,12 +83,21 @@
'height' => $height,
) );
- $upload_url = XOOPS_URL . '/modules/' . $mydirname . '/index.php?page=paint_upload&width=' . $image_width . '&image_height=' . $image_height;
- $upload_url = urlencode($upload_url);
- $xoopsTpl->assign('upload_url', $upload_url);
-
$xoopsOption['template_main'] = $mydirname.'_paint2.html';
} else {
+ $image_width = 500;
+ $image_height = 500;
+
+ $width = $image_width + 136;
+ $height = $image_height + 20;
+
+ $xoopsTpl->assign( array(
+ 'image_width' => $image_width,
+ 'image_height' => $image_height,
+ 'width' => $width,
+ 'height' => $height,
+ ) );
+
$xoopsOption['template_main'] = $mydirname.'_paint.html';
}
Modified: spicky/trunc/xoops_trust_path/modules/spicky/main/upload.php
===================================================================
--- spicky/trunc/xoops_trust_path/modules/spicky/main/upload.php 2009-08-30 00:04:45 UTC (rev 41)
+++ spicky/trunc/xoops_trust_path/modules/spicky/main/upload.php 2009-08-30 01:50:00 UTC (rev 42)
@@ -136,12 +136,22 @@
$tool_check = array();
for ($j=1; $j < 1000; $j++) {
- if (isset($_POST['tool' . $i . '_' . $j])) {
- $tool_check[] = $j;
+ if (@$_POST['batch']) {
+ if (isset($_POST['tool1' . '_' . $j])) {
+ $tool_check[] = $j;
+ }
+ } else {
+ if (isset($_POST['tool' . $i . '_' . $j])) {
+ $tool_check[] = $j;
+ }
}
}
-
- $tag_list = split(' ', $_POST['tag' . $i]);
+
+ if (@$_POST['batch']) {
+ $tag_list = split(' ', $_POST['tag1']);
+ } else {
+ $tag_list = split(' ', $_POST['tag' . $i]);
+ }
$image = spicky_get_image_tmp($_POST['image_id' . $i]);
@@ -154,9 +164,23 @@
}
spicky_insert_tool_image_link($image_id, $tool_check);
+ //print_r($_POST);exit();
+ if (@$_POST['batch']) {
+ $title = $_POST['title1'];
+ $desc = $_POST['desc1'];
+ $public_level = $_POST['public_level1'];
+ $pasteok = @$_POST['pasteok1'];
+ $limit_level = @$_POST['limit_level1'];
+ } else {
+ $title = $_POST['title' . $i];
+ $desc = $_POST['desc' . $i];
+ $public_level = $_POST['public_level' . $i];
+ $pasteok = @$_POST['pasteok' . $i];
+ $limit_level = @$_POST['limit_level' . $i];
+ }
- spicky_update_image($image_id, $_POST['title' . $i], $_POST['desc' . $i],
- $_POST['public_level' . $i], @$_POST['pasteok' . $i], @$_POST['limit_level' . $i], $user_id);
+ spicky_update_image($image_id, $title, $desc,
+ $public_level, @$pasteok, @$limit_level, $user_id);
spicky_move_tmp_to_image($_POST['image_id' . $i], $image_id, $image['code'], $image['type']);
}
Modified: spicky/trunc/xoops_trust_path/modules/spicky/templates/paint.html
===================================================================
--- spicky/trunc/xoops_trust_path/modules/spicky/templates/paint.html 2009-08-30 00:04:45 UTC (rev 41)
+++ spicky/trunc/xoops_trust_path/modules/spicky/templates/paint.html 2009-08-30 01:50:00 UTC (rev 42)
@@ -13,3 +13,10 @@
<input type="submit" name="submit" value="submit">
</form>
+
+<object type="application/x-shockwave-flash" data="nextpaint.swf" width="<{$width}>" height="<{$height}>" >
+<param name="movie" value="nextpaint.swf" />
+<param name="FlashVars" value="imageWidth=<{$image_width}>&imageHeight=<{$image_height}>&uploadurl=<{$upload_url}>&baseimage=<{$url}>&paint_from_id=<{$paint_from_id}>&lang=<{$xoops_langcode}>" />
+</object>
+
+
Modified: spicky/trunc/xoops_trust_path/modules/spicky/templates/upload2.html
===================================================================
--- spicky/trunc/xoops_trust_path/modules/spicky/templates/upload2.html 2009-08-30 00:04:45 UTC (rev 41)
+++ spicky/trunc/xoops_trust_path/modules/spicky/templates/upload2.html 2009-08-30 01:50:00 UTC (rev 42)
@@ -27,6 +27,22 @@
}
}
+function spicky_display(no){
+
+ if(no == "no1"){
+
+ document.getElementById("spicky_batch").style.display = "block";
+ document.getElementById("spicky_multi").style.display = "none";
+
+ }else if(no == "no2"){
+
+ document.getElementById("spicky_batch").style.display = "none";
+ document.getElementById("spicky_multi").style.display = "block";
+
+ }
+
+}
+
// -->
</script>
@@ -34,65 +50,54 @@
<h1><{$smarty.const._MD_SPICKY_ENTRY_IMAGE}></h1>
+<a href="javascript:;" onclick="spicky_display('no1')"><{$smarty.const._MD_SPICKY_UPLOAD_BATCH}></a> |
+<a href="javascript:;" onclick="spicky_display('no2')"><{$smarty.const._MD_SPICKY_UPLOAD_MULTI}></a>
+
+
+<div id="spicky_batch">
+
+<{assign var="batch" value="1"}>
+
<form action="index.php?page=upload" method="post" id="formspicky1" name="formspicky1" onSubmit="return spicky_check();">
<input name="HypEncHint" type="hidden" value="ぷ" />
<input name="stat" type="hidden" value="3" />
+<input name="batch" type="hidden" value="1" />
<{foreach from=$num_list item=i}>
-<{if isset($image[$i]) }>
-
<input type="hidden" name="image_id<{$i}>" value="<{$image[$i].id}>">
-<table class='outer' cellspacing='1' cellpadding='4'>
-<tr>
-<td rowspan="10" class="odd">
+<{/foreach}>
+
+<{assign var="i" value="1"}>
+
+<{include file="db:`$mydirname`_upload_form_part.html"}>
+
<center>
-<br /><br /><br /><br /><br />
-<{$smarty.const._MD_SPICKY_IMAGE}><{$i}><br />
-<{spicky_image image=$image[$i] mydirname=$mydirname tmp="1"}>
+<input type="submit" name="submit" value="submit">
+<input type="reset" name="reset" value="reset">
</center>
-</td>
-<td class="even"><{$smarty.const._MD_SPICKY_TITEL}></td>
-<td class="odd"><input type="text" id="title" name="title<{$i}>" value="" size="32" maxlength="33"></td>
-</tr>
-<tr>
-<td class="even"><{$smarty.const._MD_SPICKY_DESC}></td>
-<td class="odd"><textarea name="desc<{$i}>" cols="30" rows="10"></textarea></td>
-</tr>
-<tr>
-<td class="even"><{$smarty.const._MD_SPICKY_PUBLIC_LEVEL}></td>
-<td class="odd">
-<input type="radio" name="public_level<{$i}>" value="1" checked><{$smarty.const._MD_SPICKY_PUBLIC_LEVEL_ALL}>
-<input type="radio" name="public_level<{$i}>" value="2"><{$smarty.const._MD_SPICKY_PUBLIC_LEVEL_PRV}>
-</td>
-</tr>
-<tr>
-<td class="even"><{$smarty.const._MD_SPICKY_TAG}></td>
-<td class="odd"><input type="text" name="tag<{$i}>" size="50" maxlength="51"><br /><{$smarty.const._MD_SPICKY_TAG_DESC}></td>
-</tr>
-<tr>
-<td class="even"><{$smarty.const._MD_SPICKY_LIMIT_LEVEL}></td>
-<td class="odd">
-<input type="radio" id="limit_level" name="limit_level<{$i}>" value="1"><{$smarty.const._MD_SPICKY_LIMIT_LEVEL_ALL}>
-<input type="radio" id="limit_level" name="limit_level<{$i}>" value="2"><{$smarty.const._MD_SPICKY_LIMIT_LEVEL_R18}>
-</td>
-</tr>
-<tr>
-<td class="even"><{$smarty.const._MD_SPICKY_TOOL}></td>
-<td class="odd">
-<{assign var="tmp" value="1"}>
-<{foreach from=$tool_list item=item}>
-<{if $tmp != $item.group}>
-<hr />
-<{/if}>
-<nobr><input type="checkbox" name="tool<{$i}>_<{$item.id}>"><{$item.name|escape}></nobr>
-<{assign var="tmp" value=$item.group}>
-<{/foreach}>
-</td>
-</tr>
-</table>
+</form>
+
+</div><!-- div batch -->
+
+<div id="spicky_multi" style="display: none;">
+
+<{assign var="batch" value="0"}>
+
+<form action="index.php?page=upload" method="post" id="formspicky1" name="formspicky1" onSubmit="return spicky_check();">
+<input name="HypEncHint" type="hidden" value="ぷ" />
+<input name="stat" type="hidden" value="3" />
+
+<{foreach from=$num_list item=i}>
+
+<{if isset($image[$i]) }>
+
+<input type="hidden" name="image_id<{$i}>" value="<{$image[$i].id}>">
+
+<{include file="db:`$mydirname`_upload_form_part.html"}>
+
<{/if}>
<{/foreach}>
@@ -104,3 +109,6 @@
</form>
+</div><!-- div multi -->
+
+
Added: spicky/trunc/xoops_trust_path/modules/spicky/templates/upload_form_part.html
===================================================================
--- spicky/trunc/xoops_trust_path/modules/spicky/templates/upload_form_part.html (rev 0)
+++ spicky/trunc/xoops_trust_path/modules/spicky/templates/upload_form_part.html 2009-08-30 01:50:00 UTC (rev 42)
@@ -0,0 +1,57 @@
+<table class='outer' cellspacing='1' cellpadding='4'>
+<tr>
+<td rowspan="10" class="odd">
+<center>
+<{if $batch}>
+<br />
+<{foreach from=$num_list item=i2}>
+<{$smarty.const._MD_SPICKY_IMAGE}><{$i2}><br />
+<{spicky_image image=$image[$i2] mydirname=$mydirname tmp="1"}><br />
+<br />
+<{/foreach}>
+<{else}>
+<br /><br /><br /><br /><br />
+<{$smarty.const._MD_SPICKY_IMAGE}><{$i}><br />
+<{spicky_image image=$image[$i] mydirname=$mydirname tmp="1"}>
+<{/if}>
+</center>
+</td>
+<td class="even"><{$smarty.const._MD_SPICKY_TITEL}></td>
+<td class="odd"><input type="text" id="title" name="title<{$i}>" value="" size="32" maxlength="33"></td>
+</tr>
+<tr>
+<td class="even"><{$smarty.const._MD_SPICKY_DESC}></td>
+<td class="odd"><textarea name="desc<{$i}>" cols="30" rows="10"></textarea></td>
+</tr>
+<tr>
+<td class="even"><{$smarty.const._MD_SPICKY_PUBLIC_LEVEL}></td>
+<td class="odd">
+<input type="radio" name="public_level<{$i}>" value="1" checked><{$smarty.const._MD_SPICKY_PUBLIC_LEVEL_ALL}>
+<input type="radio" name="public_level<{$i}>" value="2"><{$smarty.const._MD_SPICKY_PUBLIC_LEVEL_PRV}>
+</td>
+</tr>
+<tr>
+<td class="even"><{$smarty.const._MD_SPICKY_TAG}></td>
+<td class="odd"><input type="text" name="tag<{$i}>" size="50" maxlength="51"><br /><{$smarty.const._MD_SPICKY_TAG_DESC}></td>
+</tr>
+<tr>
+<td class="even"><{$smarty.const._MD_SPICKY_LIMIT_LEVEL}></td>
+<td class="odd">
+<input type="radio" id="limit_level" name="limit_level<{$i}>" value="1"><{$smarty.const._MD_SPICKY_LIMIT_LEVEL_ALL}>
+<input type="radio" id="limit_level" name="limit_level<{$i}>" value="2"><{$smarty.const._MD_SPICKY_LIMIT_LEVEL_R18}>
+</td>
+</tr>
+<tr>
+<td class="even"><{$smarty.const._MD_SPICKY_TOOL}></td>
+<td class="odd">
+<{assign var="tmp" value="1"}>
+<{foreach from=$tool_list item=item}>
+<{if $tmp != $item.group}>
+<hr />
+<{/if}>
+<nobr><input type="checkbox" name="tool<{$i}>_<{$item.id}>"><{$item.name|escape}></nobr>
+<{assign var="tmp" value=$item.group}>
+<{/foreach}>
+</td>
+</tr>
+</table>