From 28746a12e1a4271ed189991dc5392328c78ce92f Mon Sep 17 00:00:00 2001
From: 2ch774 <2ch774@users.noreply.github.com>
Date: Sun, 12 Apr 2015 00:04:13 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=83=9E=E3=83=9B=E5=90=91=E3=81=91re?=
 =?UTF-8?q?ad=E3=81=AB=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=A0=E3=82=92=E8=BF=BD=E5=8A=A0=20?=
 =?UTF-8?q?=E6=88=BB=E3=82=8B=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E8=89=B2?=
 =?UTF-8?q?=E3=82=92=E7=99=BD=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/read_footer_i.inc.php |  39 ++++++++++++++++++++++++++++++++++++--
 lib/read_header.inc.php   |  10 +++++-----
 lib/read_header_i.inc.php |   8 ++++++++
 rep2/css/iphone.css       |   9 +++++++++
 rep2/iui/backButton.png   | Bin 541 -> 472 bytes
 rep2/js/iphone.js         |   6 ++++++
 6 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/lib/read_footer_i.inc.php b/lib/read_footer_i.inc.php
index 42ba6efc3..229cb6a60 100644
--- a/lib/read_footer_i.inc.php
+++ b/lib/read_footer_i.inc.php
@@ -55,6 +55,37 @@
 
 echo '</tr></tbody></table></div>';
 
+// {{{書き込みフォーム
+if ($_conf['bottom_res_form']) {
+    $bbs = $aThread->bbs;
+    $key = $aThread->key;
+    $host = $aThread->host;
+    $rescount = $aThread->rescount;
+    $ttitle_en = UrlSafeBase64::encode($aThread->ttitle);
+
+    $submit_value = '書き込む';
+
+    $key_idx = $aThread->keyidx;
+
+    // フォームのオプション読み込み
+    require_once P2_LIB_DIR . '/post_form_options.inc.php';
+
+    $htm['resform_ttitle'] = <<<EOP
+<p><b class="thre_title">{$aThread->ttitle_hd}</b></p>
+EOP;
+
+    require_once P2_LIB_DIR . '/post_form.inc.php';
+
+    echo <<<EOP
+<div id="kakiko" class="extra">
+{$htm['dpreview']}
+{$htm['post_form']}
+{$htm['dpreview2']}
+</div>\n
+EOP;
+}
+// }}}
+
 // {{{ その他ボタン類
 
 echo '<table><tbody><tr>';
@@ -89,8 +120,12 @@
 echo '<td>';
 if (!$aThread->diedat) {
     if (empty($_conf['disable_res'])) {
-        $escaped_url = "post_form.php?{$host_bbs_key_q}&amp;rescount={$aThread->rescount}{$ttitle_en_q}{$_conf['k_at_a']}";
-        echo toolbar_i_standard_button('img/glyphish/icons2/08-chat.png', '書込', $escaped_url);
+        if ($_conf['bottom_res_form']) {
+            echo toolbar_i_showhide_button('img/glyphish/icons2/08-chat.png', '書込', 'kakiko');
+        } else {
+            $escaped_url = "post_form.php?{$host_bbs_key_q}&amp;rescount={$aThread->rescount}{$ttitle_en_q}{$_conf['k_at_a']}";
+            echo toolbar_i_standard_button('img/glyphish/icons2/08-chat.png', '書込', $escaped_url);
+        }
     } else {
         echo toolbar_i_opentab_button('img/glyphish/icons2/08-chat.png', '元スレ', $motothre_url);
     }
diff --git a/lib/read_header.inc.php b/lib/read_header.inc.php
index 104d781b9..248f8fd50 100755
--- a/lib/read_header.inc.php
+++ b/lib/read_header.inc.php
@@ -305,11 +305,6 @@
     <script type="text/javascript" src="js/ic2_getcount.js?{$_conf['p2_version_id']}"></script>
 EOP;
 }
-if ($_conf['expack.editor.savedraft'] != '0') {
-    echo <<<EOP
-    <script type="text/javascript" src="js/post_draft.js?{$_conf['p2_version_id']}"></script>
-EOP;
-}
 if ($_conf['wiki.idsearch.spm.mimizun.enabled'] ||
     $_conf['wiki.idsearch.spm.hissi.enabled'] ||
     $_conf['wiki.idsearch.spm.stalker.enabled']) {
@@ -325,6 +320,11 @@
     if ($_conf['expack.editor.dpreview']) {
         echo "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"css.php?css=prvw&amp;skin={$skin_en}\">\n";
     }
+    if ($_conf['expack.editor.savedraft'] != '0') {
+        echo <<<EOP
+    <script type="text/javascript" src="js/post_draft.js?{$_conf['p2_version_id']}"></script>
+EOP;
+    }
     echo "\t<script type=\"text/javascript\" src=\"js/post_form.js?{$_conf['p2_version_id']}\"></script>\n";
     $onload_script .= 'checkSage();';
 }
diff --git a/lib/read_header_i.inc.php b/lib/read_header_i.inc.php
index 0d3f955fb..1a9b0f309 100644
--- a/lib/read_header_i.inc.php
+++ b/lib/read_header_i.inc.php
@@ -106,6 +106,14 @@
 EOS;
 }
 
+if ($_conf['bottom_res_form']) {
+    $_conf['extra_headers_ht'] .= "\t<script type=\"text/javascript\" src=\"js/post_form.js?{$_conf['p2_version_id']}\"></script>\n";
+    if ($_conf['expack.editor.savedraft'] != '0') {
+        $_conf['extra_headers_ht'] .= <<<EOP
+    <script type="text/javascript" src="js/post_draft.js?{$_conf['p2_version_id']}"></script>
+EOP;
+    }
+}
 // }}}
 // }}}
 // {{{ HTMLプリント
diff --git a/rep2/css/iphone.css b/rep2/css/iphone.css
index 3767537b5..b403ce2c3 100644
--- a/rep2/css/iphone.css
+++ b/rep2/css/iphone.css
@@ -107,6 +107,15 @@ p.empty {
 	color: #333;;
 }
 
+/* }}} *
+/* {{{ Res */
+textarea#MESSAGE {
+	padding: 6px;
+	line-height: 132%;
+	width: 100%;
+	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+}
 /* }}} *
 /* {{{ Forms */
 
diff --git a/rep2/iui/backButton.png b/rep2/iui/backButton.png
index 70b416f99d29f521d2ab54a57aec9b3165c0b587..224da72080a65b64b9ba9c42d3175005e9d17141 100644
GIT binary patch
delta 429
zcmV;e0aE^*1lR+RB#|@}e*ua~L_t(oh1HnBQNlnJhCgTkI?xWV1L=TtV4UF&-rf;z
z@1|5>>>zX?9cTyIfp*}*9|%L(#6z;{ciKOb!#A1t-fng<pU?R(4FB@7yBF@BcjVGY
zYgtL&0jsWLnrJ2K?l-`*;#YS%VH#!KeGHU}-$2%>QGhmIwgj%Uf6mS9qdT22L0NZy
z0&W#IW>$vY@0yFU?w$b)#hsZg`%$_~t*jcVP>foqRnBD9Pz5m3qs+{rO@JzOU$y`y
zTCdIQwKtmvPGsGE3Ct9?X140xD8ND1-KW5#;wO+t@Ch;maQADDgC7#A(<=KfTXJlu
z2Qzz%<P)T>!KQsnf3#&UoAEnO0cP3|l4A&<{k|$#sE(83PzIW(YsC?#4VMHbHLJP0
zRh;M`lMHnYmILovFEoFX;7nHYHRsrHWh(Vsd+O4h-5&{)so#s|Su-nujbak@8~jty
zfqSR8h&_MX{DW0DjHvUsQC1B%Rg7A{t?mufaQBMi?sUSmBfgPQ!@UskMrQDzF6Mp!
XO0jRlU5e=@00000NkvXXu0mjf;Ly@O

delta 496
zcmV<M0T2Gz1DynrBn<>}LP=Bz2nYy#2xN$nAs2rD9CSrkbW?9;ba!ELWdK2BZ(?O2
zMrm?ocW-iQb09-gHF34$HUIztmq|oHR9J=8n88)TKomtUHUJ%H2Veze^Vebp#tOs^
zpaP`=V+F$cFT@V81MNU6hzni_977TpVaB_fmy^XillOoAOfS!K{tIV+dD+Y|GfO-2
z(nx=6vod)LOuI7EL@TpqHUgd{zq_+jPor5g8vqN*4KVK1Q4MW&b^)Agox1yHcXsNj
zHEU*1z?J0O-4}K5cTMkD>oT)3@GAN4?#Zc49iwt*RZy8^(46k`%d8421NwS2cK2W%
zV4td;&48iSGk0H|%uNFanKiQs@F=--_b7ipf5C2N%`Blb`URu`{M6FR^Bgm~0M?W_
zy>$0=I9t^eJG-DX`Vga0s4lSN)F#?em>sk2rvTUbAw<Wn8>qnE^n3%1Le2qI>|&sP
zI+N^EPFm4$kXd)10!zuE2AOE6DzFsz(E48Sh=R(gOM}dcZ5*P>Z{^gbK0A?&Ccjum
zhi`Y!fVpH8`8_&(7ns?K^0aUh^0d(A47UHn$TUX;q0y`c??f_aep}resNn7-2i@7J
mr}d4D3hsq~H!_U{785_-{e;>XvgXwQ0000<MNUMnLSTa2x8<P#

diff --git a/rep2/js/iphone.js b/rep2/js/iphone.js
index 6108d42ee..94f341e88 100644
--- a/rep2/js/iphone.js
+++ b/rep2/js/iphone.js
@@ -778,6 +778,12 @@ iutil.toolbarShowHide = function(element, event) {
 						}
 					}
 				}
+
+				// 書き込みフォームなら画面をスクロール(本家より)
+				if(id=='kakiko') {
+					var to = parseInt(target.offsetTop);
+					document.body.scrollTop = to - 60;
+				}
 			}
 		}
 	}