svnno****@sourc*****
svnno****@sourc*****
2013年 6月 13日 (木) 18:51:17 JST
Revision: 952
http://sourceforge.jp/projects/p2-php/scm/svn/commits/952
Author: akid
Date: 2013-06-13 18:51:17 +0900 (Thu, 13 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
p2/trunk/conf/conf_user_def.inc.php
p2/trunk/edit_conf_user.php
p2/trunk/edit_conf_user_i.php
p2/trunk/edit_indexmenui.php
p2/trunk/editfavita_i.php
p2/trunk/editpref_i.php
p2/trunk/info_i.php
p2/trunk/iphone/ShowBrdMenuK.php
p2/trunk/iphone/ShowThreadK.php
p2/trunk/iphone/index_print_k.inc.php
p2/trunk/iphone/js/iphone.js
p2/trunk/iphone/js/respopup.iPhone.js
p2/trunk/iphone/js/setfavjs.iphone.js
p2/trunk/iphone/js/setfavjs.js
p2/trunk/iphone/js/smartpopup.iPhone.js
p2/trunk/iphone/read_footer_k.inc.php
p2/trunk/iphone/read_header_k.inc.php
p2/trunk/iphone/sb_footer_k.inc.php
p2/trunk/iphone/sb_header_k.inc.php
p2/trunk/iui/footformbg.png
p2/trunk/iui/iui.css
p2/trunk/iui/iui.js
p2/trunk/iui/iuix.css
p2/trunk/iui/iuix.js
p2/trunk/iui/read.css
p2/trunk/js/delelog.js
p2/trunk/js/post_form.js
p2/trunk/menu_i.php
p2/trunk/post_form_i.php
p2/trunk/read.php
p2/trunk/read_filter_i.php
p2/trunk/read_new.php
p2/trunk/read_new_i.php
p2/trunk/read_new_k.php
p2/trunk/subject.php
p2/trunk/subject_i.php
p2/trunk/title.php
Added Paths:
-----------
p2/trunk/iui/footer_tool.png
p2/trunk/iui/footer_tool_retina.png
p2/trunk/iui/smartphone.css
-------------- next part --------------
Modified: p2/trunk/conf/conf_user_def.inc.php
===================================================================
--- p2/trunk/conf/conf_user_def.inc.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/conf/conf_user_def.inc.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -110,6 +110,10 @@
$conf_user_def['respointer'] = 1; // (1)
$conf_user_rules['respointer'] = array('notIntExceptMinusToDef');
+// \x83X\x83}\x83z\x82ŃX\x83\x8C\x93\xE0\x97e\x95\\x8E\xA6\x8E\x9E\x81A\x96\xA2\x93ǂ̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82Ƀ|\x83C\x83\x93\x83^\x82\xF0\x8D\x87\x82킹\x82邩
+$conf_user_def['respointer_i'] = 0; // (0)
+$conf_user_rules['respointer_i'] = array('notIntExceptMinusToDef');
+
// PC\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩
$conf_user_def['before_respointer'] = 25; // (25)
$conf_user_rules['before_respointer'] = array('notIntExceptMinusToDef');
@@ -118,7 +122,11 @@
$conf_user_def['before_respointer_new'] = 0; // (0)
$conf_user_rules['before_respointer_new'] = array('notIntExceptMinusToDef');
-// \x90V\x92\x85\x82܂Ƃߓǂ݂ň\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x90\x94
+// \x83X\x83}\x83z\x82ŐV\x92\x85\x82܂Ƃߓǂ݂̎\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩
+$conf_user_def['before_respointer_new_i'] = 1; // (1)
+$conf_user_rules['before_respointer_new_i'] = array('notIntExceptMinusToDef');
+
+// \x90V\x92\x85\x82܂Ƃߓǂ݂ň\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x8Dő僌\x83X\x90\x94
$conf_user_def['rnum_all_range'] = 200; // (200)
$conf_user_rules['rnum_all_range'] = array('emptyToDef', 'notIntExceptMinusToDef');
@@ -290,6 +298,10 @@
$conf_user_def['k_post_msg_rows'] = ''; // ('')
$conf_user_rules['k_post_msg_rows'] = array('emptyToDef', 'notIntExceptMinusToDef');
+// \x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍s\x90\x94
+$conf_user_def['i_post_msg_rows'] = '7'; // ('7')
+$conf_user_rules['i_post_msg_rows'] = array('emptyToDef', 'notIntExceptMinusToDef');
+
// }}}
// {{{ \x81\xA1ETC
Modified: p2/trunk/edit_conf_user.php
===================================================================
--- p2/trunk/edit_conf_user.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/edit_conf_user.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,7 +1,7 @@
<?php
/*
p2 - \x83\x86\x81[\x83U\x90ݒ\xE8\x95ҏWUI
-
+
\x81\xA6\x82\xB1\x82̃X\x83N\x83\x8A\x83v\x83g\x88ȊO\x82ł\xE0\x90ݒ肳\x82\xEA\x82郆\x81[\x83U\x90ݒ\xE8\x92l\x82\xAA\x82\xA0\x82\xEA\x82A
\x82\xBB\x82\xCCkey\x82\xF0_getConfSave()\x93\xE0\x82\xCC$remain_keys\x82ɓo\x98^\x82\xB5\x82Ă\xA8\x82\xAD\x81B
*/
@@ -99,7 +99,7 @@
if (UA::isPC()) {
?>
- <script type="text/javascript" src="js/basic.js?v=20090429"></script>
+ <script type="text/javascript" src="js/basic.js"></script>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<?php
P2View::printIncludeCssHtml('style');
@@ -197,17 +197,19 @@
echo getEditConfHtml('sort_zero_adjust', '\x95\xC0\x82я\x87\x82\xAA\x90V\x92\x85\x82̎\x9E\x82́u\x8A\xF9\x93\xBE\x82Ȃ\xB5\x81v\x82́u\x90V\x92\x85\x90\x94\x83[\x83\x8D\x81v\x82ɑ\xB7\x82\xE9\x95\xC0\x82я\x87\x82̗D\x90揇\x88\xCA');
echo getEditConfHtml('cmp_dayres_midoku', '\x95\xC0\x82я\x87\x82\xAA\x90\xA8\x82\xA2\x82̎\x9E\x82ɐV\x92\x85\x83\x8C\x83X\x82̂\xA0\x82\xE9\x83X\x83\x8C\x82\xF0\x97D\x90\xE6');
echo getEditConfHtml('k_sb_disp_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x83\x8A\x83X\x83g\x82̐\x94');
-if (!UA::isK()) {
- echo getEditConfHtml('i_sb_disp_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x83\x8A\x83X\x83g\x82̐\x94');
-}
+echo getEditConfHtml('i_sb_disp_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x83\x8A\x83X\x83g\x82̐\x94');
echo getEditConfHtml('viewall_kitoku', '\x8A\xF9\x93\xBE\x83X\x83\x8C\x82͕\\x8E\xA6\x8C\x8F\x90\x94\x82Ɋւ\xED\x82炸\x95\\x8E\xA6');
echo getGroupSepaHtml('read');
echo getEditConfHtml('respointer', '\x83X\x83\x8C\x93\xE0\x97e\x95\\x8E\xA6\x8E\x9E\x81A\x96\xA2\x93ǂ̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82Ƀ|\x83C\x83\x93\x83^\x82\xF0\x8D\x87\x82킹\x82邩');
+echo getEditConfHtml('respointer_i', '\x83X\x83}\x83z\x82ŃX\x83\x8C\x93\xE0\x97e\x95\\x8E\xA6\x8E\x9E\x81A\x96\xA2\x93ǂ̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82Ƀ|\x83C\x83\x93\x83^\x82\xF0\x8D\x87\x82킹\x82邩');
echo getEditConfHtml('before_respointer', 'PC\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+echo getEditConfHtml('before_respointer_i', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+echo getEditConfHtml('before_respointer_k', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
echo getEditConfHtml('before_respointer_new', '\x90V\x92\x85\x82܂Ƃߓǂ݂̎\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
-echo getEditConfHtml('rnum_all_range', '\x90V\x92\x85\x82܂Ƃߓǂ݂ň\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x90\x94');
+echo getEditConfHtml('before_respointer_new_i', '\x83X\x83}\x83z\x82ŐV\x92\x85\x82܂Ƃߓǂ݂̎\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+echo getEditConfHtml('rnum_all_range', '\x90V\x92\x85\x82܂Ƃߓǂ݂ň\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x8Dő僌\x83X\x90\x94');
echo getEditConfHtml('preview_thumbnail', '\x89摜URL\x82̐\xE6\x93ǂ݃T\x83\x80\x83l\x83C\x83\x8B\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('pre_thumb_limit', '\x89摜URL\x82̐\xE6\x93ǂ݃T\x83\x80\x83l\x83C\x83\x8B\x82\xF0\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82鐧\x8C\xC0\x90\x94');
//echo getEditConfHtml('preview_thumbnail', '\x89摜\x83T\x83\x80\x83l\x83C\x83\x8B\x82̏c\x82̑傫\x82\xB3\x82\xF0\x8Ew\x92\xE8 (\x83s\x83N\x83Z\x83\x8B)');
@@ -221,38 +223,32 @@
echo getEditConfHtml('flex_idpopup', '\x83X\x83\x8C\x93\xE0\x82œ\xAF\x82\xB6 ID:xxxxxxxx \x82\xAA\x82\xA0\x82\xEA\x82AID\x83t\x83B\x83\x8B\x83^\x97p\x82̃\x8A\x83\x93\x83N\x82ɕϊ\xB7');
echo getEditConfHtml('ext_win_target', '\x8AO\x95\x94\x83T\x83C\x83g\x93\x99\x82փW\x83\x83\x83\x93\x83v\x82\xB7\x82鎞\x82ɊJ\x82\xAD\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x81[\x83Q\x83b\x83g\x96\xBC');
echo getEditConfHtml('bbs_win_target', 'p2\x91Ή\x9EBBS\x83T\x83C\x83g\x93\xE0\x82ŃW\x83\x83\x83\x93\x83v\x82\xB7\x82鎞\x82ɊJ\x82\xAD\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x81[\x83Q\x83b\x83g\x96\xBC');
-echo getEditConfHtml('bottom_res_form', '\x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82ɏ\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82\xF0\x95\\x8E\xA6');
-if (UA::isPC()) {
- echo getEditConfHtml('show_datsize_in_footer', 'PC \x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82\xC9DAT\x97e\x97ʂ\xF0\x95\\x8E\xA6');
-}
+echo getEditConfHtml('bottom_res_form', 'PC \x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82ɏ\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82\xF0\x95\\x8E\xA6');
+echo getEditConfHtml('show_datsize_in_footer', 'PC \x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82\xC9DAT\x97e\x97ʂ\xF0\x95\\x8E\xA6');
echo getEditConfHtml('quote_res_view', '\x88\xF8\x97p\x83\x8C\x83X\x82\xF0\x81i\x83|\x83b\x83v\x83A\x83b\x83v\x81j\x95\\x8E\xA6');
echo getEditConfHtml('enable_headbar', 'PC \x83w\x83b\x83h\x83o\x81[\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('enable_spm', '\x83\x8C\x83X\x94ԍ\x86\x82\xA9\x82\xE7\x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[(SPM)\x82\xF0\x95\\x8E\xA6');
//echo getEditConfHtml('spm_kokores', '\x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x82Łu\x82\xB1\x82\xEA\x82Ƀ\x8C\x83X\x81v\x82\xF0\x95\\x8E\xA6');
+echo getEditConfHtml('i_rnum_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
+echo getEditConfHtml('i_post_msg_rows', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍\x82\x82\xB3\x81i\x8Ds\x90\x94\x81j');
+
echo getEditConfHtml('k_rnum_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
-if (!UA::isK()) {
- echo getEditConfHtml('i_rnum_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
-}
+
echo getEditConfHtml('ktai_res_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x82‚̃\x8C\x83X\x82̍ő\xE5\x95\\x8E\xA6\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
echo getEditConfHtml('ktai_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB5\x82\xBD\x82Ƃ\xAB\x82̕\\x8E\xA6\x83T\x83C\x83Y');
echo getEditConfHtml('k_aa_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81AAA\x82炵\x82\xAB\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB7\x82\xE9\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
-echo getEditConfHtml('before_respointer_k', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
-if (!UA::isK()) {
- echo getEditConfHtml('before_respointer_i', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
-}
-echo getEditConfHtml('k_use_tsukin', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94\x83\x8A\x83\x93\x83N\x82ɒʋu\x83\x89\x83E\x83U(\x92\xCA)\x82𗘗p');
-echo getEditConfHtml('k_use_picto', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x89摜\x83\x8A\x83\x93\x83N\x82\xC9pic.to(\xCB\xDF)\x82𗘗p');
+//echo getEditConfHtml('k_use_tsukin', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94\x83\x8A\x83\x93\x83N\x82ɒʋu\x83\x89\x83E\x83U(\x92\xCA)\x82𗘗p');
+//echo getEditConfHtml('k_use_picto', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x89摜\x83\x8A\x83\x93\x83N\x82\xC9pic.to(\xCB\xDF)\x82𗘗p');
+
echo getEditConfHtml('k_motothre_template', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8C\xB3\x83X\x83\x8CURL\x82̃J\x83X\x83^\x83}\x83C\x83Y\x8Ew\x92\xE8');
echo getEditConfHtml('k_motothre_external', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8C\xB3\x83X\x83\x8CURL\x82̃J\x83X\x83^\x83}\x83C\x83Y\x8Ew\x92\xE8\x82\xF0\x8AO\x95\x94\x94‚ł\xE0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9');
echo getEditConfHtml('k_bbs_noname_name', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x96\xB3\x82\xB5\x96\xBC\x82\xF0\x95\\x8E\xA6');
-
echo getEditConfHtml('k_clip_unique_id', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8Fd\x95\xA1\x82\xB5\x82Ȃ\xA2ID\x82͖\x96\x94\xF6\x82݂̂̏ȗ\xAA\x95\\x8E\xA6');
-
echo getEditConfHtml('k_date_zerosuppress', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x93\xFA\x95t\x82\xCC0\x82\xF0\x8Fȗ\xAA\x95\\x8E\xA6');
echo getEditConfHtml('k_clip_time_sec', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8E\x9E\x8D\x8F\x82̕b\x82\xF0\x8Fȗ\xAA\x95\\x8E\xA6');
echo getEditConfHtml('mobile.id_underline', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81AID\x96\x96\x94\xF6\x82\xCC"O"\x81i\x83I\x81[\x81j\x82ɉ\xBA\x90\xFC\x82\xF0\x92lj\xC1');
@@ -264,10 +260,15 @@
echo getEditConfHtml('k_acolor', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8A\xEE\x96{\x83\x8A\x83\x93\x83N\x90F\x81iHTML\x83J\x83\x89\x81[\x81j');
echo getEditConfHtml('k_acolor_v', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8A\xEE\x96{\x96K\x96\xE2\x8Dς݃\x8A\x83\x93\x83N\x90F\x81iHTML\x83J\x83\x89\x81[\x81j');
echo getEditConfHtml('k_post_msg_cols', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̉\xA1\x95\x9D');
-echo getEditConfHtml('k_post_msg_rows', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍\x82\x82\xB3');
+echo getEditConfHtml('k_post_msg_rows', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍\x82\x82\xB3\x81i\x8Ds\x90\x94\x81j');
echo getGroupSepaHtml('ETC');
+echo getEditConfHtml('fontsize', 'PC \x8A\xEE\x96{\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('menu_fontsize', 'PC \x83\x81\x83j\x83\x85\x81[\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('sb_fontsize', 'PC \x83X\x83\x8C\x88ꗗ\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('read_fontsize', 'PC \x83X\x83\x8C\x93\xE0\x97e\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+
echo getEditConfHtml('frame_menu_width', '\x94ƒ\x81\x83j\x83\x85\x81[\x81i\x83t\x83\x8C\x81[\x83\x80\x8D\xB6\x81j\x82̕\\x8E\xA6\x95\x9D');
echo getEditConfHtml('frame_subject_width', '\x83X\x83\x8C\x88ꗗ\x81i\x83t\x83\x8C\x81[\x83\x80\x89E\x8F\xE3\x81j\x82̕\\x8E\xA6\x95\x9D');
echo getEditConfHtml('frame_read_width', '\x83X\x83\x8C\x96{\x95\xB6\x81i\x83t\x83\x8C\x81[\x83\x80\x89E\x89\xBA\x81j\x82̕\\x8E\xA6\x95\x9D');
@@ -284,19 +285,20 @@
echo getEditConfHtml('res_hist_rec_num', '\x8F\x91\x82\xAB\x8D\x9E\x82ݗ\x9A\x97\xF0\x82̋L\x98^\x90\x94');
echo getEditConfHtml('res_write_rec', '\x8F\x91\x82\xAB\x8D\x9E\x82ݓ\xE0\x97e\x83\x8D\x83O\x82\xF0\x8BL\x98^');
echo getEditConfHtml('through_ime', '\x8AO\x95\x94URL\x83W\x83\x83\x83\x93\x83v\x82\xB7\x82\xE9\x8Dۂɒʂ\xB7\x83N\x83b\x83V\x83\x87\x83\x93\x83y\x81[\x83W');
-echo getEditConfHtml('join_favrank', '<a href="http://akid.s17.xrea.com/favrank/favrank.html" target="_blank">\x82\xA8\x8BC\x82ɃX\x83\x8C\x8B\xA4\x97L</a>\x82ɎQ\x89\xC1');
+echo getEditConfHtml('through_ime_k', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94URL\x83N\x83b\x83V\x83\x87\x83\x93\x82𗘗p\x81i\x81\xA6\x97\x98\x97p\x82𐄏\xA7\x81j');//.\x81i\x81\xA6Cookie\x96\xB3\x8C\xF8\x8E\x9E\x82́A\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8F\xE3\x82̗\x9D\x97R\x82\xA9\x82炱\x82̐ݒ\xE8\x92l\x82Ɋւ\xED\x82炸\x83N\x83b\x83V\x83\x87\x83\x93\x82\xAA\x97\x98\x97p\x82\xB3\x82\xEA\x82܂\xB7\x81j');
+echo getEditConfHtml('k_jig_host', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94URL\x83N\x83b\x83V\x83\x87\x83\x93\x82\xC5jig\x83u\x83\x89\x83E\x83UWEB\x82𗘗p\x82\xB7\x82\xE9<br>
+ (\x83z\x83X\x83g\x96\xBC\x81B\x81uhttp://<font color="red">XXXXXX</font>.jig.jp/fweb/?_jig_=\x81v\x82\xCC <font color="red">XXXXXX</font> \x95\x94\x95\xAA)');
+//echo getEditConfHtml('join_favrank', '<a href="http://akid.s17.xrea.com/favrank/favrank.html" target="_blank">\x82\xA8\x8BC\x82ɃX\x83\x8C\x8B\xA4\x97L</a>\x82ɎQ\x89\xC1');
echo getEditConfHtml('enable_menu_new', '\x94ƒ\x81\x83j\x83\x85\x81[\x82ɐV\x92\x85\x90\x94\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('menu_refresh_time', '\x94ƒ\x81\x83j\x83\x85\x81[\x95\x94\x95\xAA\x82̎\xA9\x93\xAE\x8DX\x90V\x8AԊu (\x95\xAA\x8Ew\x92\xE8\x81B0\x82Ȃ玩\x93\xAE\x8DX\x90V\x82\xB5\x82Ȃ\xA2\x81B)');
echo getEditConfHtml('mobile.match_color', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83t\x83B\x83\x8B\x83^\x83\x8A\x83\x93\x83O\x82Ń}\x83b\x83`\x82\xB5\x82\xBD\x83L\x81[\x83\x8F\x81[\x83h\x82̐F');
echo getEditConfHtml('k_save_packet', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83p\x83P\x83b\x83g\x97ʂ\xF0\x8C\xB8\x82炷\x82\xBD\x82߁A\x91S\x8Ap\x89p\x90\x94\x81E\x83J\x83i\x81E\x83X\x83y\x81[\x83X\x82p\x82ɕϊ\xB7');
echo getEditConfHtml('ngaborn_daylimit', '\x82\xB1\x82̊\xFA\x8AԁANG\x82\xA0\x82ځ[\x82\xF1\x82\xC9HIT\x82\xB5\x82Ȃ\xAF\x82\xEA\x82A\x93o\x98^\x83\x8F\x81[\x83h\x82\xF0\x8E\xA9\x93\xAE\x93I\x82ɊO\x82\xB7\x81i\x93\xFA\x90\x94\x81j');
+
echo getEditConfHtml('proxy_use', '\x83v\x83\x8D\x83L\x83V\x82𗘗p');
echo getEditConfHtml('proxy_host', '\x83v\x83\x8D\x83L\x83V\x83z\x83X\x83g ex)"127.0.0.1", "www.p2proxy.com"');
echo getEditConfHtml('proxy_port', '\x83v\x83\x8D\x83L\x83V\x83|\x81[\x83g ex)"8080"');
-echo getEditConfHtml('precede_openssl', '\x81\x9C\x83\x8D\x83O\x83C\x83\x93\x82\xF0\x81A\x82܂\xB8\x82\xCDopenssl\x82Ŏ\x8E\x82݂\xE9\x81B\x81\xA6PHP 4.3.0\x88ȍ~\x82ŁAOpenSSL\x82\xAA\x90ÓI\x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B');
-echo getEditConfHtml('precede_phpcurl', 'curl\x82\xF0\x8Eg\x82\xA4\x8E\x9E\x81A\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x94ł\xC6PHP\x8A\x94\x94łǂ\xBF\x82\xE7\x82\xF0\x97D\x90悷\x82邩');
-
echo $htm['form_submit'];
if (UA::isPC()) {
@@ -399,7 +401,7 @@
// \x8Cg\x91їp
} else {
$hr = P2View::getHrHtmlK();
- $ht = "$hr<h4>{$title}</h4>" . "\n";
+ $ht = "$hr<font color=\"gray\">{$title}</font><br><br>" . "\n";
}
return $ht;
}
@@ -418,20 +420,43 @@
return '';
}
+ $excepts = array();
+
+ // \x81i\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8Fꍇ\x82\xE0hidden\x92l\x82͕K\x97v\x81j
+
+ // \x83X\x83}\x83z\x81A\x8Cg\x91тł͕ҏW\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8D\x80\x96\xDA
+ if (UA::isIPhoneGroup() || UA::isK()) {
+ $excepts = array_merge($excepts, array(
+ 'refresh_time', 'sb_show_motothre', 'sb_show_one', 'before_respointer',
+ 'rnum_all_range', 'show_datsize_in_footer', 'bottom_res_form', 'enable_headbar',
+ 'frame_menu_width', 'frame_subject_width', 'frame_read_width', 'pane_mode'
+ ));
+ }
+
+ // \x83X\x83}\x83z\x82ł͕ҏW\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8D\x80\x96\xDA
+ if (UA::isIPhoneGroup()) {
+ $excepts = array_merge($excepts, array(
+ 'k_sb_disp_range', 'respointer', 'before_respointer_k', 'k_rnum_range', 'k_copy_divide_len',
+ 'read_k_thread_title_color', 'k_bgcolor', 'k_color', 'k_acolor', 'k_acolor_v',
+ 'k_post_msg_cols', 'k_post_msg_rows', 'fontsize', 'menu_fontsize', 'sb_fontsize', 'read_fontsize',
+ 'through_ime_k', 'k_jig_host'
+ ));
+
// \x8Cg\x91тł͕ҏW\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8D\x80\x96\xDA
- if (UA::isK()) {
- $noKtais = array(
- 'enable_headbar', 'enable_spm', 'spm_kokores',
- 'frame_menu_width', 'frame_subject_width', 'frame_read_width'
- );
- if (in_array($name, $noKtais)) {
- return sprintf(
- '<input type="hidden" name="conf_edit[%s]" value="%s">' . "\n",
- hs($name), hs($_conf[$name])
- );
- }
+ } elseif (UA::isK()) {
+ $excepts = array_merge($excepts, array(
+ 'i_sb_disp_range', 'respointer_i', 'before_respointer_i', 'before_respointer_new_i', 'iframe_popup',
+ 'quote_res_view', 'enable_spm', 'i_rnum_range', 'i_post_msg_rows', 'spm_kokores'
+ ));
}
+ if (in_array($name, $excepts)) {
+ return sprintf(
+ '<input type="hidden" name="conf_edit[%s]" value="%s">' . "\n",
+ hs($name), hs($_conf[$name])
+ );
+ }
+
$name_view_hs = hs($_conf[$name]);
if (UA::isPC()) {
@@ -453,7 +478,7 @@
$type = 'password';
}
$form_ht = <<<EOP
-<input type="${type}" name="conf_edit[{$name}]" value="{$name_view_hs}"{$input_size_at}>\n
+<input type="{$type}" name="conf_edit[{$name}]" value="{$name_view_hs}"{$input_size_at}>\n
EOP;
$def_views[$name] = hs($conf_user_def[$name]);
}
@@ -470,6 +495,12 @@
// \x8Cg\x91їp
} else {
// [{$name}]<br>
+
+ // \x8Cg\x91їp\x95\\x8E\xA6\x95\xB6\x8E\x9A\x97\xF1\x91S\x8Ap\x81\xA8\x94\xBC\x8Ap\x95ϊ\xB7
+ if ($_conf['k_save_packet']) {
+ $description_ht = mb_convert_kana($description_ht, 'rnsk');
+ }
+
$r = <<<EOP
{$description_ht}<br>
{$form_ht}<br>
@@ -495,6 +526,7 @@
// continue;
//}
$selected = '';
+
if ($_conf[$name] == (string)$key) {
$selected = ' checked';
}
Modified: p2/trunk/edit_conf_user_i.php
===================================================================
--- p2/trunk/edit_conf_user_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/edit_conf_user_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -108,8 +108,8 @@
<body onLoad="top.document.title=self.document.title;">
<div class="toolbar">
-<h1 id="pageTitle"><?php eh($ptitle); ?></h1>
-<a name="top" id="backButton" class="button" href="<?php eh($index_uri); ?>">TOP</a>
+<h1 class="pageTitle"><?php eh($ptitle); ?></h1>
+<a name="top" id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a>
</div>
<?php
@@ -170,16 +170,20 @@
echo getEditConfHtml('sb_sort_ita', '\x94•\\x8E\xA6\x82̃X\x83\x8C\x83b\x83h\x88ꗗ\x82ł̃f\x83t\x83H\x83\x8B\x83g\x82̃\\x81[\x83g\x8Ew\x92\xE8');
echo getEditConfHtml('sort_zero_adjust', '\x90V\x92\x85\x83\\x81[\x83g\x82ł́u\x8A\xF9\x93\xBE\x82Ȃ\xB5\x81v\x82́u\x90V\x92\x85\x90\x94\x83[\x83\x8D\x81v\x82ɑ\xB7\x82\xE9\x83\\x81[\x83g\x97D\x90揇\x88\xCA');
echo getEditConfHtml('cmp_dayres_midoku', '\x90\xA8\x82\xA2\x83\\x81[\x83g\x8E\x9E\x82ɐV\x92\x85\x83\x8C\x83X\x82̂\xA0\x82\xE9\x83X\x83\x8C\x82\xF0\x97D\x90\xE6');
-//echo getEditConfHtml('k_sb_disp_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x82̐\x94');
+echo getEditConfHtml('k_sb_disp_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x82̐\x94');
echo getEditConfHtml('i_sb_disp_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x83\x8A\x83X\x83g\x82̐\x94');
echo getEditConfHtml('viewall_kitoku', '\x8A\xF9\x93\xBE\x83X\x83\x8C\x82͕\\x8E\xA6\x8C\x8F\x90\x94\x82Ɋւ\xED\x82炸\x95\\x8E\xA6');
echo getGroupSepaHtml('read');
echo getEditConfHtml('respointer', '\x83X\x83\x8C\x93\xE0\x97e\x95\\x8E\xA6\x8E\x9E\x81A\x96\xA2\x93ǂ̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82Ƀ|\x83C\x83\x93\x83^\x82\xF0\x8D\x87\x82킹\x82邩');
+echo getEditConfHtml('respointer_i', '\x83X\x83}\x83z\x82ŃX\x83\x8C\x93\xE0\x97e\x95\\x8E\xA6\x8E\x9E\x81A\x96\xA2\x93ǂ̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82Ƀ|\x83C\x83\x93\x83^\x82\xF0\x8D\x87\x82킹\x82邩');
echo getEditConfHtml('before_respointer', 'PC\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+echo getEditConfHtml('before_respointer_i', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+echo getEditConfHtml('before_respointer_k', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
echo getEditConfHtml('before_respointer_new', '\x90V\x92\x85\x82܂Ƃߓǂ݂̎\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
-echo getEditConfHtml('rnum_all_range', '\x90V\x92\x85\x82܂Ƃߓǂ݂ň\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x90\x94');
+echo getEditConfHtml('before_respointer_new_i', '\x83X\x83}\x83z\x82ŐV\x92\x85\x82܂Ƃߓǂ݂̎\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+echo getEditConfHtml('rnum_all_range', '\x90V\x92\x85\x82܂Ƃߓǂ݂ň\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x8Dő僌\x83X\x90\x94');
echo getEditConfHtml('preview_thumbnail', '\x89摜URL\x82̐\xE6\x93ǂ݃T\x83\x80\x83l\x83C\x83\x8B\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('pre_thumb_limit', '\x89摜URL\x82̐\xE6\x93ǂ݃T\x83\x80\x83l\x83C\x83\x8B\x82\xF0\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82鐧\x8C\xC0\x90\x94');
//echo getEditConfHtml('preview_thumbnail', '\x89摜\x83T\x83\x80\x83l\x83C\x83\x8B\x82̏c\x82̑傫\x82\xB3\x82\xF0\x8Ew\x92\xE8 (\x83s\x83N\x83Z\x83\x8B)');
@@ -193,19 +197,22 @@
echo getEditConfHtml('flex_idpopup', '\x83X\x83\x8C\x93\xE0\x82œ\xAF\x82\xB6 ID:xxxxxxxx \x82\xAA\x82\xA0\x82\xEA\x82AID\x83t\x83B\x83\x8B\x83^\x97p\x82̃\x8A\x83\x93\x83N\x82ɕϊ\xB7');
echo getEditConfHtml('ext_win_target', '\x8AO\x95\x94\x83T\x83C\x83g\x93\x99\x82փW\x83\x83\x83\x93\x83v\x82\xB7\x82鎞\x82ɊJ\x82\xAD\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x81[\x83Q\x83b\x83g\x96\xBC');
echo getEditConfHtml('bbs_win_target', 'p2\x91Ή\x9EBBS\x83T\x83C\x83g\x93\xE0\x82ŃW\x83\x83\x83\x93\x83v\x82\xB7\x82鎞\x82ɊJ\x82\xAD\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x81[\x83Q\x83b\x83g\x96\xBC');
-echo getEditConfHtml('bottom_res_form', '\x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82ɏ\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82\xF0\x95\\x8E\xA6');
+echo getEditConfHtml('bottom_res_form', 'PC \x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82ɏ\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('quote_res_view', '\x88\xF8\x97p\x83\x8C\x83X\x82\xF0\x81i\x83|\x83b\x83v\x83A\x83b\x83v\x81j\x95\\x8E\xA6');
echo getEditConfHtml('enable_headbar', 'PC \x83w\x83b\x83h\x83o\x81[\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('enable_spm', '\x83\x8C\x83X\x94ԍ\x86\x82\xA9\x82\xE7\x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[(SPM)\x82\xF0\x95\\x8E\xA6');
//echo getEditConfHtml('spm_kokores', '\x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x82Łu\x82\xB1\x82\xEA\x82Ƀ\x8C\x83X\x81v\x82\xF0\x95\\x8E\xA6');
+echo getEditConfHtml('i_rnum_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
+echo getEditConfHtml('i_post_msg_rows', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍\x82\x82\xB3\x81i\x8Ds\x90\x94\x81j');
-echo getEditConfHtml('i_rnum_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
+echo getEditConfHtml('k_rnum_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
+
echo getEditConfHtml('ktai_res_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x82‚̃\x8C\x83X\x82̍ő\xE5\x95\\x8E\xA6\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
echo getEditConfHtml('ktai_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB5\x82\xBD\x82Ƃ\xAB\x82̕\\x8E\xA6\x83T\x83C\x83Y');
echo getEditConfHtml('k_aa_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81AAA\x82炵\x82\xAB\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB7\x82\xE9\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
-echo getEditConfHtml('before_respointer_i', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+
echo getEditConfHtml('k_use_tsukin', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94\x83\x8A\x83\x93\x83N\x82ɒʋu\x83\x89\x83E\x83U(\x92\xCA)\x82𗘗p');
echo getEditConfHtml('k_use_picto', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x89摜\x83\x8A\x83\x93\x83N\x82\xC9pic.to(\xCB\xDF)\x82𗘗p');
@@ -225,14 +232,21 @@
echo getEditConfHtml('k_acolor', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8A\xEE\x96{\x83\x8A\x83\x93\x83N\x90F\x81iHTML\x83J\x83\x89\x81[\x81j');
echo getEditConfHtml('k_acolor_v', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8A\xEE\x96{\x96K\x96\xE2\x8Dς݃\x8A\x83\x93\x83N\x90F\x81iHTML\x83J\x83\x89\x81[\x81j');
echo getEditConfHtml('k_post_msg_cols', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̉\xA1\x95\x9D');
-echo getEditConfHtml('k_post_msg_rows', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍\x82\x82\xB3');
+echo getEditConfHtml('k_post_msg_rows', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̍\x82\x82\xB3\x81i\x8Ds\x90\x94\x81j');
echo getGroupSepaHtml('ETC');
-echo getEditConfHtml('frame_menu_width', '\x83t\x83\x8C\x81[\x83\x80\x8D\xB6 \x94ƒ\x81\x83j\x83\x85\x81[ \x82̕\\x8E\xA6\x95\x9D');
-echo getEditConfHtml('frame_subject_width', '\x83t\x83\x8C\x81[\x83\x80\x89E\x8F\xE3 \x83X\x83\x8C\x88ꗗ \x82̕\\x8E\xA6\x95\x9D');
-echo getEditConfHtml('frame_read_width', '\x83t\x83\x8C\x81[\x83\x80\x89E\x89\xBA \x83X\x83\x8C\x96{\x95\xB6 \x82̕\\x8E\xA6\x95\x9D');
+echo getEditConfHtml('fontsize', 'PC \x8A\xEE\x96{\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('menu_fontsize', 'PC \x83\x81\x83j\x83\x85\x81[\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('sb_fontsize', 'PC \x83X\x83\x8C\x88ꗗ\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('read_fontsize', 'PC \x83X\x83\x8C\x93\xE0\x97e\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x81iCSS\x92l font-size\x81j');
+echo getEditConfHtml('frame_menu_width', '\x94ƒ\x81\x83j\x83\x85\x81[\x81i\x83t\x83\x8C\x81[\x83\x80\x8D\xB6\x81j\x82̕\\x8E\xA6\x95\x9D');
+echo getEditConfHtml('frame_subject_width', '\x83X\x83\x8C\x88ꗗ\x81i\x83t\x83\x8C\x81[\x83\x80\x89E\x8F\xE3\x81j\x82̕\\x8E\xA6\x95\x9D');
+echo getEditConfHtml('frame_read_width', '\x83X\x83\x8C\x96{\x95\xB6\x81i\x83t\x83\x8C\x81[\x83\x80\x89E\x89\xBA\x81j\x82̕\\x8E\xA6\x95\x9D');
+
+echo getEditConfHtml('pane_mode', '3\x83y\x83C\x83\x93\x89\xE6\x96ʂ̃t\x83\x8C\x81[\x83\x80\x82̕\xC0\x82ו\xFB');
+
echo getEditConfHtml('my_FROM', '\x83\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82ݎ\x9E\x82̃f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x91O');
echo getEditConfHtml('my_mail', '\x83\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82ݎ\x9E\x82̃f\x83t\x83H\x83\x8B\x83g\x82\xCCmail');
@@ -243,19 +257,20 @@
echo getEditConfHtml('res_hist_rec_num', '\x8F\x91\x82\xAB\x8D\x9E\x82ݗ\x9A\x97\xF0\x82̋L\x98^\x90\x94');
echo getEditConfHtml('res_write_rec', '\x8F\x91\x82\xAB\x8D\x9E\x82ݓ\xE0\x97e\x83\x8D\x83O\x82\xF0\x8BL\x98^');
echo getEditConfHtml('through_ime', '\x8AO\x95\x94URL\x83W\x83\x83\x83\x93\x83v\x82\xB7\x82\xE9\x8Dۂɒʂ\xB7\x83N\x83b\x83V\x83\x87\x83\x93\x83y\x81[\x83W');
+echo getEditConfHtml('through_ime_k', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94URL\x83N\x83b\x83V\x83\x87\x83\x93\x82𗘗p\x81i\x81\xA6\x97\x98\x97p\x82𐄏\xA7\x81j');//.\x81i\x81\xA6Cookie\x96\xB3\x8C\xF8\x8E\x9E\x82́A\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8F\xE3\x82̗\x9D\x97R\x82\xA9\x82炱\x82̐ݒ\xE8\x92l\x82Ɋւ\xED\x82炸\x83N\x83b\x83V\x83\x87\x83\x93\x82\xAA\x97\x98\x97p\x82\xB3\x82\xEA\x82܂\xB7\x81j');
+echo getEditConfHtml('k_jig_host', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x8AO\x95\x94URL\x83N\x83b\x83V\x83\x87\x83\x93\x82\xC5jig\x83u\x83\x89\x83E\x83UWEB\x82𗘗p\x82\xB7\x82\xE9<br>
+ (\x83z\x83X\x83g\x96\xBC\x81B\x81uhttp://<font color="red">XXXXXX</font>.jig.jp/fweb/?_jig_=\x81v\x82\xCC <font color="red">XXXXXX</font> \x95\x94\x95\xAA)');
echo getEditConfHtml('join_favrank', '<a href="http://akid.s17.xrea.com/favrank/favrank.html" target="_blank">\x82\xA8\x8BC\x82ɃX\x83\x8C\x8B\xA4\x97L</a>\x82ɎQ\x89\xC1');
echo getEditConfHtml('enable_menu_new', '\x94ƒ\x81\x83j\x83\x85\x81[\x82ɐV\x92\x85\x90\x94\x82\xF0\x95\\x8E\xA6');
echo getEditConfHtml('menu_refresh_time', '\x94ƒ\x81\x83j\x83\x85\x81[\x95\x94\x95\xAA\x82̎\xA9\x93\xAE\x8DX\x90V\x8AԊu (\x95\xAA\x8Ew\x92\xE8\x81B0\x82Ȃ玩\x93\xAE\x8DX\x90V\x82\xB5\x82Ȃ\xA2\x81B)');
echo getEditConfHtml('mobile.match_color', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83t\x83B\x83\x8B\x83^\x83\x8A\x83\x93\x83O\x82Ń}\x83b\x83`\x82\xB5\x82\xBD\x83L\x81[\x83\x8F\x81[\x83h\x82̐F');
echo getEditConfHtml('k_save_packet', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83p\x83P\x83b\x83g\x97ʂ\xF0\x8C\xB8\x82炷\x82\xBD\x82߁A\x91S\x8Ap\x89p\x90\x94\x81E\x83J\x83i\x81E\x83X\x83y\x81[\x83X\x82p\x82ɕϊ\xB7');
echo getEditConfHtml('ngaborn_daylimit', '\x82\xB1\x82̊\xFA\x8AԁANG\x82\xA0\x82ځ[\x82\xF1\x82\xC9HIT\x82\xB5\x82Ȃ\xAF\x82\xEA\x82A\x93o\x98^\x83\x8F\x81[\x83h\x82\xF0\x8E\xA9\x93\xAE\x93I\x82ɊO\x82\xB7\x81i\x93\xFA\x90\x94\x81j');
+
echo getEditConfHtml('proxy_use', '\x83v\x83\x8D\x83L\x83V\x82𗘗p');
echo getEditConfHtml('proxy_host', '\x83v\x83\x8D\x83L\x83V\x83z\x83X\x83g ex)"127.0.0.1", "www.p2proxy.com"');
echo getEditConfHtml('proxy_port', '\x83v\x83\x8D\x83L\x83V\x83|\x81[\x83g ex)"8080"');
-echo getEditConfHtml('precede_openssl', '\x81\x9C\x83\x8D\x83O\x83C\x83\x93\x82\xF0\x81A\x82܂\xB8\x82\xCDopenssl\x82Ŏ\x8E\x82݂\xE9\x81B\x81\xA6PHP 4.3.0\x88ȍ~\x82ŁAOpenSSL\x82\xAA\x90ÓI\x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B');
-echo getEditConfHtml('precede_phpcurl', 'curl\x82\xF0\x8Eg\x82\xA4\x8E\x9E\x81A\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x94ł\xC6PHP\x8A\x94\x94łǂ\xBF\x82\xE7\x82\xF0\x97D\x90悷\x82邩');
-
?><div><?php
echo $htm['form_submit'];
?></div>
@@ -360,18 +375,41 @@
return '';
}
+ $excepts = array();
+
+ // \x81i\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8Fꍇ\x82\xE0hidden\x92l\x82͕K\x97v\x81j
+
+ // \x83X\x83}\x83z\x81A\x8Cg\x91тł͕ҏW\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8D\x80\x96\xDA
+ if (UA::isIPhoneGroup() || UA::isK()) {
+ $excepts = array_merge($excepts, array(
+ 'refresh_time', 'sb_show_motothre', 'sb_show_one', 'before_respointer',
+ 'rnum_all_range', 'show_datsize_in_footer', 'bottom_res_form', 'enable_headbar',
+ 'frame_menu_width', 'frame_subject_width', 'frame_read_width', 'pane_mode'
+ ));
+ }
+
+ // \x83X\x83}\x83z\x82ł͕ҏW\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8D\x80\x96\xDA
+ if (UA::isIPhoneGroup()) {
+ $excepts = array_merge($excepts, array(
+ 'k_sb_disp_range', 'respointer', 'before_respointer_k', 'k_rnum_range', 'k_copy_divide_len',
+ 'read_k_thread_title_color', 'k_bgcolor', 'k_color', 'k_acolor', 'k_acolor_v',
+ 'k_post_msg_cols', 'k_post_msg_rows', 'fontsize', 'menu_fontsize', 'sb_fontsize', 'read_fontsize',
+ 'through_ime_k', 'k_jig_host'
+ ));
+
// \x8Cg\x91тł͕ҏW\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x8D\x80\x96\xDA
- if (UA::isK()) {
- $noKtais = array(
- 'enable_headbar', 'enable_spm', 'spm_kokores',
- 'frame_menu_width', 'frame_subject_width', 'frame_read_width'
+ } elseif (UA::isK()) {
+ $excepts = array_merge($excepts, array(
+ 'i_sb_disp_range', 'respointer_i', 'before_respointer_i', 'before_respointer_new_i', 'iframe_popup',
+ 'quote_res_view', 'enable_spm', 'i_rnum_range', 'i_post_msg_rows', 'spm_kokores'
+ ));
+ }
+
+ if (in_array($name, $excepts)) {
+ return sprintf(
+ '<input type="hidden" name="conf_edit[%s]" value="%s">' . "\n",
+ hs($name), hs($_conf[$name])
);
- if (in_array($name, $noKtais)) {
- return sprintf(
- '<input type="hidden" name="conf_edit[%s]" value="%s">' . "\n",
- hs($name), hs($_conf[$name])
- );
- }
}
$name_value_hs = hs($_conf[$name]);
Modified: p2/trunk/edit_indexmenui.php
===================================================================
--- p2/trunk/edit_indexmenui.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/edit_indexmenui.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -72,8 +72,8 @@
}
?>
<div class="toolbar">
-<h1 id="pageTitle">\x83\x81\x83j\x83\x85\x81[\x95\xC0\x91\xD6</h1>
-<a id="backButton" class="button" href="<?php eh($index_uri); ?>">TOP</a>
+<h1 class="pageTitle">\x83\x81\x83j\x83\x85\x81[\x95\xC0\x91\xD6</h1>
+<a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a>
</div>
<div class="panel"><filedset>
<table>
Modified: p2/trunk/editfavita_i.php
===================================================================
--- p2/trunk/editfavita_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/editfavita_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -81,8 +81,8 @@
</head>
<body>
<div class="toolbar">
-<h1 id="pageTitle">\x82\xA8\x8BC\x82ɔ•ҏW</h1>
-<a class="button" id="backbutton" href="<?php eh($index_uri); ?>">TOP</a>
+<h1 class="pageTitle">\x82\xA8\x8BC\x82ɔ•ҏW</h1>
+<a class="tbutton" id="backbutton" href="<?php eh($index_uri); ?>">TOP</a>
</div>
<?php
Modified: p2/trunk/editpref_i.php
===================================================================
--- p2/trunk/editpref_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/editpref_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -83,7 +83,7 @@
array(UA::getQueryKey() => UA::getQueryValue())
),
hs('\x83\x86\x81[\x83U\x90ݒ\xE8'), // \x83\x86\x81[\x83U\x90ݒ\xE8\x95ҏW
- array('class' => 'button')
+ array('class' => 'tbutton')
);
$edit_conf_user_atag = P2View::tagA(
@@ -132,8 +132,8 @@
?>
<div class="toolbar">
-<h1 id="pageTitle"><?php eh($ptitle); ?></h1>
-<a id="backButton" class="button" href="<?php eh($index_uri); ?>">TOP</a>
+<h1 class="pageTitle"><?php eh($ptitle); ?></h1>
+<a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a>
<?php echo $edit_conf_user_button_atag; ?>
</div>
<?php
Modified: p2/trunk/info_i.php
===================================================================
--- p2/trunk/info_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/info_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,15 +1,9 @@
<?php
/*
- p2 - \x83X\x83\x8C\x83b\x83h\x8F\xEE\x95\xF1\x83E\x83B\x83\x93\x83h\x83E
+ p2 - \x83X\x83\x8C\x83b\x83h\x8F\xEE\x95\xF1\x83E\x83B\x83\x93\x83h\x83E\x81i\x83X\x83}\x83z\x81j
*/
-/*
-iphone \x82ŃX\x83\x8C\x8F\xEE\x95\xF1\x82\xF0\x95\\x8E\xA6\x82\xB7\x82鎞\x82́A\x97ގ\x97\x83X\x83\x8C\x82Ɠ\xAF\x8E\x9E\x82ɕ\\x8E\xA6\x82\xB3\x82\xB9\x82Ă邽\x82\xDF subject_i.php \x82\xA9\x82\xE7\x8CĂяo\x82\xB3\x82\xEA\x82\xE9\x81B
-subject_i.php \x82\xA9\x82\xE7\x82\xCC info_i.php \x93ǂݍ\x9E\x82݂͗͋ƂȂ̂łǂ\xA4\x82\xA9\x82Ƃ\xE0\x8Ev\x82\xA4\x82Ƃ\xB1\x82\xEB\x81c\x81B
-*/
-if (_isCalledAsStandAlone()) {
- require_once './conf/conf.inc.php';
-}
+require_once './conf/conf.inc.php';
require_once P2_LIB_DIR . '/Thread.php';
require_once P2_LIB_DIR . '/dele.funcs.php'; // \x8D폜\x8F\x88\x97\x9D\x97p\x82̊\x94\x8CS
@@ -254,8 +248,6 @@
$hs = array_map('hs', $hc);
-// \x82\xB1\x82\xB1\x82\xE0\x8Fd\x95\xA1\x82\xB5\x82Ȃ\xA2\x82悤\x82\xC9
-if (_isCalledAsStandAlone()) {
P2Util::headerNoCache();
P2View::printDoctypeTag();
@@ -265,11 +257,8 @@
<?php
P2View::printExtraHeadersHtml();
P2View::printStyleTagImportIuiCss();
-echo <<<EOHEADER
- <title>{$hs['title']}</title>\n
-EOHEADER;
-} // if (_isCalledAsStandAlone())
+?><title><?php echo $hs['title'] ?></title><?php
$body_onload = '';
if (isset($_GET['popup']) and $_GET['popup'] == 2) {
@@ -277,27 +266,23 @@
$body_onload = ' onLoad="startTimer(document.getElementById(\'timerbutton\'))"';
}
-if (_isCalledAsStandAlone()) {
-
// html \x83v\x83\x8A\x83\x93\x83g\x83w\x83b\x83h iPhone\x97p
?>
- </head>
- <body<?php echo $body_onload; ?>>
- <div class="toolbar">
- <h1 id="pageTitle">\x83X\x83\x8C\x8F\xEE\x95\xF1</h1>
- <a id="backButton" class="button" href="<?php eh($index_uri); ?>">TOP</a>
- </div>
+</head>
+<body id="info_i"<?php echo $body_onload; ?>>
+<div class="toolbar">
+<h1 class="pageTitle">\x83X\x83\x8C\x8F\xEE\x95\xF1</h1>
+<a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a>
+</div>
<?php
-} // if (_isCalledAsStandAlone())
+?><div class="panel"><?php
-?><ul><li class="group">\x83X\x83\x8C\x8F\xEE\x95\xF1</li></ul><div class="panel"><?php
-
P2Util::printInfoHtml();
?>
<h2><?php echo $hs['ttitle_name']; ?></b></h2>
-<fieldset>
+
<?php
// \x8Cg\x91тȂ\xE7\x96`\x93\xAA\x82ŏ\xEE\x95b\x83Z\x81[\x83W\x95\\x8E\xA6
@@ -307,6 +292,8 @@
}
}
+?><div class="infocard"><?php
+
//printInfoTrHtml("\x8C\xB3\x83X\x83\x8C", "<a href=\"{$motothre_url}\"{$target_read_at}>{$motothre_url}</a>");
//printInfoTrHtml("\x83z\x83X\x83g", $aThread->host);
@@ -354,8 +341,7 @@
_printInfoTrHtml('\x83z\x83X\x83g', $host_ht);
// \x94\xC2
-$ita_uri = UriUtil::buildQueryUri(
- $_conf['subject_php'],
+$ita_uri = UriUtil::buildQueryUri($_conf['subject_php'],
array(
'host' => $aThread->host,
'bbs' => $aThread->bbs,
@@ -457,14 +443,11 @@
// }}}
-?></filedset></div><?php
+?></div></div><?php
-if (_isCalledAsStandAlone()) {
- ?></body></html><?php
- exit;
-}
+?></body></html><?php
-// exit;
+exit;
//========================================================================
// \x8A\x94 \x81i\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x93\xE0\x82ł̂ݗ\x98\x97p\x81j
@@ -478,8 +461,7 @@
{
global $_conf;
- // iPhone
- echo "<div class=\"row\">\n<label>{$s}</label><span>{$c_ht}</span></div>\n";
+ ?><div class="inforow"><label><?php echo $s; ?></label><div class="inforowcont"><?php echo $c_ht; ?></div></div><?php
}
/**
@@ -598,14 +580,6 @@
}
/**
- * @return boolean
- */
-function _isCalledAsStandAlone()
-{
- return (basename($_SERVER['SCRIPT_NAME']) == 'info_i.php');
-}
-
-/**
* \x82Ȃ\xA2\x82܂\xA2\x82\xBF\x82\xBE\x82\xAF\x82ǁA\x89\xA1\x95\x9D\x82\xAA\x92\xB7\x82\xAD\x82Ȃ\xE9\x82̂ɑ\xF4\x81B
*
* @return string HTML
Modified: p2/trunk/iphone/ShowBrdMenuK.php
===================================================================
--- p2/trunk/iphone/ShowBrdMenuK.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/ShowBrdMenuK.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -32,27 +32,29 @@
if ($disp_navi['from'] > 1) {
$mae_ht = <<<EOP
-<span class="mae"><a href="{$_conf['menu_k_php']}?view=cate&from={$disp_navi['mae_from']}&nr=1{$_conf['k_at_a']}">\x91O</a></span>
+<li class="prev"><a href="{$_conf['menu_k_php']}?view=cate&from={$disp_navi['mae_from']}&nr=1{$_conf['k_at_a']}">\x91O</a></li>
EOP;
} else {
- $mae_ht = '';
+ $mae_ht = '<li class="prev_disabled"></li>';
}
if ($disp_navi['end'] < $list_disp_all_num) {
$tugi_ht = <<<EOP
-<span class="tugi"><a href="{$_conf['menu_k_php']}?view=cate&from={$disp_navi['tugi_from']}&nr=1{$_conf['k_at_a']}">\x8E\x9F</a></span>
+<li class="next"><a href="{$_conf['menu_k_php']}?view=cate&from={$disp_navi['tugi_from']}&nr=1{$_conf['k_at_a']}">\x8E\x9F</a></li>
EOP;
} else {
- $tugi_ht = '';
+ $tugi_ht = '<li class="next_disabled"></li>';
}
-
- if (!$disp_navi['all_once']) {
+
+ $index_ht = sprintf('<li class="home"><a href="%s">TOP</a></li>',
+ UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()))
+ );
+ $list_navi_ht = '';
+ //if (!$disp_navi['all_once']) {
$list_navi_ht = <<<EOP
-<div class="foot_sure" id="foot">\n{$mae_ht} \n{$tugi_ht}\n</div>
+<div id="footToolbar" class="footbar"><ul>{$index_ht}{$mae_ht}{$tugi_ht}</ul></div>
EOP;
- } else {
- $list_navi_ht = '';
- }
+ //}
if (UA::isIPhoneGroup()) {
?><ul id="home"><li class="group">\x94ˆꗗ</li><?php
@@ -107,25 +109,28 @@
if ($disp_navi['from'] > 1) {
$mae_ht = <<<EOP
-<span class="mae"><a href="{$_conf['menu_k_php']}?cateid={$this->cate_id}&from={$disp_navi['mae_from']}&nr=1{$_conf['k_at_a']}">\x91O</a></span>
+<li class="prev"><a href="{$_conf['menu_k_php']}?cateid={$this->cate_id}&from={$disp_navi['mae_from']}&nr=1{$_conf['k_at_a']}">\x91O</a></li>
EOP;
} else {
- $mae_ht = '';
+ $mae_ht = '<li class="prev_disabled"></li>';
}
if ($disp_navi['end'] < $list_disp_all_num) {
$tugi_ht = <<<EOP
-<span class="tugi"><a href="{$_conf['menu_k_php']}?cateid={$this->cate_id}&from={$disp_navi['tugi_from']}&nr=1{$_conf['k_at_a']}">\x8E\x9F</a><span>
+<li class="next"><a href="{$_conf['menu_k_php']}?cateid={$this->cate_id}&from={$disp_navi['tugi_from']}&nr=1{$_conf['k_at_a']}">\x8E\x9F</a></li>
EOP;
} else {
- $tugi_ht = '';
+ $tugi_ht = '<li class="next_disabled"></li>';
}
- if (!$disp_navi['all_once']) {//{$disp_navi['range_st']}
+ $index_ht = sprintf('<li class="home"><a href="%s">TOP</a></li>',
+ UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()))
+ );
+ //if (!$disp_navi['all_once']) {//{$disp_navi['range_st']}
$list_navi_ht = <<<EOP
-<div id="foot" class="foot_sure">{$mae_ht} {$tugi_ht}</div>
+<div id="footToolbar" class="footbar"><ul>{$index_ht}{$mae_ht}{$tugi_ht}</ul></div>
EOP;
- }
+ //}
if (UA::isIPhoneGroup()) {
echo '<ul>';
@@ -203,32 +208,34 @@
$range = $_conf['i_sb_disp_range'];
$disp_navi = P2Util::getListNaviRange($list_disp_from, $range, $list_disp_all_num);
+ $threti_q = isset($_REQUEST['threti']) ? '&threti=' . hs($_REQUEST['threti']) : '';
$detect_hint_q = 'detect_hint=' . urlencode('\x81\x9D\x81\x9E');
$word_q = '&word=' . rawurlencode($GLOBALS['word']);
if ($disp_navi['from'] > 1) {
$mae_ht = <<<EOP
-<span class="mae"><a href="{$_conf['menu_k_php']}?{$detect_hint_q}{$word_q}&from={$disp_navi['mae_from']}&nr=1{$_conf['k_at_a']}">\x91O</a> </span>
+<li class="prev"><a href="{$_conf['menu_k_php']}?{$detect_hint_q}{$word_q}{$threti_q}&from={$disp_navi['mae_from']}&nr=1{$_conf['k_at_a']}">\x91O</a></li>
EOP;
} else {
- $mae_ht = '';
+ $mae_ht = '<li class="prev_disabled"></li>';
}
if ($disp_navi['end'] < $list_disp_all_num) {
$tugi_ht = <<<EOP
-<span class="tugi"><a href="{$_conf['menu_k_php']}?{$detect_hint_q}{$word_q}&from={$disp_navi['tugi_from']}&nr=1{$_conf['k_at_a']}">\x8E\x9F</a> </span>
+<li class="next"><a href="{$_conf['menu_k_php']}?{$detect_hint_q}{$word_q}{$threti_q}&from={$disp_navi['tugi_from']}&nr=1{$_conf['k_at_a']}">\x8E\x9F</a></li>
EOP;
} else {
- $tugi_ht = '';
+ $tugi_ht = '<li class="next_disabled"></li>';
}
- if (!$disp_navi['all_once']) {//{$disp_navi['range_st']} iphone
+ $index_ht = sprintf('<li class="home"><a href="%s">TOP</a></li>',
+ UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()))
+ );
+ //if (!$disp_navi['all_once']) {//{$disp_navi['range_st']} iphone
$list_navi_ht = <<<EOP
-<div class="foot_sure" id="foot">\n{$mae_ht}\n{$tugi_ht}\n</div>
+<div id="footToolbar" class="footbar"><ul>{$index_ht}{$mae_ht}{$tugi_ht}</ul></div>
EOP;
- } else {
- $list_navi_ht = '';
- }
+ //}
// }}}
@@ -290,7 +297,7 @@
if (file_exists($_conf['favita_path']) and $lines = file($_conf['favita_path'])) {
echo '<ul id="home"><li class="group">\x82\xA8\x8BC\x82ɓ\xFC\x82\xE8\x88ꗗ</li>';
- echo '<a class="button" href="editfavita_i.php">\x95ҏW</a>';
+ echo '<a class="tbutton" href="editfavita_i.php">\x95ҏW</a>';
// echo '<ul><li><a href="editfavita.php?b=k">\x95ҏW</a></li><li class="group">\x82\xA8\x8BC\x82ɓ\xFC\x82\xE8\x88ꗗ</li>';
$i = 0;
foreach ($lines as $l) {
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/ShowThreadK.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -71,7 +71,7 @@
!isset($GLOBALS['_shown_resnum']) and $GLOBALS['_shown_resnum'] = 0;
// 1\x82\xF0\x95\\x8E\xA6\x81i\x94͈͊O\x82̃P\x81[\x83X\x82\xE0\x82\xA0\x82\xE9\x82̂ł\xB1\x82\xB1\x82Łj
- if (!$nofirst) {
+ if ($start == 1 || !$nofirst) {
if ($this->thread->resrange_multi and $GLOBALS['_skip_resnum']) {
$GLOBALS['_skip_resnum']--;
} else {
@@ -98,8 +98,8 @@
}
}
- // 1\x82\xAA\x91O\x92i\x8F\x88\x97\x9D\x82Ŋ\xF9\x95\\x8E\xA6\x82Ȃ\xE7\x83X\x83L\x83b\x83v
- if (!$nofirst and $i == 1) {
+ // 1\x82͏\x88\x97\x9D\x8Dς݂̂\xBD\x82߃X\x83L\x83b\x83v
+ if ($i == 1) {
continue;
}
if (!$this->thread->datlines[$i - 1]) {
@@ -341,22 +341,23 @@
// \x83\x8C\x83X\x83|\x83b\x83v\x83A\x83b\x83v\x97p\x88\xF8\x97p
$tores .= $rpop;
+ $tores .= sprintf('<div id="r%s" name="r%s" class="rdiv">', $i, $i); // \x88\xEA\x82‚̃\x8C\x83X\x8BL\x8E\x96 (jsanc)
$tores .= '<div class="nameline">'; // \x83\x8C\x83X\x94ԍ\x86\x81A\x96\xBC\x91O\x81A\x93\xFA\x95t\x8Ds
// \x94ԍ\x86\x81i\x83I\x83\x93\x83U\x83t\x83\x89\x83C\x8E\x9E\x81j
if ($this->thread->onthefly) {
$GLOBALS['newres_to_show_flag'] = true;
- $rnum_ht = "<font color=\"#00aa00\">{$i}</font>";
+ $rnum_ht = sprintf('<span class="trnum" style="color:#00aa00">%s</font>', $i);
// \x94ԍ\x86\x81i\x90V\x92\x85\x83\x8C\x83X\x8E\x9E\x81j
} elseif ($i > $this->thread->readnum) {
$GLOBALS['newres_to_show_flag'] = true;
- $rnum_ht = "<font color=\"{$STYLE['read_newres_color']}\">{$is}</font>";
+ $rnum_ht = sprintf('<span class="trnum" style="color:%s;">%s</span>', $STYLE['read_newres_color'], $is);
// \x94ԍ\x86
} else {
$rnum_ht = $is;
}
- $tores .= sprintf('<span class="trnum">[%s]</span> ', $rnum_ht);
+ $tores .= sprintf('<span class="trnum">%s</span> ', $rnum_ht);
//$tores .= ' ';
@@ -372,7 +373,7 @@
$is_sage = true;
} else {
//$tores .= $mail . " :";
- $tores .= ':<span class="tmail">' . StrSjis::fixSjis($mail) . '</span>';
+ $tores .= '<span class="tmail">:' . StrSjis::fixSjis($mail) . '</span>';
}
}
@@ -427,8 +428,9 @@
$tores .="</div>\n"; // End of \x96\xBC\x91O\x82Ɠ\xFA\x95t\x82\xC6ID\x82̍s
- $tores .= sprintf('<div class="rbody" id="r%s" name="r%s">%s</div>', $i, $i, $msg); // \x83\x8C\x83X\x96{\x95\xB6
- $tores .= "\n";
+ $tores .= sprintf('<div class="rbody">%s</div>', $msg); // \x83\x8C\x83X\x96{\x95\xB6
+
+ $tores .= "</div>\n";
// \x82܂Ƃ߂ăt\x83B\x83\x8B\x83^\x90F\x95\xAA\x82\xAF
if (strlen($GLOBALS['word_fm']) && $GLOBALS['res_filter']['match'] != 'off') {
@@ -447,13 +449,16 @@
// 080809 \x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x82̔w\x8Ci\x90F\x8D폜 iPhone\x97p
$STYLE['respop_bgcolor'] = '';
+
// {{{ iphone \x88\xF8\x97p\x82\xB5\x82ă\x8C\x83X
- // \x83\x8C\x83X\x82ƈ\xF8\x97p\x83\x8C\x83X\x82\xAA\x91S\x82\xC42\x8Fd\x82ɖ\x84\x82ߍ\x9E\x82܂\xEA\x82Ă\xA2\x82\xE9\x81B
- // \x96\x84\x82ߍ\x9E\x82݂\xB5\x82Ȃ\xA2\x82ŃA\x83N\x83V\x83\x87\x83\x93\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82Ƃ\xAB\x82ɌĂяo\x82\xB5\x82\xBD\x82\xA2\x81B
+ // \x83\x8C\x83X\x96{\x95\xB6\x82ƈ\xF8\x97p\x83\x8C\x83X\x97p\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xAA\x91S\x82\xC42\x8Fd\x82ɖ\x84\x82ߍ\x9E\x82܂\xEA\x82Ă\xA2\x82\xE9\x81B
+ // @see resQuoteMessage()
+ // [todo]\x96\x84\x82ߍ\x9E\x82݂\xB5\x82Ȃ\xA2\x82ŃA\x83N\x83V\x83\x87\x83\x93\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82Ƃ\xAB\x82ɌĂяo\x82\xB7\x82悤\x82ɂ\xB5\x82\xBD\x82\xA2\x82\xAF\x82ǁB
$quoteMsg = $msg;
+ // \x88\xF8\x97p\x83\x8A\x83\x93\x83N >>n \x82\xCC<a>\x83^\x83O\x82\xF0\x8AO\x82\xB7
if (preg_match(
'~(.*)<a href="[^"]+" target="_blank">(\>)*([0-9]{1,4})</a>([\\x00-\\xff]+)~im',
$msg, $matches)
@@ -461,11 +466,11 @@
$quoteMsg = $matches[1] . ">>" . $matches[3] . $matches[4];
}
- // \x83^\x83O\x89\xBB\x81\x95\x89\xFC\x8Ds\x82Ƀ}\x81[\x83N\x82\xB5\x82Ƃ\xAD
- $quoteMsg = sprintf(
- '<span class="respopup" id="quote_msg%s">%s</span>',
- $i, str_replace('<br>', '___[br]___>', nl2br($quoteMsg))
- );
+ // \x89\xFC\x8Ds\x82\xF0\x83}\x81[\x83N\x89\xBB\x82\xB7\x82\xE9
+ $quoteMsg = str_replace('<br>', '___[br]___>', nl2br($quoteMsg));
+
+ $quoteMsg = sprintf('<span class="respopup" id="quote_msg%s">%s</span>', $i, $quoteMsg);
+
$tores = "\n" . $quoteMsg . "\n" . $tores;
// }}}
@@ -616,15 +621,24 @@
//$tores = "<input type=\"submit\" value=\"\x95‚\xB6\x82\xE9\" onClick=\"hideResPopUp('{$hideid}')\"><br>\n";
$tores = "<img class=\"close\" src=\"iui/icon_close.png\" onClick=\"hideResPopUp('{$hideid}')\">\n";
- $tores .= "\x81@$i \x81F"; // \x94ԍ\x86
+ $tores .= " <span class=\"trnum\">$i</span> "; // \x94ԍ\x86
// \x96\xBC\x91O
//$tores .= "<b>$name</b> \x81F";
- if (strlen($name) > 0) {
+ if (strlen($name)) {
$tores .= '<span class="tname">' . $name . '</span> \x81F';
}
- if ($mail) { $tores .= $mail . " \x81F"; } // \x83\x81\x81[\x83\x8B
+ // \x83\x81\x81[\x83\x8B
+ $is_sage = false;
+ if (strlen($mail)) {
+ if ($mail == 'sage') {
+ $is_sage = true;
+ } else {
+ //$tores .= $mail . " :";
+ $tores .= '<span class="tmail">:' . StrSjis::fixSjis($mail) . '</span>';
+ }
+ }
if ($_conf['mobile.id_underline']) {
$date_id = preg_replace(
@@ -642,12 +656,13 @@
}
$tores .= '<span class="tdate">' . $date_id . '</span>';
- /*
+
if ($is_sage) {
- $tores .= '<font color="#aaaaaa">\x81\xAB</font>';
+ $tores .= '<font class="sage">\x81\xAB</font>';
+ //$tores .= '<font class="sage"> sage</font>';
}
- */
+
$tores .= "<br>\n"; // \x93\xFA\x95t\x82\xC6ID
$tores .= "{$msg}\n"; // \x93\xE0\x97e iPhone\x97p\x82\xC9hr\x8D폜
Modified: p2/trunk/iphone/index_print_k.inc.php
===================================================================
--- p2/trunk/iphone/index_print_k.inc.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/index_print_k.inc.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -101,8 +101,8 @@
</head>
<body>
<div class="toolbar">
- <h1 id="pageTitle"><?php eh($ptitle); ?></h1>
- <a class="button" href="<?php eh($narabikae_uri); ?>">\x95\xC0\x91\xD6</a>
+ <h1 class="pageTitle"><?php eh($ptitle); ?></h1>
+ <a class="tbutton" href="<?php eh($narabikae_uri); ?>">\x95\xC0\x91\xD6</a>
</div>
<ul id="home">
<li class="group">\x83\x81\x83j\x83\x85\x81[</li>
Modified: p2/trunk/iphone/js/iphone.js
===================================================================
--- p2/trunk/iphone/js/iphone.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/js/iphone.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -3,24 +3,25 @@
{
var large_nextObj = document.getElementById('large_next');
if (large_nextObj) {
- large_nextObj.style.width = document.body.clientWidth - 132 - 20 + 'px'; // window.innerWidth
+ large_nextObj.style.width = document.body.clientWidth - 134 - 21 + 'px'; // window.innerWidth
}
}
function anchorJump(ancId)
{
var gopos = document.getElementById(ancId);
- if (gopos.offsetTop) {
- document.body.scrollTop = parseInt(gopos.offsetTop);
- //window.scrollTo(0, arseInt(gopos.offsetTop));
+ if (gopos) {
+ var to = parseInt(gopos.offsetTop);
+ to = to -60; // iPhone\x82\xCCURL\x83\x81\x83j\x83\x85\x81[\x95\\x8E\xA6\x82̍\x82\x82\xB3\x95\xAA\x82\xBE\x82\xAF\x92\xB2\x90\xAE\x82\xB7\x82\xE9
+ document.body.scrollTop = to;
+ //window.scrollTo(0, to);
}
}
// iPhone\x82\xCCURL\x95\\x8E\xA6\x95\x94\x95\xAA\x82\xF0\x88\xF8\x82\xC1\x8D\x9E\x82܂\xB9\x82邽\x82߁A\x82킸\x82\xA9\x82ɃX\x83N\x83\x8D\x81[\x83\x8B\x82\xB7\x82\xE9
function scrollForHideIPhoneUrlMenu()
{
- scrollTo(0, 1); // scrollBy\x82ɂ\xB5\x82\xBD\x82\xA2\x82\xAA\x81A\x82\xBB\x82\xA4\x82\xB7\x82\xE9\x82\xC6Android\x82̃f\x83t\x83H\x83\x8B\x83g\x83u\x83\x89\x83E\x83U\x82Łu\x8E\x9F\x81v\x88ړ\xAE\x82\xB5\x82\xBD\x8E\x9E\x82ɁA\x89\xBA\x82̕\xFB\x82փW\x83\x83\x83\x93\x83v\x82\xB5\x82Ă\xB5\x82܂\xA4
- //setTimeout(scrollTo, 100, 0, 1); // \x82Ȃ\xBA setTimeout \x82\xB5\x82Ă\xA2\x82\xE9\x82̂\xA9\x95s\x96\xBE
+ setTimeout(scrollTo, 100, 0, 1); // \x93\xAE\x8D삪\x92ǂ\xA2\x82‚\xA9\x82Ȃ\xA2\x8E\x9E\x82̑\xF4\x82\xC9settimeout\x82\xB5\x82Ă\xA2\x82\xE9\x82炵\x82\xA2\x81BscrollBy\x82ɂ\xB7\x82\xE9\x82\xC6Android\x82̃f\x83t\x83H\x83\x8B\x83g\x83u\x83\x89\x83E\x83U\x82Łu\x8E\x9F\x81v\x88ړ\xAE\x82\xB5\x82\xBD\x8E\x9E\x82ɁA\x89\xBA\x82̕\xFB\x82փW\x83\x83\x83\x93\x83v\x82\xB5\x82Ă\xB5\x82܂\xA4
}
// \x81ibody\x82\xAAonload\x82\xB5\x82Ă\xA9\x82\xE7\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81j
@@ -38,21 +39,46 @@
if (gScrollTimerId) {
clearInterval(gScrollTimerId);
}
+ if (document.body.scrollTop == dist) {
+ return;
+ }
+
+ gScrollDown = true;
+ if (document.body.scrollTop > dist) {
+ gScrollDown = false;
+ }
gScrollTimerId = setInterval('iphonePageScrollDo(' + dist + ')', 5);
}
function iphonePageScrollDo(dist)
{
- if (typeof(gBaseScrollTop) == 'number') {
- if (Math.abs(gBaseScrollTop - document.body.scrollTop) < 1) {
- clearInterval(gScrollTimerId);
- gBaseScrollTop = false;
- return;
- }
+ if (typeof(gPrevScrollTop) == 'number' && gPrevScrollTop == document.body.scrollTop || gScrollDown && dist < document.body.scrollTop || !gScrollDown && dist > document.body.scrollTop) {
+ gPrevScrollTop = null;
+ clearInterval(gScrollTimerId);
+ return;
}
-
- gBaseScrollTop = document.body.scrollTop;
- window.scrollBy(0, (dist - gBaseScrollTop)/26);
+
+ var distance = dist - document.body.scrollTop;
+ var speed = 9;
+ if (Math.abs(distance) < 2) {
+ speed = 1;
+ } else if (Math.abs(distance) < 30) {
+ speed = 2;
+ } else if (Math.abs(distance) < 60) {
+ speed = 3;
+ } else if (Math.abs(distance) < 180) {
+ speed = 6;
+ } else if (Math.abs(distance) < 3000) {
+ speed = 9;
+ }
+ if (distance < 0) {
+ mv = -speed;
+ } else {
+ mv = speed;
+ }
+
+ gPrevScrollTop = document.body.scrollTop;
+ window.scrollBy(0, mv);
}
function inactiveFlick()
@@ -165,11 +191,76 @@
} else if (gTapped.touchendact == 2) {
iphonePageScroll(document.height - window.innerHeight + 14);
} else if (gTapped.touchendact == 3) {
- iphonePageScroll(document.body.scrollTop - window.innerHeight*0.85);
+ iphonePageScroll(document.body.scrollTop - window.innerHeight*0.8);
} else if (gTapped.touchendact == 4) {
- iphonePageScroll(document.body.scrollTop + window.innerHeight*0.85);
+ iphonePageScroll(document.body.scrollTop + window.innerHeight*0.8);
}
}
}
}
-}
\ No newline at end of file
+}
+
+
+// iPhone \x83t\x83b\x83^\x81[\x82̃\x8C\x83X\x8C\x9F\x8D\xF5\x82܂\xBD\x82͏\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̃|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x95\\x8E\xA6\x82\xB7\x82郁\x83\\x83b\x83h (Edit 080727 by 240)
+// @param integer arrayIdx 0:\x8C\x9F\x8D\xF5, 1:\x8F\x91\x82\xAB\x8D\x9E\x82\xDD 2:\x82\xBB\x82̑\xBC
+// @param integer(bool) resetFlag 1:\x94\xF1\x95\\x8E\xA6\x82̎w\x92\xE8\x82\xF0\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ 0:\x83t\x83\x89\x83O\x82Ȃ\xB5
+// @param integer(bool) forceOn 1:\x83g\x83O\x83\x8B\x82ł͂Ȃ\xAD\x8B\xAD\x90\xA7\x83I\x83\x93\x82ɂ\xB5\x82\xBD\x82\xA2\x8Fꍇ 0:\x83t\x83\x89\x83O\x82Ȃ\xB5
+function popUpFootbarFormIPhone(arrayIdx, resetFlag, forceOn) {
+ var popElements = new Array(3);
+ var buttonElements = new Array(3);
+
+ popElements[0] = document.getElementById('searchForm');
+ popElements[1] = document.getElementById('writeForm');
+ popElements[2] = document.getElementById('footbarEtc');
+
+ buttonElements[0] = document.getElementById('searchRes');
+ buttonElements[1] = document.getElementById('writeButton');
+ buttonElements[2] = document.getElementById('etcButoon');
+
+ for (var i = 0; i <= 2; i++) {
+ if (i != arrayIdx) {
+ if (buttonElements[i]) {
+ buttonElements[i].setAttribute('title', 'off'); // title\x82͏\xF0\x8C\x8F\x83X\x83e\x81[\x83^\x83X\x82̕ێ\x9D\x82\xC1\x82ۂ\xA2
+ }
+ }
+ // \x88\xEA\x92U\x91S\x82Ă\xF0\x94\xF1\x95\\x8E\xA6\x82ɂ\xB5\x82Ă\xA2\x82\xE9
+ if (buttonElements[i]) {
+ buttonElements[i].style.backgroundPositionY = '0'; // \x92ʏ\xED\x8F\xF3\x91ԁi\x8C\xF5\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x81j
+ }
+ if (popElements[i]) {
+ popElements[i].style.display = 'none';
+ }
+ }
+
+ // \x8B\xAD\x90\xA7\x83I\x83\x93\x8Ew\x92\xE8\x82łȂ\xAD\x81A\x83I\x83t\x83g\x83O\x83\x8B\x82܂\xBD\x82̓\x8A\x83Z\x83b\x83g(off)\x8Ew\x92\xE8\x82Ȃ炻\x82̂܂I\x97\xB9
+ if (!forceOn && (buttonElements[arrayIdx].getAttribute('title') == 'on' || resetFlag)) {
+ buttonElements[arrayIdx].setAttribute('title', 'off');
+ return;
+ }
+
+ buttonElements[arrayIdx].setAttribute('title', 'on');
+ buttonElements[arrayIdx].style.backgroundPositionY = '-50px'; // \x8C\xF5\x82点\x82\xE9
+ //popElements[arrayIdx].style.top = (document.height - 480).toString(); + "px"
+
+ // body\x82\xAA\x89\xE6\x96ʂ̒\xB7\x82\xB3\x82\xAA\x92Z\x82\xAD\x82ďオ\x82͂ݏo\x82\xB5\x82Ă\xA2\x82\xE9\x8Fꍇ\x82̏C\x90\xB3\x91[\x92u
+ var footToolbarElem = document.getElementById('footToolbar');
+ if (arrayIdx != 1 && footToolbarElem.offsetTop < 280) { // \x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̒l
+ //popElements[arrayIdx].style.position = 'absolute';
+ popElements[arrayIdx].style.top = 0 + 'px'; //14; // \x82\xE0\x82\xC1\x82Ƃ\xA2\x82\xA2\x8Ew\x92\xE8\x95\xFB\x96@\x82\xAA\x82\xA0\x82\xE9\x82悤\x82ȋC\x82\xAA\x82\xB7\x82\xE9 // height\x82\xE0\x95K\x97v\x82\xC1\x82ۂ\xA2
+ //var writeFormCloseBtnElem = document.getElementById('writeFormCloseBtn');
+ //if (writeFormCloseBtnElem) {
+ // writeFormCloseBtnElem.style.display = 'block';
+ //}
+ }
+
+ // \x95\\x8E\xA6\x82\xB7\x82\xE9
+ popElements[arrayIdx].style.display = 'block';
+
+ // \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82Ȃ\xE7\x89\xE6\x96ʂ\xF0\x83X\x83N\x83\x8D\x81[\x83\x8B
+ if (arrayIdx == 1) {
+ var writeFormObj = document.getElementById('writeForm');
+ scrollBy(0, writeFormObj.clientHeight);
+ }
+
+ return true;
+}
Modified: p2/trunk/iphone/js/respopup.iPhone.js
===================================================================
--- p2/trunk/iphone/js/respopup.iPhone.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/js/respopup.iPhone.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -301,7 +301,7 @@
}
if (!onPopSpace) {
- // Safari\x82ł͍\x82\x91\xAC\x82Ń}\x83E\x83X\x83I\x81[\x83o\x81[\x81A\x83}\x83E\x83X\x83A\x83E\x83g\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82ă}\x83E\x83X\x82ɂ‚\xA2\x82Ă\xAB\x82Ă\xB5\x82܂\xA4\x96\xE2\x91肪\x82\xA0\x82\xE9
+ // Safari\x82ł͍\x82\x91\xAC\x82Ń}\x83E\x83X\x83I\x81[\x83o\x81[\x81A\x83}\x83E\x83X\x83A\x83E\x83g\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82ă}\x83E\x83X\x82ɂ‚\xA2\x82Ă\xAB\x82Ă\xB5\x82܂\xA4\x81i\x8C\x99\x82Ȏd\x97l\x82\xBE\x81j
if (!isSafari() || isIPhoneGroup()) {
aResPopUp.setPosResPopUp(x,y);
}
Modified: p2/trunk/iphone/js/setfavjs.iphone.js
===================================================================
--- p2/trunk/iphone/js/setfavjs.iphone.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/js/setfavjs.iphone.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,62 +1,62 @@
-// --------------------------------------------------------------
-// "\x82\xA8\x8BC\x82\xC9" \x82̕\xB6\x8E\x9A\x97\xB5\x82\xCC \x81{\x82\xA9\x81\x9A\x82̂ݔ\xC5
-//-------------------------------------------------------------------
-function setFavJsNoStr(tquery, favvalue, info_pop_width, info_pop_height, page, obj,numb)
-{
- // read.php\x82ł́A\x83y\x81[\x83W\x82̓ǂݍ\x9E\x82݂\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82A\x82Ȃɂ\xE0\x82\xB5\x82Ȃ\xA2
- // \x81iread.php \x82͓ǂݍ\x9E\x82݊\xAE\x97\xB9\x8E\x9E\x82\xC9idx\x8BL\x98^\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82邽\x82߁j
- if ((page == 'subject') && !gIsPageLoaded) {
- return false;
- }
-
- var objHTTP = getXmlHttp();
- if (!objHTTP) {
- // alert("Error: XMLHTTP \x92ʐM\x83I\x83u\x83W\x83F\x83N\x83g\x82̍쐬\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B") ;
- // XMLHTTP\x81i\x82\xC6innerHTML\x81j \x82ɖ\xA2\x91Ή\x9E\x82Ȃ珬\x91\x8B\x82\xC5
- infourl = 'info_i.php?' + tquery + '&setfav=' + favvalue + '&popup=2';
- return !openSubWin(infourl,info_pop_width,info_pop_height,0,0);
- }
-
- url = 'httpcmd.php?' + tquery + '&setfav=' + favvalue + '&cmd=setfav'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8
-
- var res = getResponseTextHttp(objHTTP, url, 'nc');
- var rmsg = "";
- if (res) {
- if (res == '1') {
- rmsg = '\x8A\xAE\x97\xB9';
- }
- if (rmsg) {
- if (favvalue == '1') {
- nextset = '0';
- favmark = '<img src="iui/icon_del.png">';
- favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82\xA9\x82\xE7\x8AO\x82\xB7';
- } else {
- nextset = '1';
- favmark = '<img src="iui/icon_add.png">';
- favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1';
- }
- if (obj.className) {
- objClass = ' class="' + obj.className + '"';
- } else {
- objClass = '';
- }
- if (page != 'subject') {
- favstr = '';
- } else {
- favstr = '';
- }
- var favhtm = '<a id="'+numb+'"' + objClass + ' href="info_i.php?' + tquery + '&setfav=' + nextset + '" target="info" onClick="return setFavJsNoStr(\'' + tquery + '\', \''+nextset+'\', '+info_pop_width+', '+info_pop_height+', \'' + page + '\', this, \''+numb+ '\');" title="' + favtitle + '">' + favstr + favmark + '</a>';
- if (page != 'read') {
- obj.parentNode.innerHTML = favhtm;
- } else {
- var span = document.getElementsByTagName('span');
- for (var i = 0; i < span.length; i++) {
- if (span[i].className == 'plus' && span[i].id == numb) {
- span[i].innerHTML = favhtm;
- }
- }
- }
- }
- }
- return false;
-}
+// --------------------------------------------------------------
+// "\x82\xA8\x8BC\x82\xC9" \x82̕\xB6\x8E\x9A\x97\xB5\x82\xCC \x81{\x82\xA9\x81\x9A\x82̂ݔ\xC5
+//-------------------------------------------------------------------
+function setFavJsNoStr(tquery, favvalue, info_pop_width, info_pop_height, page, obj,numb)
+{
+ // read.php\x82ł́A\x83y\x81[\x83W\x82̓ǂݍ\x9E\x82݂\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82A\x82Ȃɂ\xE0\x82\xB5\x82Ȃ\xA2
+ // \x81iread.php \x82͓ǂݍ\x9E\x82݊\xAE\x97\xB9\x8E\x9E\x82\xC9idx\x8BL\x98^\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82邽\x82߁j
+ if ((page == 'subject') && !gIsPageLoaded) {
+ return false;
+ }
+
+ var objHTTP = getXmlHttp();
+ if (!objHTTP) {
+ // alert("Error: XMLHTTP \x92ʐM\x83I\x83u\x83W\x83F\x83N\x83g\x82̍쐬\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B") ;
+ // XMLHTTP\x81i\x82\xC6innerHTML\x81j \x82ɖ\xA2\x91Ή\x9E\x82Ȃ珬\x91\x8B\x82\xC5
+ infourl = 'info_i.php?' + tquery + '&setfav=' + favvalue + '&popup=2';
+ return !openSubWin(infourl,info_pop_width,info_pop_height,0,0);
+ }
+
+ url = 'httpcmd.php?' + tquery + '&setfav=' + favvalue + '&cmd=setfav'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8
+
+ var res = getResponseTextHttp(objHTTP, url, 'nc');
+ var rmsg = "";
+ if (res) {
+ if (res == '1') {
+ rmsg = '\x8A\xAE\x97\xB9';
+ }
+ if (rmsg) {
+ if (favvalue == '1') {
+ nextset = '0';
+ favmark = '<img src="iui/icon_del.png">';
+ favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82\xA9\x82\xE7\x8AO\x82\xB7';
+ } else {
+ nextset = '1';
+ favmark = '<img src="iui/icon_add.png">';
+ favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1';
+ }
+ if (obj.className) {
+ objClass = ' class="' + obj.className + '"';
+ } else {
+ objClass = '';
+ }
+ if (page != 'subject') {
+ favstr = '';
+ } else {
+ favstr = '';
+ }
+ var favhtm = '<a id="'+numb+'"' + objClass + ' href="info_i.php?' + tquery + '&setfav=' + nextset + '" target="info" onClick="return setFavJsNoStr(\'' + tquery + '\', \''+nextset+'\', '+info_pop_width+', '+info_pop_height+', \'' + page + '\', this, \''+numb+ '\');" title="' + favtitle + '">' + favstr + favmark + '</a>';
+ if (page != 'read') {
+ obj.parentNode.innerHTML = favhtm;
+ } else {
+ var span = document.getElementsByTagName('span');
+ for (var i = 0; i < span.length; i++) {
+ if (span[i].className == 'plus' && span[i].id == numb) {
+ span[i].innerHTML = favhtm;
+ }
+ }
+ }
+ }
+ }
+ return false;
+}
Modified: p2/trunk/iphone/js/setfavjs.js
===================================================================
--- p2/trunk/iphone/js/setfavjs.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/js/setfavjs.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,63 +1,63 @@
-////
-// \x82\xA8\x8BC\x82ɃZ\x83b\x83g\x8A\x94
-// setFavJs('host={$aThread->host}&bbs={$aThread->bbs}&key={$aThread->key}{$ttitle_en_q}{$sid_q}', '{$favvalue}',{$STYLE['info_pop_size']}, this);
-//
-function setFavJs(tquery, favvalue, info_pop_width, info_pop_height, page, obj)
-{
- // read.php\x82ł́A\x83y\x81[\x83W\x82̓ǂݍ\x9E\x82݂\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82A\x82Ȃɂ\xE0\x82\xB5\x82Ȃ\xA2
- // \x81iread.php \x82͓ǂݍ\x9E\x82݊\xAE\x97\xB9\x8E\x9E\x82\xC9idx\x8BL\x98^\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82邽\x82߁j
- if ((page == 'read') && !gIsPageLoaded) {
- return false;
- }
-
- var objHTTP = getXmlHttp();
- if (!objHTTP) {
- // alert("Error: XMLHTTP \x92ʐM\x83I\x83u\x83W\x83F\x83N\x83g\x82̍쐬\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B") ;
- // XMLHTTP\x81i\x82\xC6innerHTML\x81j \x82ɖ\xA2\x91Ή\x9E\x82Ȃ珬\x91\x8B\x82\xC5
- infourl = 'info.php?' + tquery + '&setfav=' + favvalue + '&popup=2';
- return !openSubWin(infourl,info_pop_width,info_pop_height,0,0);
- }
-
- url = 'httpcmd.php?' + tquery + '&setfav=' + favvalue + '&cmd=setfav'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8
-
- var res = getResponseTextHttp(objHTTP, url, 'nc');
- var rmsg = "";
- if (res) {
- if (res == '1') {
- rmsg = '\x8A\xAE\x97\xB9';
- }
- if (rmsg) {
- if (favvalue == '1') {
- nextset = '0';
- favmark = '\x81\x9A';
- favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82\xA9\x82\xE7\x8AO\x82\xB7';
- } else {
- nextset = '1';
- favmark = '+';
- favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1';
- }
- if (obj.className) {
- objClass = ' class="' + obj.className + '"';
- } else {
- objClass = '';
- }
- if (page != 'subject') {
- favstr = '\x82\xA8\x8BC\x82\xC9';
- } else {
- favstr = '';
- }
- var favhtm = '<a' + objClass + ' href="info_i.php?' + tquery + '&setfav=' + nextset + '" target="info" onClick="return setFavJs(\'' + tquery + '\', \''+nextset+'\', '+info_pop_width+', '+info_pop_height+', \'' + page + '\', this);" title="' + favtitle + '">' + favmark + '</a>';
- if (page != 'read') {
- obj.parentNode.innerHTML = favhtm;
- } else {
- var span = document.getElementsByTagName('span');
- for (var i = 0; i < span.length; i++) {
- if (span[i].className == 'setfav') {
- span[i].innerHTML = favhtm;
- }
- }
- }
- }
- }
- return false;
-}
+////
+// \x82\xA8\x8BC\x82ɃZ\x83b\x83g\x8A\x94
+// setFavJs('host={$aThread->host}&bbs={$aThread->bbs}&key={$aThread->key}{$ttitle_en_q}{$sid_q}', '{$favvalue}',{$STYLE['info_pop_size']}, this);
+//
+function setFavJs(tquery, favvalue, info_pop_width, info_pop_height, page, obj)
+{
+ // read.php\x82ł́A\x83y\x81[\x83W\x82̓ǂݍ\x9E\x82݂\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82A\x82Ȃɂ\xE0\x82\xB5\x82Ȃ\xA2
+ // \x81iread.php \x82͓ǂݍ\x9E\x82݊\xAE\x97\xB9\x8E\x9E\x82\xC9idx\x8BL\x98^\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82邽\x82߁j
+ if ((page == 'read') && !gIsPageLoaded) {
+ return false;
+ }
+
+ var objHTTP = getXmlHttp();
+ if (!objHTTP) {
+ // alert("Error: XMLHTTP \x92ʐM\x83I\x83u\x83W\x83F\x83N\x83g\x82̍쐬\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B") ;
+ // XMLHTTP\x81i\x82\xC6innerHTML\x81j \x82ɖ\xA2\x91Ή\x9E\x82Ȃ珬\x91\x8B\x82\xC5
+ infourl = 'info.php?' + tquery + '&setfav=' + favvalue + '&popup=2';
+ return !openSubWin(infourl,info_pop_width,info_pop_height,0,0);
+ }
+
+ url = 'httpcmd.php?' + tquery + '&setfav=' + favvalue + '&cmd=setfav'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8
+
+ var res = getResponseTextHttp(objHTTP, url, 'nc');
+ var rmsg = "";
+ if (res) {
+ if (res == '1') {
+ rmsg = '\x8A\xAE\x97\xB9';
+ }
+ if (rmsg) {
+ if (favvalue == '1') {
+ nextset = '0';
+ favmark = '\x81\x9A';
+ favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82\xA9\x82\xE7\x8AO\x82\xB7';
+ } else {
+ nextset = '1';
+ favmark = '+';
+ favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1';
+ }
+ if (obj.className) {
+ objClass = ' class="' + obj.className + '"';
+ } else {
+ objClass = '';
+ }
+ if (page != 'subject') {
+ favstr = '\x82\xA8\x8BC\x82\xC9';
+ } else {
+ favstr = '';
+ }
+ var favhtm = '<a' + objClass + ' href="info_i.php?' + tquery + '&setfav=' + nextset + '" target="info" onClick="return setFavJs(\'' + tquery + '\', \''+nextset+'\', '+info_pop_width+', '+info_pop_height+', \'' + page + '\', this);" title="' + favtitle + '">' + favmark + '</a>';
+ if (page != 'read') {
+ obj.parentNode.innerHTML = favhtm;
+ } else {
+ var span = document.getElementsByTagName('span');
+ for (var i = 0; i < span.length; i++) {
+ if (span[i].className == 'setfav') {
+ span[i].innerHTML = favhtm;
+ }
+ }
+ }
+ }
+ }
+ return false;
+}
Modified: p2/trunk/iphone/js/smartpopup.iPhone.js
===================================================================
--- p2/trunk/iphone/js/smartpopup.iPhone.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/js/smartpopup.iPhone.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -74,7 +74,7 @@
// iphone\x82\xB1\x82\xEA\x82Ƀ\x8C\x83X
document.writeln('<span id="' + thread_id + '_iphone_res"></span>');
document.writeln('<span id="' + thread_id + '_iphone_quoteres"></span>');
-
+
// \x93\xAF\x82\xB6\x96\xBC\x91O\x82\xF0\x83\x8C\x83X\x8C\x9F\x8D\xF5
document.writeln('<a id="' + thread_id + '_same_name" href="#" target="' + spmTarget + '">\x93\xAF\x82\xB6\x96\xBC\x91O</a>');
@@ -320,7 +320,7 @@
// @return string
function getSpmResPhone()
{
- var onc = "onclick=\"resMessage('>>" + spmResNum + "'); popUpFootbarFormIPhone(1);\"";
+ var onc = "onclick=\"resMessage('>>" + spmResNum + "'); popUpFootbarFormIPhone(1,0,1);\"";
var har = "href=\"#footer\"";
var url = "<a " + har + " " + onc + ">\x82\xB1\x82\xEA\x82Ƀ\x8C\x83X</a>";
return url;
@@ -464,9 +464,10 @@
function resMessage(str) {
var msg = p2GetElementById('MESSAGE')
// \x89\xFC\x8Ds\x83}\x81[\x83N\x82\xF0\x89\xFC\x8Ds\x82ɖ߂\xB5\x82‚Amsg\x83{\x83b\x83N\x83X\x82ɒl\x82\xF0\x83Z\x83b\x83g
- msg.value = str.replace("_>>[rn]_","\r\n>");
+ msg.value = str.replace("_>>[rn]_","\r\n>") + "\r\n";
}
+// @see transRes()
function resQuoteMessage(resNum) {
if(true == isSafari()){
var quoteMsg = p2GetElementById("quote_msg" + spmResNum).textContent;
@@ -475,7 +476,7 @@
}
var msg = p2GetElementById('MESSAGE')
// \x89\xFC\x8Ds\x83}\x81[\x83N\x82\xF0\x89\xFC\x8Ds\x82ɖ߂\xB5\x82‚Amsg\x83{\x83b\x83N\x83X\x82ɒl\x82\xF0\x83Z\x83b\x83g
- msg.value = ">>" + resNum + "\r\n>" + quoteMsg.replace(/___\[br\]___/g, "\r\n");
- popUpFootbarFormIPhone(1);
+ msg.value = ">>" + resNum + "\r\n>" + quoteMsg.replace(/___\[br\]___/g, "\r\n") + "\r\n";
+ popUpFootbarFormIPhone(1,0,1);
}
Modified: p2/trunk/iphone/read_footer_k.inc.php
===================================================================
--- p2/trunk/iphone/read_footer_k.inc.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/read_footer_k.inc.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -53,28 +53,27 @@
//iPhone \x95\\x8E\xA6\x97p\x83t\x83b\x83^ 080725
//\x81@\x91O\x81A\x8E\x9F\x81A\x90V\x92\x85 \x96\xB3\x82\xA2\x8E\x9E\x82͍\x95
- if ($read_navi_latest_btm_ht) {
- $new_btm_ht = "<li class=\"new\">{$read_navi_latest_btm_ht}</li>";
+ if ($read_navi_latest_btm_ht) { // \x8DŐVN\x8C\x8F
+ $new_btm_ht = "<li class=\"new\">{$read_navi_latest_btm_ht}</li>";
}
- if ($read_footer_navi_new_btm_ht) {
+ if ($read_footer_navi_new_btm_ht) { // \x90V\x92\x85\x82\xF0\x95\\x8E\xA6
$new_btm_ht = "<li class=\"new\">{$read_footer_navi_new_btm_ht}</li>";
}
if ($read_navi_previous_btm_ht) {
$read_navi_previous_tab_ht = "<li class=\"prev\">{$read_navi_previous_btm_ht} </li>";
} else {
- $read_navi_previous_tab_ht = '<li id="blank" class="prev"></li>';
+ $read_navi_previous_tab_ht = '<li class="prev_disabled"></li>';
}
if ($read_navi_next_btm_ht) {
$read_navi_next_btm_tab_ht = "<li class=\"next\">{$read_navi_next_btm_ht}</li>";
} else {
- $read_navi_next_btm_tab_ht = '<li id="blank" class="next"></li>';
+ $read_navi_next_btm_tab_ht = '<li class="next_disabled"></li>';
}
$index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()));
$goto_select_ht = _csrangeform(isset($GLOBALS['word']) ? $last_hit_resnum : $aThread->resrange['to'], $aThread, $read_range_hs);
?>
-<?php echo $toolbar_back_board_ht; ?>
<?php echo P2View::getHrHtmlK(); ?>
@@ -83,24 +82,41 @@
<?php echo $goto_select_ht, $goto_next_ht; ?>
</div>
-<div id="footbar01" class="footbar">
- <ul>
+<?php
+ // \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̃I\x83v\x83V\x83\x87\x83\x93\x93ǂݍ\x9E\x82\xDD
+ require_once P2_LIB_DIR . '/loadPostOptions.func.php';
+ loadPostOptions($aThread->host, $aThread->bbs, $aThread->key);
+
+ // \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80HTML\x82\xF0\x8Fo\x97\xCD
+ require_once P2_LIB_DIR . '/getPostFormPopupIPhoneHtml.func.php';
+ echo getPostFormPopupIPhoneHtml($aThread->host, $aThread->bbs, $aThread->key, $ttitle_en = base64_encode($aThread->ttitle), $aThread->rescount);
+?>
+
+<div id="footToolbar" class="footbar">
+<ul>
<li class="home"><a href="<?php eh($index_uri); ?>">TOP</a></li>
- <?php echo $read_navi_previous_tab_ht; ?>
+ <?php echo $read_navi_previous_tab_ht; ?>
<?php echo $new_btm_ht; ?>
- <li class="res" id="writeButton" title="off"><a onclick="popUpFootbarFormIPhone(1); document.getElementById('footbar02').style.visibility='hidden';">\x8F\x91\x82\xAB\x8D\x9E\x82\xDD</a></li>
- <li class="other"><a onclick="document.getElementById('footbar02').style.visibility='visible'; if (document.getElementById('footbar01').offsetTop < 280) { document.getElementById('footbar02').style.top = 0; } popUpFootbarFormIPhone(0, 1);popUpFootbarFormIPhone(1, 1);">\x82\xBB\x82̑\xBC</a></li>
- <?php echo $read_navi_next_btm_tab_ht; ?>
- </ul>
+ <li class="res" id="writeButton" title="off"><a onclick="popUpFootbarFormIPhone(1);">\x8F\x91\x82\xAB\x8D\x9E\x82\xDD</a></li>
+
+ <? if (!empty($_GET['onlyone']) && !file_exists($aThread->keyidx)) {
+ ?><li class="delelog_disabled"></li><?php
+ } else {
+ ?><li class="delelog" id="readi_delelog"><?php echo _getToolDeleATag($thread_qs, $ttitle_en, $dele_st); ?></li><?php
+ }
+
+ ?><li class="other" id="etcButoon" title="off"><a onclick="popUpFootbarFormIPhone(2);">\x82\xBB\x82̑\xBC</a></li>
+ <?php //echo $read_navi_next_btm_tab_ht; ?>
+</ul>
</div>
-<?php // \x81u\x82\xBB\x82̑\xBC\x81v\x82̃|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x81Bfootbar02 \x82\xCDfootbarEtc\x82Ƃ\xA9\x82ɖ\xBC\x8F̕ύX\x82\xB5\x82\xBD\x82\xA2\x8BC\x95\xAA ?>
-<div id="footbar02" class="dialog_other">
+<?php // \x81u\x82\xBB\x82̑\xBC\x81v\x82̃|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[ ?>
+<div id="footbarEtc">
<filedset>
<ul>
- <li class="whiteButton" id="searchRes" title="off" onclick="popUpFootbarFormIPhone(0); document.getElementById('footbar02').style.visibility='hidden'">\x83\x8C\x83X\x8C\x9F\x8D\xF5</li>
+ <li class="whiteButton" id="searchRes" title="off" onclick="popUpFootbarFormIPhone(0);">\x83\x8C\x83X\x8C\x9F\x8D\xF5</li>
<?php echo $toolbar_right_ht; ?>
- <li class="grayButton" onclick="document.getElementById('footbar02').style.visibility='hidden'">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
+ <li class="grayButton" onclick="popUpFootbarFormIPhone(2,1);">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li><?php // \x82͂ݏo\x82\xB5\x82\xBD\x8E\x9E\x82̂\xBD\x82߂ɃL\x83\x83\x83\x93\x83Z\x83\x8B\x83{\x83^\x83\x93\x82͕K\x97v ?>
</ul>
</filedset>
</div>
@@ -108,15 +124,6 @@
<?php echo $seafrm_ht; ?>
<?php
- // \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̃I\x83v\x83V\x83\x87\x83\x93\x93ǂݍ\x9E\x82\xDD
- require_once P2_LIB_DIR . '/loadPostOptions.func.php';
- loadPostOptions($aThread->host, $aThread->bbs, $aThread->key);
-
- // \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80HTML\x82\xF0\x8Fo\x97\xCD
- require_once P2_LIB_DIR . '/getPostFormPopupIPhoneHtml.func.php';
- echo getPostFormPopupIPhoneHtml($aThread->host, $aThread->bbs, $aThread->key, $ttitle_en = base64_encode($aThread->ttitle), $aThread->rescount);
-
-
if ($diedat_msg_ht) {
//echo '<hr>';
echo $diedat_msg_ht;
@@ -137,6 +144,26 @@
//==================================================================================
// \x8A\x94\x81i\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x93\xE0\x82ł̂ݗ\x98\x97p\x81j
//==================================================================================
+function _getToolDeleATag($thread_qs, $ttitle_en, $dele_st) {
+
+ global $STYLE;
+
+ $sid_qs = array();
+ if (defined('SID') && strlen(SID)) {
+ $sid_qs[session_name()] = session_id();
+ }
+ $info_qs = array_merge($thread_qs, array(UA::getQueryKey() => UA::getQueryValue()), array('ttitle_en' => $ttitle_en));
+ $dele_url = UriUtil::buildQueryUri('info_i.php', array_merge($info_qs, array('dele' => '1')));
+ $deleLogJs_query = UriUtil::buildQuery(array_merge($info_qs, $sid_qs));
+ $deleLogJs_query_es = str_replace("'", "\\'", $deleLogJs_query);
+ return P2View::tagA(
+ $dele_url, hs($dele_st),
+ array(
+ 'onclick' => "document.getElementById('readi_delelog').style.backgroundPosition = '-318px -50px'; return !deleLog('{$deleLogJs_query_es}', {$STYLE['info_pop_size']}, 'read_i_tool', this);"
+ )
+ );
+}
+
/**
* \x95\\x8E\xA6\x88ʒu\x82\xF0\x8E擾\x82\xB7\x82\xE9
*
Modified: p2/trunk/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/read_header_k.inc.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -91,7 +91,8 @@
*/
//----------------------------------------------
-// $read_navi_previous_ht -- \x91O
+// {{{ $read_navi_previous_ht -- \x91O
+
$before_rnum = max($aThread->resrange['start'] - $rnum_range, 1);
$read_navi_prev_isInvisible = false;
@@ -132,11 +133,13 @@
} else {
$url .= '&ls=' . "{$before_rnum}-{$aThread->resrange['start']}n";
}
-
- $read_navi_previous_ht = P2View::tagA($url, $html);
+ $read_navi_prev_header_url = $url . '&jsanc=' . "r{$aThread->resrange['start']}";
+ $read_navi_previous_ht = P2View::tagA($read_navi_prev_header_url, $html, array('class' => 'tbutton buttonW', 'style' => 'right:54px', 'target' => '_self'));
$read_navi_previous_btm_ht = P2View::tagA($url, $html, array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['prev']));
}
+// }}}
+
//----------------------------------------------
// $read_navi_next_ht -- \x8E\x9F
$read_navi_next_isInvisible = false;
@@ -172,11 +175,11 @@
// \x8DŐVN\x8C\x8F
$read_navi_latest_ht = <<<EOP
-<a class="blueButton" href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}{$_conf['k_at_a']}">{$latest_st}{$latest_show_res_num}</a>
+<a class="blueButton" href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}n{$_conf['k_at_a']}">{$latest_st}{$latest_show_res_num}</a>
EOP;
$time = time();
$read_navi_latest_btm_ht = <<<EOP
-<a href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}&dummy={$time}{$_conf['k_at_a']}">{$latest_st}{$latest_show_res_num}</a>
+<a href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}n&dummy={$time}{$_conf['k_at_a']}">{$latest_st}{$latest_show_res_num}</a>
EOP;
}
@@ -218,19 +221,9 @@
$toolbar_right_ht = _getToolbarRightHtml($aThread, $ttitle_en, $info_st, $dele_st, $moto_thre_st);
-//iPhone \x97p\x81@\x94–߂\xE8\x83{\x83^\x83\x93
-$b_qs = array(
- UA::getQueryKey() => UA::getQueryValue()
-);
-$atag = P2View::tagA(
- UriUtil::buildQueryUri($_conf['subject_php'],
- array_merge($thread_qs, $b_qs)
- ),
- hs($aThread->itaj),
- array('class' => 'button', 'id' => 'backButton')
-);
-$toolbar_back_board_ht = "<p>$atag</p>\n";
-
+// iPhone \x97p\x81@\x94–߂\xE8\x83{\x83^\x83\x93
+$toolbar_back_board_ht = sprintf("<p>%s</p>\n", _getBackItaATag($aThread));
+
// }}}
$body_at = '';
@@ -251,9 +244,9 @@
<script type="text/javascript" src="js/basic.js?2012"></script>
<script type="text/javascript" src="iphone/js/respopup.iPhone.js?v=20090429"></script>
<script type="text/javascript" src="iphone/js/setfavjs.js?v=20090428"></script>
- <script type="text/javascript" src="js/post_form.js?v=201209"></script>
- <script type="text/javascript" src="js/delelog.js?v=20100127"></script>
- <script type="text/javascript" src="iphone/js/iphone.js?20130605"></script>
+ <script type="text/javascript" src="js/post_form.js?v=20130609"></script>
+ <script type="text/javascript" src="js/delelog.js?v=20130611"></script>
+ <script type="text/javascript" src="iphone/js/iphone.js?2013060918"></script>
<script type="text/javascript">
<!--
window.onload = function() {
@@ -265,7 +258,7 @@
}
initIPhoneGestures();
-
+
/* \x8E\x9F\x83{\x83^\x83\x93\x82̉\xA1\x95\x9D\x8Ag\x92\xA3 */
expandLargeNextButton();
}
@@ -291,7 +284,8 @@
// -->
</script>
- <link rel="stylesheet" type="text/css" href="./iui/read.css?20130605">
+ <link rel="stylesheet" type="text/css" href="./iui/smartphone.css?2013060910">
+ <link rel="stylesheet" type="text/css" href="./iui/read.css?20130611">
<title><?php echo $ptitle_ht; ?></title>
<?php
@@ -332,37 +326,39 @@
// \x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[ JavaScript\x83R\x81[\x83h
if ($_conf['enable_spm']) {
- // smartpopup.iPhone.js needs post_form.js's popUpFootbarFormIPhone().
- ?><script type="text/javascript" src="iphone/js/smartpopup.iPhone.js?v=20110715"></script><?php
+ ?><script type="text/javascript" src="iphone/js/smartpopup.iPhone.js?v=20130606"></script><?php
$aThread->showSmartPopUpMenuJs();
}
-echo <<<EOP
+?>
</head>
-<body{$body_at} >\n
-EOP;
+<body id="read" <?php echo $body_at; ?>>
+<?php $index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue())); ?>
+<p><a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a></p>
+
+
+<?php
+
if (
($aThread->rescount or !empty($_GET['onlyone']) && !$aThread->diedat)
and empty($_GET['renzokupop'])
) {
- echo <<<EOP
-<div class="toolbar">
-{$htm['read_navi_range']}
-EOP;
+ ?><div class="toolbar"><?php
+ echo $toolbar_back_board_ht;
- // \x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1/\x8AO\x82\xB7
- $sid_q = (defined('SID') && strlen(SID)) ? '&' . hs(SID) : '';
- echo "<span class=\"setfav\" style=\"white-space: nowrap;\"><a class=\"favbutton\" href=\"info_i.php?host={$aThread->host}{$bbs_q}{$key_q}{$ttitle_en_q}{$setfav_q}{$sid_q}\" target=\"info\" onClick=\"return setFavJs('host={$aThread->host}{$bbs_q}{$key_q}{$ttitle_en_q}{$sid_q}', '{$favvalue}', {$STYLE['info_pop_size']}, 'read', this);\" accesskey=\"f\" title=\"{$favtitle}\">{$favmark}</a></span>";
+ //echo $htm['read_navi_range'];
+
+ echo $read_navi_previous_ht;
- echo <<< EOP
-<a class="button" href="javascript:window.scrollBy(0, document.documentElement.clientHeight)" target="_self">\x81\xA5</a>
+ ?><span class="setfav"><?php echo _getFavATag($aThread, $ttitle_en, $favvalue, $favmark, $favtitle); ?></span><?php
+
+ ?><a class="tbutton buttonW" href="javascript:window.scrollBy(0, document.documentElement.clientHeight)" target="_self">\x81\xA5</a>
</div>
-EOP;
+<?php
-/* iPhone \x97p\x82ɏ\x9C\x8AO
-{$read_navi_previous_ht}
+/* iPhone \x82ł͏\x9C\x8AO
<!-- {$read_navi_next_ht} -->
{$read_navi_latest_ht}
*/
@@ -384,12 +380,13 @@
}
}
-//echo "<hr>";
-/*
-?><h3><font color="<?php eh($STYLE['read_k_thread_title_color']); ?>"><?php eh($aThread->ttitle); ?></font></h3><?php
-*/
-?><h4 class="thread_title"><?php eh($aThread->ttitle_hc); ?></h4><?php
+?>
+<h4 class="thread_title"><?php eh($aThread->ttitle_hc); ?></h4>
+<?php
+
+//<div id="debugpanel">a</div>
+
$filter_fields = array(
'whole' => '',
'msg' => 'ү\xBE\xB0\xBCނ\xAA',
@@ -401,12 +398,14 @@
);
if (isset($GLOBALS['word']) && strlen($GLOBALS['word'])) {
+ ?><div><?php
echo hs(sprintf(
'\x8C\x9F\x8D\x{14C2C9}\xCA: %s"%s"\x82\xF0%s',
$filter_fields[$res_filter['field']],
$GLOBALS['word'],
($res_filter['match'] == 'on') ? '\x8A܂\xDE' : '\x8A܂܂Ȃ\xA2'
));
+ ?></div><?php
}
//echo P2View::getHrHtmlK();
@@ -419,7 +418,58 @@
//=======================================================================================
/**
- * \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93
+ * @return string HTML <a>\x83^\x83O
+ */
+function _getBackItaATag($aThread)
+{
+ return P2View::tagA(
+ UriUtil::buildQueryUri($GLOBALS['_conf']['subject_php'],
+ array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ //'key' => $aThread->key,
+ UA::getQueryKey() => UA::getQueryValue()
+ )
+ ),
+ hs($aThread->itaj),
+ array('class' => 'tbutton itaButton')
+ );
+}
+
+/**
+ * @return string HTML
+ */
+function _getFavATag($aThread, $ttitle_en, $favvalue, $favmark, $favtitle)
+{
+ global $_conf, $STYLE;
+
+ // \x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1/\x8AO\x82\xB7
+ $info_qs = array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ 'key' => $aThread->key,
+ 'ttitle_en' => $ttitle_en,
+ UA::getQueryKey() => UA::getQueryValue()
+ );
+ $setfav_url = UriUtil::buildQueryUri('info_i.php', array_merge($info_qs, array('setfave' => $favvalue)));
+ $sid_qs = (defined('SID') && strlen(SID)) ? array(session_name() => session_id()) : array();
+ $setFavJs_query = UriUtil::buildQuery(array_merge($info_qs, $sid_qs));
+ $setFavJs_query_es = str_replace("'", "\\'", $setFavJs_query);
+ return $setFavATag = P2View::tagA(
+ $setfav_url,
+ hs($favmark),
+ array(
+ 'accesskey' => $_conf['pc_accesskey']['setfav'],
+ 'title' => $favtitle,
+ 'target' => 'info',
+ 'onclick' => "return setFavJs('{$setFavJs_query_es}', '{$favvalue}', {$STYLE['info_pop_size']}, 'read', this);",
+ 'class' => 'tbutton buttonW favbutton'
+ )
+ );
+}
+
+/**
+ * \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93\x81i\x83\x8A\x83\x93\x83N\x83o\x81[\x83W\x83\x87\x83\x93\x81j
* \x81i\x82\xB1\x82̊\x94\x82\xCD lib/read_filter_k.funcs.php \x82ł\xE0\x97\x98\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x81j
*
* @return string HTML
@@ -434,47 +484,127 @@
$rnum_range = $_conf['i_rnum_range'];
$newtime = date('gis');
- $goto_next_ht = ''; // \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93
- if ($read_navi_next_isInvisible) {
- $goto_next_ht = sprintf('<form style="margin-left: 1px; display:inline;" action="%s">', hs($_conf['read_php']));
- } else {
+ $qs = array();
+
+ if (!$read_navi_next_isInvisible) {
- // \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93
- $goto_next_ht = sprintf('<form style="margin-left: 1px; display:inline;" action="%s">', hs($_conf['read_php']));
- if (!$read_navi_next_isInvisible) {
+ // \x83\x8C\x83X\x8C\x9F\x8D\xF5\x8E\x9E
+ if (P2Util::ifFiltering()) {
+ $qs = array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ 'key' => $aThread->key,
+ 'offline' => 1,
+ UA::getQueryKey() => UA::getQueryValue(),
+
+ 'detect_hint' => '\x81\x9D\x81\x9E',
+ 'word' => $GLOBALS['word'],
+ 'ls' => 'all',
+ 'filter_page' => $filter_page + 1
+ );
+
+ } else {
+ $qs = array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ 'key' => $aThread->key,
+ 'offline' => 1,
+ UA::getQueryKey() => UA::getQueryValue(),
+
+ 'nt' => $newtime
+ );
+ }
+
+ $st = "{$next_st}";
+
+ // $aThread->resrange['to'] > $aThread->resrange_readnum
+ if ($aThread->resrange_multi and !empty($aThread->resrange_multi_exists_next)) {
+ $st = $st . '*';
+
+ $page = isset($_REQUEST['page']) ? max(1, intval($_REQUEST['page'])) : 1;
+ $next_page = $page + 1;
- if (P2Util::ifFiltering()) {
- $qs = array(
- 'host' => $aThread->host,
- 'bbs' => $aThread->bbs,
- 'key' => $aThread->key,
- 'offline' => 1,
- UA::getQueryKey() => UA::getQueryValue(),
-
- 'detect_hint' => '\x81\x9D\x81\x9E',
- 'word' => $GLOBALS['word'],
- 'ls' => 'all',
- 'filter_page' => $filter_page + 1
- );
+ $qs = array_merge($qs, array(
+ 'ls' => $aThread->ls,
+ 'page' => $next_page
+ ));
+
+ } else {
+ $after_rnum = $aThread->resrange['to'] + $rnum_range;
+ $als = "{$aThread->resrange['to']}-{$after_rnum}n" . $read_navi_next_anchor;
- } else {
- $qs = array(
- 'host' => $aThread->host,
- 'bbs' => $aThread->bbs,
- 'key' => $aThread->key,
- 'offline' => 1,
- UA::getQueryKey() => UA::getQueryValue(),
-
- 'nt' => $newtime
- );
- }
- foreach ($qs as $k => $v) {
- $goto_next_ht .= sprintf('<input type="hidden" name="%s" value="%s">', hs($k), hs(rawurlencode($v)));
- }
-
- $goto_next_ht .= P2View::getInputHiddenKTag();
+ $qs = array_merge($qs, array(
+ 'ls' => $als,
+ 'jsanc' => 'r' . ($aThread->resrange['to'] + 1)
+ ));
}
+ }
+
+ if ($read_navi_next_isInvisible) {
+ return sprintf('<span id="large_next">%s</span>', hs($next_st) . $rnum_range);
+ }
+
+ return P2View::tagA(
+ UriUtil::buildQueryUri($GLOBALS['_conf']['read_php'], $qs),
+ hs($st) . $rnum_range,
+ array('id' => 'large_next')
+ );
+}
+/**
+ * \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93\x81iform\x83o\x81[\x83W\x83\x87\x83\x93\x81j
+ * \x81i\x82\xB1\x82̊\x94\x82\xCD lib/read_filter_k.funcs.php \x82ł\xE0\x97\x98\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x81j
+ *
+ * @return string HTML
+ */
+ /*
+function _getGotoNextHtml($read_navi_next_isInvisible, $aThread, $next_st, $read_navi_next_anchor = '')
+{
+ global $_conf;
+
+ // $read_navi_next_anchor \x82͎g\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x82܂ŏȗ\xAA
+
+ $filter_page = isset($_REQUEST['filter_page']) ? max(1, intval($_REQUEST['filter_page'])) : 1;
+ $rnum_range = $_conf['i_rnum_range'];
+ $newtime = date('gis');
+
+ $goto_next_ht = ''; // \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93
+ $goto_next_ht = sprintf('<form style="margin-left: 1px; display:inline;" action="%s">', hs($_conf['read_php']));
+
+ if (!$read_navi_next_isInvisible) {
+
+ // \x83\x8C\x83X\x8C\x9F\x8D\xF5\x8E\x9E
+ if (P2Util::ifFiltering()) {
+ $qs = array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ 'key' => $aThread->key,
+ 'offline' => 1,
+ UA::getQueryKey() => UA::getQueryValue(),
+
+ 'detect_hint' => '\x81\x9D\x81\x9E',
+ 'word' => $GLOBALS['word'],
+ 'ls' => 'all',
+ 'filter_page' => $filter_page + 1
+ );
+
+ } else {
+ $qs = array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ 'key' => $aThread->key,
+ 'offline' => 1,
+ UA::getQueryKey() => UA::getQueryValue(),
+
+ 'nt' => $newtime
+ );
+ }
+ foreach ($qs as $k => $v) {
+ $goto_next_ht .= sprintf('<input type="hidden" name="%s" value="%s">', hs($k), hs($v));
+ }
+
+ $goto_next_ht .= P2View::getInputHiddenKTag();
+
$st = "{$next_st}";
// $aThread->resrange['to'] > $aThread->resrange_readnum
@@ -492,8 +622,10 @@
$als = "{$aThread->resrange['to']}-{$after_rnum}n" . $read_navi_next_anchor;
$goto_next_ht .= sprintf('<input type="hidden" name="ls" value="%s">', hs($als));
+ $goto_next_ht .= sprintf('<input type="hidden" name="jsanc" value="%s">', hs('r' . ($aThread->resrange['to'] + 1)));
}
}
+
$goto_next_ht .= sprintf(
'<input id="large_next" type="submit" value="%s"%s />',
$read_navi_next_isInvisible ? hs($next_st) . $rnum_range : hs($st) . $rnum_range,
@@ -503,6 +635,7 @@
return $goto_next_ht;
}
+*/
/**
* @return string
@@ -537,7 +670,8 @@
} else {
$after_rnum = $aThread->resrange['to'] + $rnum_range;
- $als = "{$aThread->resrange['to']}-{$after_rnum}n" . $read_navi_next_anchor;
+ //$als = "{$aThread->resrange['to']}-{$after_rnum}n" . $read_navi_next_anchor;
+ $als = "{$aThread->resrange['to']}-{$after_rnum}n" . '&jsanc=r' . ($aThread->resrange['to'] + 1);
$url .= '&ls=' . $als;
}
return $url;
@@ -572,7 +706,7 @@
$form .= '<input type="hidden" name="ttitle_en" value="' . hs(base64_encode($aThread->ttitle)) . '">';
$form .= sprintf('<select name="ls" action="%s" onChange="formReset()">', hs($_conf['read_php']));
-
+
if (!$read_range_hs) {
$read_range_hs = "\x83X\x83\x8C\x93\xE0\x88ړ\xAE($aThread->rescount)";
}
@@ -587,7 +721,7 @@
if ($ito <= $aThread->gotnum) {
$offline_range_q = '&offline=1';
}
- $form .= "<option value=\"{$i}-{$ito}\">{$i}-</option>";
+ $form .= "<option value=\"{$i}-{$ito}n\">{$i}-</option>";
}
/*
2006/03/06 aki \x83m\x81[\x83}\x83\x8Bp2\x82ł͖\xA2\x91Ή\x9E
@@ -662,6 +796,16 @@
$b_qs = array(
UA::getQueryKey() => UA::getQueryValue()
);
+
+ $info_qs = array_merge($thread_qs, $b_qs, array('ttitle_en' => $ttitle_en));
+
+ $info_atag = P2View::tagA(
+ UriUtil::buildQueryUri('info_i.php',
+ $info_qs
+ ),
+ hs('\x83X\x83\x8C\x8F\xEE\x95\xF1')
+ );
+
$similar_qs = array(
'detect_hint' => '\x81\x9D\x81\x9E',
'itaj_en' => base64_encode($aThread->itaj),
@@ -669,38 +813,20 @@
'word' => $aThread->ttitle_hc
// 'refresh' => 1
);
-
- $info_atag = P2View::tagA(
- UriUtil::buildQueryUri(
- $_conf['subject_php'],
- array_merge($thread_qs, $b_qs, $similar_qs, array('refresh' => '1'))
+ $similar_atag = P2View::tagA(
+ UriUtil::buildQueryUri($_conf['subject_php'],
+ array_merge($similar_qs, $thread_qs, $b_qs, array('refresh' => 1))
),
- hs('\x83X\x83\x8C\x8F\xEE\x95\xF1/\x97ގ\x97')
+ hs('\x8E\x97\x83X\x83\x8C')
);
-
- /*
- $dele_atag = P2View::tagA(
- UriUtil::buildQueryUri(
- 'info_i.php',
- array_merge($thread_qs, $b_qs,
- array(
- 'ttitle_en' => $ttitle_en,
- 'dele' => 1
- )
- )
- ),
- hs($dele_st)
- );
- */
$sid_qs = array();
if (defined('SID') && strlen(SID)) {
$sid_qs[session_name()] = session_id();
}
- $info_qs = array_merge($thread_qs, $b_qs, array('ttitle_en' => $ttitle_en));
+
$dele_url = UriUtil::buildQueryUri('info_i.php', array_merge($info_qs, array('dele' => '1')));
-
$deleLogJs_query = UriUtil::buildQuery(array_merge($info_qs, $sid_qs));
$deleLogJs_query_es = str_replace("'", "\\'", $deleLogJs_query);
@@ -722,7 +848,8 @@
return $toolbar_right_ht = <<<EOTOOLBAR
<li class="whiteButton">$info_atag</li>
- <li class="whiteButton">$dele_atag</li>
+ <!-- <li class="whiteButton">$dele_atag</li> -->
+ <li class ="whiteButton">$similar_atag</li>
<li class="whiteButton"><a href="{$motothre_url}">{$moto_thre_st}</a></li>
EOTOOLBAR;
}
Modified: p2/trunk/iphone/sb_footer_k.inc.php
===================================================================
--- p2/trunk/iphone/sb_footer_k.inc.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/sb_footer_k.inc.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -132,35 +132,61 @@
$k_sb_navi_ht \x82͉\xBA\x82̂R\x82Ɠ\xAF\x82\xB6
{$sb_range_st}
*/
-$foot_sure_ht = '';
-if ($dat_soko_ht) {
- $foot_sure_ht .= "<span class=\"soko\">{$dat_soko_ht}</span>";
-}
+
+$sb_footer_tool_ht = '';
if ($buildnewthread_atag) {
- $foot_sure_ht .= "<span class=\"build\">{$buildnewthread_atag}</span>";
+ $sb_footer_tool_ht .= sprintf('<li class="build">%s</li>', $buildnewthread_atag);
}
-if ($allfav_atag) {
- $foot_sure_ht .= "<span class=\"all\">{$allfav_atag}</span>";
-}
-if ($taborn_link_atag) {
- $foot_sure_ht .= "<span class=\"abon\">{$taborn_link_atag}</span>";
-}
if ($mae_ht) {
- $foot_sure_ht .= "<span class=\"mae\">{$mae_ht}</span>";
+ $sb_footer_tool_ht .= sprintf('<li class="prev">%s</li>', $mae_ht);
+} else {
+ $sb_footer_tool_ht .= '<li class="prev_disabled"></li>';
}
if ($tugi_ht) {
- $foot_sure_ht .= "<span class=\"tugi\">{$tugi_ht}</span>";
+ $sb_footer_tool_ht .= sprintf('<li class="next">%s</li>', $tugi_ht);
+} else {
+ $sb_footer_tool_ht .= '<li class="next_disabled"></li>';
}
+if ($matome_ht = getShinchakuMatomeATag($aThreadList, $shinchaku_num, true)) {
+ $sb_footer_tool_ht .= sprintf('<li class="matome">%s</li>', $matome_ht);
+}
-$index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()));
+// \x82\xBB\x82̑\xBC
+$toolbar_etc_ht = '';
+if ($dat_soko_ht) {
+ $toolbar_etc_ht .= sprintf('<li class="whiteButton">%s</span>', $dat_soko_ht);
+}
+if ($allfav_atag) {
+ $toolbar_etc_ht .= sprintf('<li class="whiteButton">%s</span>', $allfav_atag);
+}
+if ($taborn_link_atag) {
+ $toolbar_etc_ht .= sprintf('<li class="whiteButton">%s</span>', $taborn_link_atag);
+}
+
+
?>
<?php echo $htm['change_sort']; ?>
-<div id="foot">
- <div class="foot_sure">
- <?php echo $foot_sure_ht; ?>
- </div>
+
+<div id="footToolbar" class="footbar">
+<ul>
+ <li class="home"><a href="<?php eh($index_uri); ?>">TOP</a></li>
+ <?php if ($toolbar_etc_ht) { ?>
+ <li class="other" id="etcButoon" title="off"><a onclick="popUpFootbarFormIPhone(2);">\x82\xBB\x82̑\xBC</a></li>
+ <?php } ?>
+ <?php echo $sb_footer_tool_ht; ?>
+</ul>
</div>
-<p><a id="backButton" class="button" href="<?php eh($index_uri); ?>">TOP</a></p>
+
+<?php // \x81u\x82\xBB\x82̑\xBC\x81v\x82̃|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[ ?>
+<div id="footbarEtc">
+<filedset>
+<ul>
+ <?php echo $toolbar_etc_ht; ?>
+ <li class="grayButton" onclick="popUpFootbarFormIPhone(2,1);">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li><?php // \x82͂ݏo\x82\xB5\x82\xBD\x8E\x9E\x82̂\xBD\x82߂ɃL\x83\x83\x83\x93\x83Z\x83\x8B\x83{\x83^\x83\x93\x82͕K\x97v ?>
+</ul>
+</filedset>
+</div>
+
</body></html>
<?php
Modified: p2/trunk/iphone/sb_header_k.inc.php
===================================================================
--- p2/trunk/iphone/sb_header_k.inc.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iphone/sb_header_k.inc.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -5,7 +5,7 @@
//===============================================================
// HTML\x95\\x8E\xA6\x97p\x95ϐ\x94
//===============================================================
-$newtime = date("gis");
+$newtime = date('gis');
// {{{ \x83y\x81[\x83W\x83^\x83C\x83g\x83\x8B\x95\x94\x95\xAAURL\x90ݒ\xE8
@@ -98,7 +98,8 @@
</select>\n
EOP;
}
-$word_hs = hs($word);
+
+$word_hs = hsi($GLOBALS['wakati_word'], hsi($GLOBALS['word']));
$filter_form_ht = '';
if (
!$aThreadList->spmode
@@ -107,8 +108,8 @@
) {
$filter_form_ht = <<<EOP
<!-- <ul><li class="group">\x8C\x9F\x8D\xF5</li></ul> -->
-<div class="panel" style="padding:1px">
-<form method="GET" action="subject_i.php" accept-charset="{$_conf['accept_charset']}" style="margin:0 5px 7px 5px">
+<div class="panel threTitleKensaku">
+<form method="GET" action="subject_i.php" accept-charset="{$_conf['accept_charset']}" class="threTitleKensaku">
{$sb_form_hidden_ht}
<input type="text" id="word" name="word" value="{$word_hs}" size="11">$sb_form_method_ht
<input type="submit" name="submit_kensaku" value="\x8C\x9F\x8D\xF5">
@@ -138,8 +139,8 @@
P2View::printStyleTagImportIuiCss(); ?>
<script type="text/javascript" src="iphone/js/setfavjs.iphone.js?v=20061206"></script>
<script type="text/javascript" src="js/basic.js?2012"></script>
- <script type="text/javascript" src="iphone/js/iphone.js"></script>
-
+ <script type="text/javascript" src="iphone/js/iphone.js?2013060918"></script>
+ <script type="text/javascript" src="iphone/js/smartpopup.iPhone.js"></script>
<script type="text/javascript">
<!--
window.onload = function() {
@@ -151,9 +152,11 @@
<title><?php eh($aThreadList->ptitle) ?></title>
</head>
<body id="subject">
-<div class="toolbar">
-<h1 id="pageTitle"><?php eh($aThreadList->ptitle) ?></h1>
-</div>
+
+<?php $index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue())); ?>
+<p><a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a></p>
+
+<div class="toolbar"><h1 class="pageTitle"><?php eh($aThreadList->ptitle) ?></h1></div>
<?php
P2Util::printInfoHtml();
@@ -166,8 +169,31 @@
<p><?php echo getShinchakuMatomeATag($aThreadList, $shinchaku_num); ?></p>
<?php
+//=======================================================================================
+// \x8A\x94\x81i\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x93\xE0\x82ł̂ݗ\x98\x97p\x81j
+//=======================================================================================
+/**
+ * @return string HTML <a>\x83^\x83O
+ */
/*
+function _getBackItaAtag($aThreadList)
+{
+ return P2View::tagA(
+ UriUtil::buildQueryUri($GLOBALS['_conf']['subject_php'],
+ array(
+ 'host' => $aThreadList->host,
+ 'bbs' => $aThreadList->bbs,
+ UA::getQueryKey() => UA::getQueryValue()
+ )
+ ),
+ hs($aThreadList->itaj),
+ array('class' => 'tbutton itaButton')
+ );
+}
+*/
+
+/*
* Local Variables:
* mode: php
* coding: cp932
Added: p2/trunk/iui/footer_tool.png
===================================================================
(Binary files differ)
Property changes on: p2/trunk/iui/footer_tool.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: p2/trunk/iui/footer_tool_retina.png
===================================================================
(Binary files differ)
Property changes on: p2/trunk/iui/footer_tool_retina.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: p2/trunk/iui/footformbg.png
===================================================================
(Binary files differ)
Modified: p2/trunk/iui/iui.css
===================================================================
--- p2/trunk/iui/iui.css 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iui/iui.css 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,5 +1,9 @@
/* iui.css (c) 2007 by iUI Project Members, see LICENSE.txt for license */
+/*
+p2\x82ł\xCDiui.js\x82̋@\x94\\x82͎g\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81B
+http://koko.wiki.place-of-start.jp/memocho/?DigitalGadget%2FSmartPhone%2FWindowsPhone%2Frep2WPtmp
+2011/09/27 Windows Phone 7\x8C\xFC\x82\xAFIE9\x82́ACSS\x82́u>\x81v\x82ɂ\xE6\x82钼\x89\xBA\x82̎q\x97v\x91f\x82ɑ\xB7\x82\xE9\x83X\x83^\x83C\x83\x8B\x82̎w\x92肪\x95\xB7\x82\xA9\x82Ȃ\xA2\x82炵\x82\xA2 */
/*
body
\x91S\x91̂̃t\x83H\x83\x93\x83g\x90ݒ\xE8
@@ -65,23 +69,6 @@
background: url(toolbar.png) #6d84a2 repeat-x;
}
-/* \x83c\x81[\x83\x8B\x83o\x81[\x82̐^\x82̕\xB6\x8E\x9A */
-/* .toolbar > h1 { */
-.toolbar h1#pageTitle {
- position: absolute;
- overflow: hidden;
- left: 50%;
- margin: 1px 0 0 -80px;
- height: 45px;
- font-size: 20px;
- width: 160px; /* 150px */
- font-weight: bold;
- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
- text-align: center;
- text-overflow: ellipsis;
- white-space: nowrap;
- color: #FFFFFF;
-}
/* .toolbar > h1 > a { */
.toolbar h1 a {
@@ -93,136 +80,19 @@
width: 250px;
}
-/* (\x83x\x81[\x83X\x82Ƃ\xB5\x82ĉE\x8F\xE3\x82\xCC)\x83{\x83^\x83\x93 */
-.button {
- position: absolute;
- overflow: hidden;
- top: 8px;
- right: 6px;
- margin: 0;
- border-width: 0 5px;
- padding: 0 3px;
- width: auto;
- height: 30px;
- line-height: 30px;
- font-family: inherit;
- font-size: 12px;
- font-weight: bold;
- color: #FFFFFF;
- text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0;
- text-overflow: ellipsis;
- text-decoration: none;
- white-space: nowrap;
- background: none;
- -webkit-border-image: url(toolButton.png) 0 5 0 5;
-}
-.blueButton {
- -webkit-border-image: url(blueButton.png) 0 5 0 5;
- border-width: 0 5px;
-}
-
-.leftButton {
- left: 6px;
- right: auto;
-}
-
-#backButton {
- /*display: none;*/
- left: 6px;
- right: auto;
- padding: 0;
- max-width: 55px;
- border-width: 0 8px 0 14px;
- -webkit-border-image: url(backButton.png) 0 8 0 14;
-}
-
-.whiteButton,
-.grayButton {
- display: block;
- border-width: 0 12px;
- padding: 10px;
- text-align: center;
- font-size: 20px;
- font-weight: bold;
- text-decoration: inherit;
- color: inherit;
-}
-
-.whiteButton {
- -webkit-border-image: url(whiteButton.png) 0 12 0 12;
- text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
- -webkit-appearance:none;
-}
-
-.grayButton {
- -webkit-border-image: url(grayButton.png) 0 12 0 12;
- color: #FFFFFF;
-}
-
/************************************************************************************************/
-/*
-\x83\x8A\x83X\x83g\x8AW
-\x83\x81\x83j\x83\x85\x81[\x82̈ꗗ\x82\xE2\x83X\x83\x8C\x88ꗗ\x82Ȃ\xC7
-\x95\xB6\x8E\x9A\x82̑傫\x82\xB3\x93\x99\x82͂\xB1\x82\xB1\x82\xC5
-*/
-/* body > ul > li { */
-body ul li {
- position: relative;
- margin: 0;
- border-bottom: 1px solid #E0E0E0;
- padding: 8px 0 8px 10px;
- font-size: 18px;
- font-weight: bold;
- list-style: none;
- word-wrap: break-word;
-}
-/*
-\x88ꗗ\x82̃O\x83\x8B\x81[\x83v\x96\xBC
-top\x82ł́u\x83\x81\x83j\x83\x85\x81[\x81v\x81u\x94Œ\x9F\x8D\xF5\x81v\x82ƕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xE9\x82Ƃ\xB1\x82\xEB
-*/
-/* body > ul > li.group { */
-body ul li.group {
- position: relative;
- /* top: -1px;
- margin-bottom: -2px; */
- border-top: 1px solid #7d7d7d;
- border-bottom: 1px solid #999999;
- padding: 2px 10px 0px 10px;
- background: url(listGroup.png) repeat-x;
- font-size: 16px;
- font-weight: bold;
- text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
- color: #FFFFFF;
-}
-
-/* body > ul > li.group:first-child { */
-body ul li.group:first-child {
- top: 0;
- border-top: none;
-}
-/*
-\x88ꗗ\x82̃\x8A\x83\x93\x83N\x90ݒ\xE8
-padding\x82\xF0\x82\xA2\x82\xB6\x82\xEA\x82Η]\x94\x92\x82̒\xB2\x90\xAE\x89”\
-*/
-body > ul > li > a {
- display: block;
- margin: -8px 0 -8px -10px;
- padding: 8px 38px 8px 30px;
- text-decoration: none;
- color: inherit;
- background: url(listArrow.png) no-repeat right center;
-}
/* subject\x82̃X\x83\x8C\x88ꗗ */
body#subject > ul > li > a {
background: url();
padding-right: 22px;
+ padding-bottom:5px;
}
-/* iphone 080808*/
+/* TOP\x83y\x81[\x83W\x81A\x94ƒJ\x83e\x83S\x83\x8A\x81[\x83\x8A\x83X\x83g\x82̃\x81\x83j\x83\x85\x81[ */
body > ul#home > li > a {
- padding: 8px 32px 8px 10px;
+ padding: 8px 32px 7px 10px;
}
/**************
@@ -237,12 +107,12 @@
/* iPhone\x8F\xE3\x82\xCCSafari\x82\xBE\x82ƃJ\x83N\x83J\x83N */
-webkit-transition: all 0.1s linear;
}
-
+/* \x8Eg\x82\xC1\x82ĂȂ\xA2\x82\xE6\x82ˁH
body > ul > div > li {
position: relative;
margin: 0;
border-bottom: 1px solid #E0E0E0;
- padding: 8px 0 8px 10px;
+ padding: 8px 0 8px 9px;
font-size: 18px;
font-weight: bold;
list-style: none;
@@ -251,41 +121,45 @@
body > ul > div > li > a {
display: block;
margin: -8px 0 -8px -10px;
- padding: 8px 38px 8px 30px;
+ padding-right: 38px; padding-left: 30px;
text-decoration: none;
color: inherit;
background: url(listArrow.png) no-repeat right center;
}
-
-body > ul > div> li.cate {
+*/
+body > ul > div > li.cate {
background-color: #f6f6f6;
}
-body > ul > div> li.cate > a {
- padding: 8px 32px 8px 10px;
- background: none;
+body > ul > div > li.cate > a {
+ padding-right: 32px; padding-left: 10px;
+ background: none;
}
/************/
-/* \x94‚\xA8\x8BC\x82ɓ\xFC\x82\xE8\x92lj\xC1 */
+/* \x94ˆꗗ \x83X\x83\x8C\x88ꗗ \x82\xA8\x8BC\x82ɓ\xFC\x82\xE8\x92lj\xC1 */
li > .plus {
display: inline;
position: absolute;
left: 0px;
- top: 2px;
- width: 25px;
- height: 30px;
+ top: 4px;
margin: 0;
padding: 0;
background: none;
text-align: center;
}
+body.menu_i li > .plus {
+ top: 8px;
+}
li > .plus > a{
padding:0;
- height: 30px;
color: black;
text-decoration: none;
}
+li > .plus > a > img {
+ width: 29px; height: 29px; vertical-align:middle; border:0;
+}
+
/* \x90ݒ\xE8\x83y\x81[\x83W\x97p */
select {
font-size: 16px;
@@ -321,19 +195,8 @@
}
-a[target="_replace"] {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- padding-top: 25px;
- padding-bottom: 25px;
- font-size: 18px;
- color: cornflowerblue;
- background-color: #FFFFFF;
- background-image: none;
-}
-
/************************************************************************************************/
-
+
body > .dialog {
top: 0;
width: 100%;
@@ -385,13 +248,14 @@
/************************************************************************************************/
/* body > .panel { */
-body .panel {
+body .panel { /* body \x82\xF0\x82‚\xAF\x82Ă\xA2\x82Ȃ\xA2\x82\xC6padding\x82\xAA\x8C\xF8\x82\xA9\x82Ȃ\xAD\x82Ȃ\xE9 */
box-sizing: border-box;
-webkit-box-sizing: border-box;
padding: 10px;
background: #c8c8c8 url(pinstripes.png);
}
+
.panel > fieldset {
position: relative;
margin: 0 0 20px 0;
@@ -403,19 +267,20 @@
font-size: 16px;
}
-.row {
+/* \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 */
+div.row {
position: relative;
min-height: 42px;
border-bottom: 1px solid #999999;
border-radius: 0;
- text-align: right;
+ /* text-align: right; */
}
-fieldset > .row:last-child {
+fieldset > div.row:last-child {
border-bottom: none !important;
}
-/* iPhone \x83X\x83\x8C\x8F\xEE\x95\xF1\x97p\x82ɒlj\xC1 */
-.row > span {
+
+div.row > input {
box-sizing: border-box;
-webkit-box-sizing: border-box;
margin: 0;
@@ -426,106 +291,52 @@
font-size: 16px;
background: none;
}
-.row > input {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- margin: 0;
- width: 100%;
+div.row > textarea {
border: none;
- padding: 12px 10px 0 100px;
- height: 42px;
- font-size: 16px;
- background: none;
-}
-.row > textarea {
- border: none;
margin-top: 0px;
margin-right: 4px;
padding-left: 100px;
font-size: 16px;
width: 100%;
}
-.row > label {
+
+div.row > label {
position: absolute;
margin: 0 0 0 14px;
line-height: 42px;
font-weight: bold;
}
-.row > .toggle {
- position: absolute;
- top: 6px;
- right: 6px;
- width: 100px;
- height: 28px;
-}
-
-.toggle {
- border: 1px solid #888888;
- border-radius: 6px;
- background: #FFFFFF url(toggle.png) repeat-x;
- font-size: 19px;
+.panel > h2 {
+ margin: 0 0 5px 8px;
+ font-size: inherit;
font-weight: bold;
- line-height: 30px;
+ color: #4d4d70;
+ text-shadow: rgba(255, 255, 255, 0.75) 1px 1px 0;
}
-.toggle[toggled="true"] {
- border: 1px solid #143fae;
- background: #194fdb url(toggleOn.png) repeat-x;
+/* \x83X\x83\x8C\x8F\xEE\x95\xF1\x89\xE6\x96\xCA */
+body#info_i div.infocard {
+ background-color:#fff;
+ padding: 8px 12px;
+ border-radius: 10px;
}
-
-.toggleOn {
- display: none;
- position: absolute;
- width: 60px;
- text-align: center;
- left: 0;
- top: 0;
- color: #FFFFFF;
- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
+body#info_i div.infocard div.inforow {
+ position: relative;
+ min-height: 42px;
+ padding: 4px 2px;
+ border-bottom: 1px solid #ccc;
}
-
-.toggleOff {
- position: absolute;
- width: 60px;
- text-align: center;
- right: 0;
- top: 0;
- color: #666666;
+body#info_i div.infocard div.inforow label {
+ font-weight: bold; display:block; line-height:130%;
}
-
-.toggle[toggled="true"] > .toggleOn {
- display: block;
+body#info_i div.infocard div.inforow div.inforowcont {
+ margin-top:0;
+ margin-left:10px;
+ padding-top:0;
+ line-height:120%;
}
-.toggle[toggled="true"] > .toggleOff {
- display: none;
-}
-
-.thumb {
- position: absolute;
- top: -1px;
- left: -1px;
- width: 40px;
- height: 28px;
- border: 1px solid #888888;
- border-radius: 6px;
- background: #ffffff url(thumb.png) repeat-x;
-}
-
-.toggle[toggled="true"] > .thumb {
- left: auto;
- right: -1px;
-}
-
-.panel > h2 {
- margin: 0 0 5px 8px;
- font-size: inherit;
- font-weight: bold;
- color: #4d4d70;
- text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0;
-}
-
/************************************************************************************************/
#preloader {
@@ -534,59 +345,6 @@
url(blueButton.png), url(listArrowSel.png), url(listGroup.png);
}
-
-/************************************************************************************************/
-/*\x81@\x83X\x83\x8C\x88ꗗ\x82̂ӂ\xC1\x82ƃ\x81\x83j\x83\x85\x81[ */
-#foot {
- background-image: url(footback.png);
- background-position: top;
- width:100%;
- padding: 0;
- border: 0;
- margin:0;
- height: 51px;
-overflow: hidden;
-}
-.foot_sure {
- padding:0;
- margin: 0;
-}
-
-/* .foot_sure > span { */
-.foot_sure span {
- width: 64px;
- height: 50px;
- overflow: hidden;
- padding: 0;
- margin:0;
- margin-top: 1px;
- float: left;
- text-align: center;
- background-image: url(foottab_sure.png);
-}
-#foot a {
- display: inline-block;
- height: 50px;
- width: 54px;
- text-indent: -10000px;
- padding: 0;
- margin:0;
- }
-
-.foot_sure > span.soko {background-position: 0 0;}
-.foot_sure > span.soko:hover {background-position:0 -50px;}
-.foot_sure > span.build {background-position: -64px 0;}
-.foot_sure > span.build:hover {background-position: -64px -50px;}
-/* \x96\xA2\x90ݒ\xE8 */
-.foot_sure > span.abon {background-position: -256px 0;}
-.foot_sure > span.abon:hover {background-position: -256px -50px;}
-.foot_sure > span.all {background-position: 0 0;}
-.foot_sure > span.all:hover {background-position: 0 -50px;}
-
-.foot_sure > span.mae {background-position: -128px 0;}
-.foot_sure > span.mae:hover {background-position: -128px -50px;}
-.foot_sure > span.tugi {background-position: -192px 0;}
-.foot_sure > span.tugi:hover {background-position: -192px -50px;}
/*******************************/
/* \x82\xA8\x8BC\x82ɓ\xFC\x82\xE8\x95ҏW\x97p */
@@ -614,9 +372,24 @@
}
/* \x83\x8C\x83X\x90\x94\x8E\x9A */
.sbnum {
+ white-space: nowrap;
color: #999999;
font-size: 14px;
}
+.sbnum > .sbnumstr {
+ font-size: 10px;
+}
+
+/* \x90\xA8\x82\xA2 */
+.ikioi {
+ white-space: nowrap;
+ color: #999;
+ font-size: 13px;
+}
+.ikioi > .ikioistr {
+ font-size: 10px;
+}
+
/* \x81isubject\x82̃X\x83\x8C\x88ꗗ\x82ł́j\x96\xA2\x93\xC7(\x90V\x92\x85)\x90\x94\x8E\x9A */
.unum {
position: absolute;
@@ -627,7 +400,7 @@
font-size: 15px;
padding: 1px 5px;
background-color: #8C99B4;
- border-radius:10px;
+ border-radius: 10px;
}
/* \x83X\x83\x8C\x83^\x83C\x83\x8A\x83\x93\x83N */
@@ -638,6 +411,25 @@
/* \x81i\x94–\xBC\x81j */
.ita {
+ white-space: nowrap;
color: #666;
font-size: 12px;
-}
\ No newline at end of file
+}
+
+/* \x83X\x83\x8C\x83^\x83C\x8C\x9F\x8D\xF5 */
+div.threTitleKensaku{
+ padding:1px
+}
+form.threTitleKensaku{
+ margin:0 5px 7px 5px;
+}
+
+/* \x94Œ\x9F\x8D\xF5 */
+div.itaKensaku{
+ padding:1px
+}
+
+/* \x94Œ\x9F\x8D\xF5\x83t\x83H\x81[\x83\x80 */
+form.itaKensaku{
+ margin:0 5px 7px 5px;
+}
Modified: p2/trunk/iui/iui.js
===================================================================
--- p2/trunk/iui/iui.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iui/iui.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,5 +1,7 @@
/*
- Copyright (c) 2007, iUI Project Members
+ \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82\xCDp2\x82ł͎g\x82\xC1\x82Ă\xA2\x82Ȃ\xA2
+
+ Copyright (c) 2007, iUI Project Members
See LICENSE.txt for licensing terms
*/
Modified: p2/trunk/iui/iuix.css
===================================================================
--- p2/trunk/iui/iuix.css 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iui/iuix.css 2013-06-13 09:51:17 UTC (rev 952)
@@ -1,4 +1,4 @@
-/* 2010/01/14 aki \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82\xCDp2\x82ł͎g\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x82݂\xBD\x82\xA2 */
+/* 2010/01/14 \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82\xCDp2\x82ł͎g\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82\xBE */
body{
margin:0;
Modified: p2/trunk/iui/iuix.js
===================================================================
--- p2/trunk/iui/iuix.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iui/iuix.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -1 +1,2 @@
+// \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82\xCDp2\x82ł͎g\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82\xBE
(function(){var _1=20;var _2=0;var _3=null;var _4=null;var _5=0;var _6=location.hash;var _7="#_";var _8=[];var _9=0;var _a;window.iui={showPage:function(_b,_c){if(_b){if(_4){_4.removeAttribute("selected");_4=null;}if(hasClass(_b,"dialog")){showDialog(_b);}else{var _d=_3;_3=_b;if(_d){setTimeout(slidePages,0,_d,_b,_c);}else{updatePage(_b,_d);}}}},showPageById:function(_e){var _f=$(_e);if(_f){var _10=_8.indexOf(_e);var _11=_10!=-1;if(_11){_8.splice(_10,_8.length);}iui.showPage(_f,_11);}},showPageByHref:function(_12,_13,_14,_15,cb){var req=new XMLHttpRequest();req.onerror=function(){if(cb){cb(false);}};req.onreadystatechange=function(){if(req.readyState==4){if(_15){replaceElementWithSource(_15,req.responseText);}else{var _18=document.createElement("div");_18.innerHTML=req.responseText;iui.insertPages(_18.childNodes);}if(cb){setTimeout(cb,1000,true);}}};if(_13){req.open(_14||"GET",_12,true);req.setRequestHeader("Content-Type","application/x-www-form-urlencoded");req.setRequestHea
der("Content-Length",_13.length);req.send(_13.join("&"));}else{req.open(_14||"GET",_12,true);req.send(null);}},insertPages:function(_19){var _1a;for(var i=0;i<_19.length;++i){var _1c=_19[i];if(_1c.nodeType==1){if(!_1c.id){_1c.id="__"+(++_9)+"__";}var _1d=$(_1c.id);if(_1d){_1d.parentNode.replaceChild(_1c,_1d);}else{document.body.appendChild(_1c);}if(_1c.getAttribute("selected")=="true"||!_1a){_1a=_1c;}--i;}}if(_1a){iui.showPage(_1a);}},getSelectedPage:function(){for(var _1e=document.body.firstChild;_1e;_1e=_1e.nextSibling){if(_1e.nodeType==1&&_1e.getAttribute("selected")=="true"){return _1e;}}}};addEventListener("load",function(_1f){var _20=iui.getSelectedPage();if(_20){iui.showPage(_20);}setTimeout(preloadImages,0);setTimeout(checkOrientAndLocation,0);_a=setInterval(checkOrientAndLocation,300);},false);addEventListener("click",function(_21){var _22=findParent(_21.target,"a");if(_22){function unselect(){_22.removeAttribute("selected");}if(_22.href&&_22.hash&&_22.hash!="#"){_2
2.setAttribute("selected","true");iui.showPage($(_22.hash.substr(1)));setTimeout(unselect,500);}else{if(_22==$("backButton")){history.back();}else{if(_22.getAttribute("type")=="submit"){submitForm(findParent(_22,"form"));}else{if(_22.getAttribute("type")=="cancel"){cancelDialog(findParent(_22,"form"));}else{if(_22.target=="_replace"){_22.setAttribute("selected","progress");iui.showPageByHref(_22.href,null,null,_22,unselect);}else{if(!_22.target){_22.setAttribute("selected","progress");iui.showPageByHref(_22.href,null,null,null,unselect);}else{return;}}}}}}_21.preventDefault();}},true);addEventListener("click",function(_23){var div=findParent(_23.target,"div");if(div&&hasClass(div,"toggle")){div.setAttribute("toggled",div.getAttribute("toggled")!="true");_23.preventDefault();}},true);function checkOrientAndLocation(){if(window.innerWidth!=_5){_5=window.innerWidth;var _25=_5==320?"profile":"landscape";document.body.setAttribute("orient",_25);setTimeout(scrollTo,100,0,1);}if(lo
cation.hash!=_6){var _26=location.hash.substr(_7.length);iui.showPageById(_26);}}function showDialog(_27){_4=_27;_27.setAttribute("selected","true");if(hasClass(_27,"dialog")&&!_27.target){showForm(_27);}}function showForm(_28){_28.onsubmit=function(_29){_29.preventDefault();submitForm(_28);};_28.onclick=function(_2a){if(_2a.target==_28&&hasClass(_28,"dialog")){cancelDialog(_28);}};}function cancelDialog(_2b){_2b.removeAttribute("selected");}function updatePage(_2c,_2d){if(!_2c.id){_2c.id="__"+(++_9)+"__";}location.href=_6=_7+_2c.id;_8.push(_2c.id);var _2e=$("pageTitle");if(_2c.title){_2e.innerHTML=_2c.title;}if(_2c.localName.toLowerCase()=="form"&&!_2c.target){showForm(_2c);}var _2f=$("backButton");if(_2f){var _30=$(_8[_8.length-2]);if(_30&&!_2c.getAttribute("hideBackButton")){_2f.style.display="inline";_2f.innerHTML=_30.title?_30.title:"Back";}else{_2f.style.display="none";}}}function slidePages(_31,_32,_33){var _34=(_33?_31:_32).getAttribute("axis");if(_34=="y"){(_33?_31:
_32).style.top="100%";}else{_32.style.left="100%";}_32.setAttribute("selected","true");scrollTo(0,1);clearInterval(_a);var _35=100;slide();var _36=setInterval(slide,_2);function slide(){_35-=_1;if(_35<=0){_35=0;if(!hasClass(_32,"dialog")){_31.removeAttribute("selected");}clearInterval(_36);_a=setInterval(checkOrientAndLocation,300);setTimeout(updatePage,0,_32,_31);}if(_34=="y"){_33?_31.style.top=(100-_35)+"%":_32.style.top=_35+"%";}else{_31.style.left=(_33?(100-_35):(_35-100))+"%";_32.style.left=(_33?-_35:_35)+"%";}}}function preloadImages(){var _37=document.createElement("div");_37.id="preloader";document.body.appendChild(_37);}function submitForm(_38){iui.showPageByHref(_38.action||"POST",encodeForm(_38),_38.method);}function encodeForm(_39){function encode(_3a){for(var i=0;i<_3a.length;++i){if(_3a[i].name){args.push(_3a[i].name+"="+escape(_3a[i].value));}}}var _3c=[];encode(_39.getElementsByTagName("input"));encode(_39.getElementsByTagName("select"));return _3c;}function
findParent(_3d,_3e){while(_3d&&(_3d.nodeType!=1||_3d.localName.toLowerCase()!=_3e)){_3d=_3d.parentNode;}return _3d;}function hasClass(_3f,_40){var re=new RegExp("(^|\\s)"+_40+"($|\\s)");return re.exec(_3f.getAttribute("class"))!=null;}function replaceElementWithSource(_42,_43){var _44=_42.parentNode;var _45=_42;while(_44.parentNode!=document.body){_44=_44.parentNode;_45=_45.parentNode;}var _46=document.createElement(_45.localName);_46.innerHTML=_43;_44.removeChild(_45);while(_46.firstChild){_44.appendChild(_46.firstChild);}}function $(id){return document.getElementById(id);}function ddd(){console.log.apply(console,arguments);}})();
\ No newline at end of file
Modified: p2/trunk/iui/read.css
===================================================================
--- p2/trunk/iui/read.css 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/iui/read.css 2013-06-13 09:51:17 UTC (rev 952)
@@ -3,7 +3,7 @@
/*
\x95\\x8E\xA6\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x82͂\xB1\x82\xB1\x82\xCCbody\x82\xF0\x82\xA2\x82\xB6\x82\xC1\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
\x83t\x83H\x83\x93\x83g\x83t\x83@\x83~\x83\x8A\x81[\x82\xE0\x82\xB1\x82\xB1\x82ɒlj\xC1\x82\xC5
-\x81iread\x82ł\xCDiui.css\x82͓ǂݍ\x9E\x82܂\xEA\x82Ă\xA2\x82Ȃ\xA2\x81Bread.css\x82\xBE\x82\xAF\x81j
+\x81iread\x82ł\xCDiui.css\x82͓ǂݍ\x9E\x82܂\xEA\x82Ă\xA2\x82Ȃ\xA2\x81Bsmartphone.css\x82\xC6read.css\x82\xBE\x82\xAF\x81j
*/
body{
line-height:132%;
@@ -23,19 +23,22 @@
margin-right: 5px; margin-left: 5px;
}
+/* \x83\x8C\x83X\x8BL\x8E\x96 */
+div.rdiv {
+ margin-right: 0px; margin-left: 0px; /* \x93\xFC\x82\xEA\x8Eq\x82ƂȂ邽\x82\xDFmargin\x82\xF0\x83[\x83\x8D\x82\xC9 */
+}
+
/* \x83X\x83\x8C\x83^\x83C */
-.thread_title {
- margin: 9px 5px 9px 5px;
+h4.thread_title { /* read */
+ margin: 10px 4px 8px 4px;
color: #f40;
}
-
-/* \x83\x8C\x83X\x94ԍ\x86\x88ړ\xAE \x83i\x83r\x83Q\x81[\x83V\x83\x87\x83\x93 */
-div#footform {
- margin: 8px 5px 8px 5px;;
- /* border-top: 1px solid #999999; */
- /* padding-top: 5px; */
- /* padding-right: 5px; padding-left: 5px; */
+div.thread_title { /* read_new_i */
+ margin: 10px 4px 8px 4px;
}
+span.thread_title {
+ color: #f40;
+}
hr {
margin:1px;
@@ -55,7 +58,7 @@
/* \x83\x8C\x83X\x96{\x95\xB6 */
div.rbody {
margin: 3px 2px 9px 3px;
- padding: 0px 4px 0px 4px;
+ padding: 0px 4px 0px 6px;
}
/* URL \x91\xBD\x82\xA9\x82\xE7\x82\xE0\x82\xA4\x82\xA2\x82\xE7\x82Ȃ\xA2\x82\xA9\x82\xE0 */
@@ -66,7 +69,7 @@
/* read_new_i \x82ł̃X\x83\x8C\x83b\x83h\x83t\x83b\x83^\x95\\x8E\xA6 */
div.read_new_thre_footer {
- margin-bottom:3px;
+ padding-top: 0px; padding-bottom: 4px;
}
/***********************************************************/
@@ -84,207 +87,100 @@
background:url(toolbar.png) #6d84a2 repeat-x;
}
-.toolbar > h1{
- position:absolute;
- overflow:hidden;
- left:50%;
- margin:1px 0 0 -80px;
- height:45px;
- font-size:20px;
- width:150px;
- font-weight:bold;
- text-shadow:rgba(0,0,0,0.4) 0 -1px 0;
- text-align:center;
- text-overflow:ellipsis;
- white-space:nowrap;
- color:#FFF;
+/* \x83c\x81[\x83\x8B\x83o\x81[\x82̐^\x82̕\xB6\x8E\x9A read_new_i */
+.toolbar > h1.pageTitle{
+ font-size: 17px;
}
+.toolbar > h1.noShinMatome{
+ font-size:14px; left:227px; right:6px; padding-top:5px;
+}
+
.toolbar a {
color: #FFFFFF;
text-decoration: none;
- padding: 2px;
+ /* padding: 2px; */
}
.toolbar select {
margin-left: 90px;
}
-.button{
- position:absolute;
- overflow:hidden;
- top:8px;
- right:6px;
- margin:0;
- border-width:0 5px;
- padding:0 5px;
- width: 30px;
- height:30px;
+.toolbar a.buttonW{
+ width: 28px;
text-align: center;
- line-height:30px;
- font-family:inherit;
- font-size:14px;
- font-weight:bold;
- color:#FFF;
- text-shadow:rgba(0,0,0,0.6) 0 -1px 0;
- text-overflow:ellipsis;
- text-decoration:none;
- white-space:nowrap;
- background:none;
- -webkit-border-image:url(toolButton.png) 0 5 0 5;
}
-.favbutton{
- position:absolute;
- overflow:hidden;
- top:8px;
- right:60px;
- margin:0;
- border-width:0 5px;
- padding:0 3px;
- text-align: center;
- width:30px;
- height:30px;
- line-height:30px;
- font-family:inherit;
- font-size:14px;
- font-weight:bold;
- color:#FFF;
- text-shadow:rgba(0,0,0,0.6) 0 -1px 0;
- text-overflow:ellipsis;
- text-decoration:none;
- white-space:nowrap;
- background:none;
- -webkit-border-image:url(toolButton.png) 0 5 0 5;
+a.longitaButton {
+ width:90px; max-width: 90px; text-align:center;
}
+.toolbar a.favbutton{
+ right: 106px;
+}
+/* \x83\x8C\x83X\x94ԍ\x86\x88ړ\xAE \x83i\x83r\x83Q\x81[\x83V\x83\x87\x83\x93 */
+div#footform {
+ margin: 8px 5px 8px 5px;;
+ /* border-top: 1px solid #999999; */
+ /* padding-top: 5px; */
+ /* padding-right: 5px; padding-left: 5px; */
+}
+
/* \x96{\x95\xB6\x83t\x83b\x83^\x81[\x97p\x83{\x83^\x83\x93 */
-#footform select{
+div#footform select{
text-align: center;
width: 300px;
padding: 0;
}
-#frmresrange select{
+
+form#frmresrange{
+ position: absolute;
+}
+form#frmresrange select{
margin: 0px;
- width: 132px;
+ width: 134px;
+ height: 29px;
}
+
+/* \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93 */
#large_next{
- font-size:14px;
+ font-family:Helvetica;
+ display:block; position:relative; left:136px;
+ padding-top:4px; padding-bottom:0px;
+ text-decoration:none;
+ font-size: 14px;
font-weight: bold;
text-align: center;
- width: 168px;
+ width: 165px;
height: 26px;
- color:white;
+ color: white;
-webkit-border-image: url(toolButton.png) 0 5 0 5;
border-width: 0 5px;
}
-/* 2011/06/27 iPhone\x82ł\xCDdisabled\x82ʼn摜\x82\xAA\x94\x96\x82\xAD\x82Ȃ邪\x81AAndroid\x82ł͕ς\xED\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82̂Ŗ\xBE\x8E\xA6\x93I\x82Ɏw\x92肷\x82\xE9 */
-#large_next:disabled{
- opacity:0.4;
+/* \x8E\x9FN disabled */
+span#large_next{
+ opacity: 0.5;
}
+
#footform form {
/*margin-bottom: 3px;*/
margin: 0px;
}
-#footbar01 {
- background-image: url(footback.png);
- opacity:0.8;
- width:100%;
- padding: 0;
- margin:0;
- border: 0;
- height: 50px;
- overflow: hidden;
-}
-.footbar {
- padding:0;
- margin: 0;
- -webkit-tap-highlight-color:rgba(0,0,0,0);
-}
-.footbar>ul {
- display: inline;
- list-style:none
- padding: 0;
- margin: 0;
-}
-.footbar>ul>li {
- width: 53px;
- height: 50px;
- overflow: hidden;
- padding: 0;
- float: left;
- text-align: center;
- background-image: url(foottool.png);
-}
-.footbar a {
- width: 48px;
- height:45px;
- text-indent: -5000px;
- }
-
-.footbar>ul>li.home {background-position: 0 0;}
-.footbar>ul>li.home:hover {background-position: 0 -50px;}
-.footbar>ul>li.prev {background-position: -54px 0;}
-.footbar>ul>li.prev:hover {background-position: -54px -50px;}
-.footbar>ul>li.new {background-position: -106px 0;}
-.footbar>ul>li.new:hover {background-position: -106px -50px;}
-.footbar>ul>li.res {background-position: -160px 0;}
-.footbar>ul>li.res:hover {background-position: -160px -50px;}
-.footbar>ul>li.other {background-position: -212px 0;}
-.footbar>ul>li.other:hover {background-position: -212px -50px;}
-.footbar>ul>li.next {background-position: -265px 0;}
-.footbar>ul>li.next:hover {background-position: -265px -50px;}
-.footbar>ul>li#blank {opacity:0.2;}
-.footbar>ul>li#blank:hover {opacity:0;}
-
.blueButton{
-webkit-border-image:url(blueButton.png) 0 5 0 5;
border-width:0 5px;
padding: 3px;
}
-.leftButton{
- left:6px;
- right:auto;
-}
-#backButton{
- left:6px;
- right:auto;
- padding:0;
- width:55px;
- border-width:0 8px 0 14px;
- -webkit-border-image:url(backButton.png) 0 8 0 14;
-}
-
-.whiteButton,.grayButton{
- display:block;
- border-width:0 12px;
- padding:10px;
- text-align:center;
- font-size:20px;
- font-weight:bold;
- text-decoration:inherit;
- color:inherit;
-}
-
-.whiteButton{
- -webkit-border-image:url(whiteButton.png) 0 12 0 12;
- text-shadow:rgba(255,255,255,0.7) 0 1px 0;
-}
-
-.grayButton{
- -webkit-border-image:url(grayButton.png) 0 12 0 12;
- color:#FFF;
-}
/* ******************************* */
/* \x96{\x95\xB6\x82ł̓t\x83b\x83^\x82\xA0\x82\xBD\x82\xE8\x82Ŏg\x97p */
-body>ul {
+body > ul {
margin: 0;
padding: 0;
}
-
+/*
body>ul>li{
position:relative;
margin:0;
@@ -294,35 +190,8 @@
font-weight:bold;
list-style:none;
}
+*/
-body>ul>li.group{
- position:relative;
- top:-1px;
- margin-bottom:-2px;
- border-top:1px solid #7d7d7d;
- border-bottom:1px solid #999;
- padding:1px 10px;
- background:url(listGroup.png) repeat-x;
- font-size:17px;
- font-weight:bold;
- text-shadow:rgba(0,0,0,0.4) 0 1px 0;
- color:#FFF;
-}
-
-body>ul>li.group:first-child{
- top:0;
- border-top:none;
-}
-body>ul>li>a{
- display:block;
- margin:-8px 0 -8px -10px;
- padding:8px 32px 8px 10px;
- text-decoration:none;
- color:inherit;
- background:url(listArrow.png) no-repeat right center;
-}
-
-
/********************************************/
/* \x83X\x83\x8C\x93\xE0\x83\x8C\x83X\x8C\x9F\x8D\xF5 */
@@ -332,9 +201,9 @@
}
/* \x83\x8C\x83X\x94ԍ\x86 */
-span.trnum {
+span.trnum {margin-right:2px;
color: #333;
- font-size:15px;
+ font-size:16px;
}
/* \x83X\x83\x8C\x93\xE0\x93\xFA\x8E\x9E\x81A\x96\xBC\x91O\x81A\x82߁[\x82\xE9 */
@@ -370,30 +239,37 @@
position:absolute;
top:0;
visibility:hidden; /* \x95\x81\x92i\x82͉B\x82\xB5\x82Ă\xA8\x82\xAD*/
- background-color: rgba(22,22,22,0.7);
- color: #FFFFFF;
- border:1px black solid;
+ /* background-color: rgba(22,22,22,0.7); */
+ background-color: rgba(255,255,207,0.96);
+ /* color: #FFFFFF; */
+ border:1px #cccc40 solid;
font-size:16px;
- padding:2px 3px;
- line-height:120%;
+ padding:5px 4px 5px 6px;
+ line-height:122%;
word-break: break-word;
border-radius: 5px;
-webkit-box-shadow: 2px 2px 2px gray;
width: 92%;
margin-top: 50px;
margin-left: -2px;
- background-image:url(footformbg.png);
+ /* background-image:url(footformbg.png); */
-webkit-background-size: 100%;
}
-/* \x95‚\xB6\x82\xE9\x83{\x83^\x83\x93 */
-.respopup .close {
- position: absolute;
- top: -10px;
- left: -10px;
+/*
+.respopup span.tdate {
+ color: #eee;
}
+.respopup span.tname {
+ color: #cef;
+}
.respopup a {
- color: cyan;
+ color: #6cf; cyan
}
+*/
+.respopup span.tname {
+ margin-left:1px;
+}
+
.respopup input {
padding: 3px;
}
@@ -402,6 +278,13 @@
font-size: 14px;
}
+/* \x95‚\xB6\x82\xE9\x83{\x83^\x83\x93 */
+.respopup .close {
+ position: absolute;
+ top: -10px;
+ left: -10px;
+}
+
/*
\x83\x8C\x83X\x8C\x9F\x8D\xF5\x82ƃ\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82݃|\x83b\x83v\x83A\x83b\x83v
http://pc11.2ch.net/test/read.cgi/iPhone/1225958706/202
@@ -421,8 +304,10 @@
padding: 0;
overflow: visible;
}
+body > .dialog_write {
+ bottom: 0px;
+}
-
.dialog_filter > fieldset , .dialog_write > fieldset {
position: absolute;
box-sizing: border-box;
@@ -432,9 +317,9 @@
bottom: 1px;
border: none;
- border-top: 480px rgba(0, 0, 0, 0.2) solid;
+ /* border-top: 480px rgba(0, 0, 0, 0.2) solid; */
padding: 5px 6px 6px 0;
- background: rgba(0, 0, 0, 0.5) url(footformbg.png) repeat-x;
+ background: rgba(0, 0, 0, 0.5) url(footformbg.png?130609) repeat-x;
/*
border-top: 1px solid
padding: 0px 6px;
@@ -442,6 +327,10 @@
*/
overflow: visible;
}
+.dialog_write > fieldset {
+ position: relative; background-color:#aaa;
+ border:none;
+}
.dialog_filter fieldset > h1, .dialog_write > fieldset > h5 {
margin: 0 10px 0 10px;
@@ -502,6 +391,7 @@
}
textarea#MESSAGE {
padding: 6px 6px 6px 6px;
+ line-height:132%;
}
.dialog_write > fieldset > input[type="text"] {
width: 60%;
@@ -511,46 +401,6 @@
height:25px;
}
-#footbar02 {
- visibility:hidden;
- position: relative;
- bottom: 48px;
- left: 0;
- border:0;
- margin: 0;
- padding: 0;
- width: 100%;
- overflow: visible;
-}
-#footbar02 > filedset {
- position: absolute;
- width: 100%;
- margin: 0;
- bottom: 1px;
- border: none;
- padding: 0;
- border-top: 170px rgba(0,0,0,0.2) solid;
- background: rgba(0,0,0,0.5) url(footformbg.png) repeat-x;
- overflow: visible;
-}
-#footbar02 > filedset > ul {
- margin: 0;
- padding: 0;
- padding-top: 20px;
- margin-left: auto;
- margin-right: auto;
- width: 85%;
- text-align: center;
-}
-#footbar02 > filedset >ul>li {
- margin: 0;
- margin-bottom: 5px;
-}
-#footbar02 > filedset > ul > li a {
- width: 100%;
- text-decoration: none;
- color: #000000;
-}
/* \x89摜\x83T\x83\x80\x83l\x83C\x83\x8B */
img {
@@ -650,3 +500,5 @@
position: relative;
bottom: 320px;
}
+
+
Added: p2/trunk/iui/smartphone.css
===================================================================
--- p2/trunk/iui/smartphone.css (rev 0)
+++ p2/trunk/iui/smartphone.css 2013-06-13 09:51:17 UTC (rev 952)
@@ -0,0 +1,282 @@
+/* (\x83x\x81[\x83X\x82Ƃ\xB5\x82ĉE\x8F\xE3\x82\xCC)\x83{\x83^\x83\x93 */
+a.tbutton {
+ position: absolute;
+ overflow: hidden;
+ top: 8px;
+ right: 6px;
+ margin: 0;
+ border-width: 0 5px;
+ padding: 1px 3px 0 3px;
+ width: auto;
+ height: 30px;
+
+ line-height: 30px;
+ font-family: inherit;
+ font-size: 12px;
+ font-weight: bold;
+ color: #FFFFFF;
+ text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0;
+ text-overflow: ellipsis;
+ text-decoration: none;
+ white-space: nowrap;
+ background: none;
+ -webkit-border-image: url(toolButton.png) 0 5 0 5;
+ display:block;
+}
+
+/* \x8D\xB6\x8F\xE3\x82\xCCTOP\x83{\x83^\x83\x93 */
+a#backButton {
+ left: 6px; right: auto;
+ padding-right: 0px; padding-left: 0px;
+ width: auto; max-width: 55px;
+ font-family: Helvetica;
+ border-width: 0 8px 0 14px;
+ -webkit-border-image: url(backButton.png) 0 8 0 14;
+}
+
+/* \x83c\x81[\x83\x8B\x83o\x81[\x82̐^\x82̕\xB6\x8E\x9A */
+/* .toolbar > h1 { */
+.toolbar h1.pageTitle {
+ position: absolute;
+ overflow: hidden;
+ left: 50%;
+ margin: 1px 0 0 -80px;
+ padding-top: 2px;
+ height: 45px;
+ font-size: 18px;
+ width: 160px; /* 150px */
+ font-weight: bold;
+ text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
+ text-align: center;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #FFFFFF;
+}
+
+a.itaButton{
+ left: 56px; right: auto;
+ padding-right: 0px; padding-left: 0px;
+ width: auto; max-width: 88px;
+ /* font-family: Helvetica; */
+ border-width:0 8px 0 14px;
+ -webkit-border-image:url(backButton.png) 0 8 0 14;
+}
+
+
+.leftButton {
+ left: 6px;
+ right: auto;
+}
+
+.whiteButton, .grayButton{
+ display:block;
+ border-width:0 12px;
+ padding:10px;
+ text-align:center;
+ font-size:20px;
+ font-weight:bold;
+ text-decoration:inherit;
+ color:inherit;
+}
+
+.whiteButton {
+ -webkit-border-image: url(whiteButton.png) 0 12 0 12;
+ text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
+ /* -webkit-appearance: none; */
+}
+.whiteButton a {
+ display:block;
+}
+li.grayButton {
+ -webkit-border-image: url(grayButton.png) 0 12 0 12;
+ color: #FFFFFF;
+}
+
+/************************************************************************************************/
+/*
+\x83\x8A\x83X\x83g\x8AW
+\x83\x81\x83j\x83\x85\x81[\x82̈ꗗ\x82\xE2\x83X\x83\x8C\x88ꗗ\x82Ȃ\xC7
+\x95\xB6\x8E\x9A\x82̑傫\x82\xB3\x93\x99\x82͂\xB1\x82\xB1\x82\xC5
+*/
+/* body > ul > li { */
+body ul li {
+ position: relative;
+ margin: 0;
+ border-bottom: 1px solid #E0E0E0;
+ padding: 8px 0 8px 10px;
+ font-size: 18px;
+ font-weight: bold;
+ list-style: none;
+ word-wrap: break-word;
+}
+
+/*
+\x88ꗗ\x82̃O\x83\x8B\x81[\x83v\x96\xBC
+top\x82ł́u\x83\x81\x83j\x83\x85\x81[\x81v\x81u\x94Œ\x9F\x8D\xF5\x81v\x82ƕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xE9\x82Ƃ\xB1\x82\xEB
+*/
+/* body > ul > li.group { */
+body ul li.group {
+ position: relative;
+ /* top: -1px;
+ margin-bottom: -2px; */
+ border-top: 1px solid #7d7d7d;
+ border-bottom: 1px solid #999999;
+ padding: 2px 10px 0px 10px;
+ background: url(listGroup.png) repeat-x;
+ font-size: 16px;
+ font-weight: bold;
+ text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
+ color: #FFFFFF;
+}
+
+/* body > ul > li.group:first-child { */
+body ul li.group:first-child {
+ top: 0;
+ border-top: none;
+}
+
+/*
+\x83X\x83\x8C\x88ꗗ\x81A\x94ˆꗗ\x82Ȃǂ̃\x8A\x83X\x83g\x82̃\x8A\x83\x93\x83N\x90ݒ\xE8
+padding\x82\xF0\x82\xA2\x82\xB6\x82\xEA\x82Η]\x94\x92\x82̒\xB2\x90\xAE\x89”\
+*/
+body > ul > li {
+
+}
+body > ul > li > a {
+ display: block;
+ margin: -8px 0 -8px -10px;
+ padding: 8px 38px 7px 30px;
+ min-height:25px;
+ text-decoration: none;
+ color: inherit;
+ background: url(listArrow.png) no-repeat right center;
+}
+
+
+
+/* \x83t\x83b\x83^ \x83c\x81[\x83\x8B */
+
+#footToolbar {
+ background-image: url(footback.png); background-color:#333;
+ opacity:0.8;
+ width:100%;
+ padding: 0;
+ margin:0;
+ border: 0;
+ height: 50px;
+ overflow: hidden;
+}
+
+.footbar {
+ padding:0;
+ margin: 0;
+ -webkit-tap-highlight-color:rgba(0,0,0,0);
+}
+.footbar>ul {
+ display: inline;
+ list-style:none
+ padding: 0;
+ margin: 0;
+}
+.footbar > ul > li {
+ width: 52px;
+ height: 50px;
+ overflow: hidden;
+ padding: 0;
+ float: left;
+ text-align: center;
+ background-image: url(footer_tool.png?31);
+}
+ ＠ media only screen and (-webkit-min-device-pixel-ratio: 2),(-webkit-min-device-pixel-ratio: 1.5) {
+ .footbar > ul > li {
+ -webkit-background-size: 532px 100px;
+ background-image:url('footer_tool_retina.png?37');
+ }
+}
+.footbar a {
+ display: inline-block;
+ width: 48px;
+ height:45px;
+ text-indent: -5000px;
+}
+
+.footbar>ul>li.home {background-position: 0 0;}
+.footbar>ul>li.home:hover {background-position: 0 -50px;}
+.footbar>ul>li.prev {background-position: -54px 0;}
+.footbar>ul>li.prev:hover {background-position: -54px -50px;}
+.footbar > ul > li.prev_disabled {
+ background-position: -54px 0;
+ opacity:0.2;
+}
+.footbar>ul>li.new {background-position: -107px 0;}
+.footbar>ul>li.new:hover {background-position: -107px -50px;}
+.footbar > ul > li.new_disabled {
+ background-position: -107px 0;
+ opacity:0.2;
+}
+.footbar>ul>li.res {background-position: -160px 0;}
+.footbar>ul>li.res:hover {background-position: -160px -50px;}
+.footbar>ul>li.other {background-position: -212px 0;}
+.footbar>ul>li.other:hover {background-position: -212px -50px;}
+.footbar>ul>li.next {background-position: -264px 0;}
+.footbar>ul>li.next:hover {background-position: -264px -50px;}
+.footbar > ul > li.next_disabled {
+ background-position: -264px 0;
+ opacity:0.2;
+}
+.footbar > ul > li.delelog {background-position: -318px 0;}
+.footbar > ul > li.delelog_disabled {
+ background-position: -318px 0;
+ opacity:0.2;
+}
+
+
+/*\x81@\x83X\x83\x8C\x88ꗗ\x82̃t\x83b\x83g\x83\x81\x83j\x83\x85\x81[ \x83X\x83\x8C\x97\xA7\x82\xC4 */
+.footbar > ul > li.build {background-position: -422px 0;}
+.footbar > ul > li.build:hover {background-position: -422px -50px;}
+
+/* \x90V\x92\x85\x82܂Ƃߓǂ\xDD */
+.footbar > ul > li.matome {background-position: -474px 0;}
+.footbar > ul > li.matome:hover {background-position: -474px -50px;}
+
+/* \x83t\x83b\x83^\x83c\x81[\x83\x8B \x82\xBB\x82̑\xBC\x82̃\x81\x83j\x83\x85\x81[\x83|\x83b\x83v\x83A\x83b\x83v */
+#footbarEtc {
+ display: none;
+ position: relative;
+ bottom: 48px;
+ left: 0;
+ border:0;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ overflow: visible;
+}
+#footbarEtc > filedset {
+ position: absolute;
+ width: 100%;
+ margin: 0;
+ bottom: 1px;
+ border: none;
+ padding: 0;
+ /* border-top: 220px rgba(0,0,0,0.2) solid; */
+ background: rgba(0,0,0,0.5) url(footformbg.png) repeat-x;
+ overflow: visible;
+}
+#footbarEtc > filedset > ul {
+ margin: 0;
+ padding: 0;
+ padding-top: 20px;
+ margin-left: auto;
+ margin-right: auto;
+ width: 85%;
+ text-align: center;
+}
+#footbarEtc > filedset > ul > li {
+ margin: 0;
+ margin-bottom: 5px;
+}
+#footbarEtc > filedset > ul > li a {
+ width: 100%;
+ text-decoration: none;
+ color: #000000;
+}
Modified: p2/trunk/js/delelog.js
===================================================================
--- p2/trunk/js/delelog.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/js/delelog.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -18,29 +18,62 @@
infourl = 'info.php?' + tquery + '&popup=2&dele=true';
return openSubWin(infourl,info_pop_width,info_pop_height,0,0);
}
+
+ // \x8D폜\x82̕\xB6\x8E\x9A\x82\xF0\x83O\x83\x8C\x81[\x82ɂ\xB7\x82\xE9
+ if (page != 'read_i_tool') {
+ obj.style.color = 'gray';
+ }
- var url = 'httpcmd.php?' + tquery + '&cmd=delelog'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8
-
+ // \x8D폜\x8F\x88\x97\x9D\x8A\xAE\x97\xB9\x8C\xE3\x82̃R\x81[\x83\x8B\x83o\x83b\x83N\x8A\x94
var func = function(xobj){
var rmsg = '';
- var res = xmlHttpObj.responseText.replace(/^<\?xml .+?\?>\n?/, '');;
- if (res == '1') {
+ var res = xmlHttpObj.responseText.replace(/^<\?xml .+?\?>\n?/, '');
+
+ if (page == 'read_i_tool') {
+ document.getElementById('read').style.backgroundColor = '#e0e0e0';
+
+ var elems = document.getElementsByClassName("trnum");
+ //elems = elems.slice(0);
+ //alert(elems);
+ for (i = 0; i < elems.length; i++) {
+ //elems[i].className = "change";
+ elems[i].style.color = "#555";
+ }
+
+ var readi_delelog = document.getElementById('readi_delelog');
+ var usems = Date.now() - gDeleLogDateNow;
+ var ms = 0;
+ if (usems < 100) {
+ ms = 100;
+ }
+ setTimeout(function(){ // \x83A\x83C\x83R\x83\x93\x95ω\xBB\x82ɍŒ\xE1\x8C\xC0\x82̊Ԃ\xF0\x92u\x82\xAD
+ readi_delelog.style.backgroundPosition = '-368px 0';
+ obj.parentNode.innerHTML = '';
+
+ }, ms);
+
+ } else if (res == '1') {
rmsg = (page == 'subject') ? '\x8D\xED' : '\x8A\xAE\x97\xB9';
} else if (res == '2') {
rmsg = (page == 'subject') ? '\x96\xB3' : '\x8A\xAE\x97\xB9';
}
+
if (rmsg) {
// Gray() \x82\xCD IE ActiveX\x97p
if (page == 'read_new') {
+ // \x82\xA2\x82܂\xA2\x82\xBF\x82Ȋ\xB4\x82\xB6\x82\xCCDOM\x8Ew\x92\xE8\x95\xFB\x96@
obj.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.style.filter = 'Gray()';
} else if (page == 'read') {
document.body.style.filter = 'Gray()';
}
+
obj.parentNode.innerHTML = rmsg;
}
};
- obj.style.color = 'gray';
+ var url = 'httpcmd.php?' + tquery + '&cmd=delelog'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8
+
+ gDeleLogDateNow = Date.now();
getResponseTextHttp(xmlHttpObj, url, 'nc', true, func);
return true;
Modified: p2/trunk/js/post_form.js
===================================================================
--- p2/trunk/js/post_form.js 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/js/post_form.js 2013-06-13 09:51:17 UTC (rev 952)
@@ -49,9 +49,32 @@
var hms = ex.getHours() + ":" + ex.getMinutes() + ":" + ex.getSeconds();
var p = String(ex).split(" ");
var ex = p[0] + ", " + p[2] + "-" + p[1] + "-" + y + " " + hms + " GMT;";
- document.cookie = cn + "=" + val +"; expires=" + ex;
+ var cookieraw = cn + "=" + val +"; path=/; expires=" + ex;
+ var cookiedomain = getCookieDomain();
+ if (cookiedomain) {
+ cookieraw = cookieraw + " domain=" + cookiedomain;
+ }
+ document.cookie = cookieraw;
}
+// @return string
+function getMyHost() {
+ return location.host.replace(/:\d+$/, '');
+}
+
+// for p2.2ch.net
+// @return string
+function getCookieDomain()
+{
+ var chost = 'p2.2ch.net';
+ var myhost = getMyHost();
+ var reg = new RegExp(chost.replace(/([^0-9A-Za-z_])/g + '$', '\\$1'));
+ if (myhost.match(reg)) {
+ return chost;
+ }
+ return '';
+}
+
// @return object
function getDataPostForm(host, bbs, key)
{
@@ -368,22 +391,30 @@
}
}
-// return boolean
+// @return boolean
function isNetFront() {
var ua = navigator.userAgent;
- if (ua.indexOf("NetFront") != -1 || ua.indexOf("AVEFront/") != -1 || ua.indexOf("AVE-Front/") != -1) {
+ if (ua.indexOf('NetFront') != -1 || ua.indexOf('AVEFront/') != -1 || ua.indexOf('AVE-Front/') != -1) {
return true;
- } else {
- return false;
}
+ return false;
}
+// @return boolean
+function isWin98() {
+ var ua = navigator.userAgent;
+ if (ua.indexOf('Windows 98') != -1) {
+ return true;
+ }
+ return false;
+}
+
// @thanks naoya <http://d.hatena.ne.jp/naoya/20050804/1123152230>
// @return void
function disableSubmit(form)
{
// 2006/02/15 NetFront\x82Ƃ͑\x8A\x90\xAB\x82\xAA\x88\xAB\x82\xAD\x8Cł܂\xE9\x82炵\x82\xA2\x82̂Ŕ\xB2\x82\xAF\x82\xE9
- if (isNetFront()) {
+ if (outOfDisableSubmit()) {
return;
}
@@ -399,7 +430,7 @@
function setHiddenValue(button)
{
// 2006/02/15 NetFront\x82Ƃ͑\x8A\x90\xAB\x82\xAA\x88\xAB\x82\xAD\x8Cł܂\xE9\x82炵\x82\xA2\x82̂Ŕ\xB2\x82\xAF\x82\xE9
- if (isNetFront()) {
+ if (outOfDisableSubmit()) {
return;
}
@@ -412,43 +443,78 @@
}
}
-// iPhone \x83t\x83b\x83^\x81[\x82̃\x8C\x83X\x8C\x9F\x8D\xF5\x82܂\xBD\x82͏\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̃|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x95\\x8E\xA6\x82\xB7\x82郁\x83\\x83b\x83h
-// Edit 080727 by 240
-// @param integer arrayIdx 0:\x8C\x9F\x8D\xF5, 1:\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
-function popUpFootbarFormIPhone(arrayIdx, resetFlag) {
- var formStyles = new Array(2);
- var liElement = new Array(2);
-
- formStyles[0] = document.getElementById('searchForm').style;
- formStyles[1] = document.getElementById('writeForm').style;
- liElement[0] = document.getElementById('searchRes');
- liElement[1] = document.getElementById('writeButton');
+// @return boolean
+function outOfDisableSubmit()
+{
+ //return (isNetFront() || isWin98());
+ return isNetFront();
+}
- for (var i = 0; i < 2; i++) {
- if (i != arrayIdx) {
- liElement[i].setAttribute('title', 'off');
- }
- liElement[i].style.backgroundPositionY = '0';
- formStyles[i].display = 'none';
+
+// @return boolean
+function isLunascape()
+{
+ var ua = navigator.userAgent;
+ if (ua.indexOf("Lunascape") != -1) {
+ return true;
+ } else {
+ return false;
}
- if (liElement[arrayIdx].getAttribute('title') == 'on' || resetFlag) {
- liElement[arrayIdx].setAttribute('title', 'off');
+}
+
+// @return void
+function bodyFit()
+{
+ // 2007/02/11 Lunascape\x82̓X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xAA\x90\xB3\x8F\xED\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ\xE9\x95s\x8B\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂ŊO\x82\xB7\x81B\x82\xB5\x82\xA9\x82\xB5\x81A\x95s\x8B\x82ɂ͌\xF8\x89ʂ\xAA\x82Ȃ\xA9\x82\xC1\x82\xBD\x81B
+ // \x82ǂ\xBF\x82\xE7\x82ɂ\xB9\x82\xE6\x81A\x83^\x83u\x83u\x83\x89\x83E\x83U\x82Ȃ̂ł\xBB\x82\xE0\x82\xBB\x82\xE0\x95K\x97v\x82Ȃ\xB5\x81B
+ if (isLunascape()) {
return;
}
-
- liElement[arrayIdx].setAttribute('title', 'on');
- liElement[arrayIdx].style.backgroundPositionY = '-50px'; // \x8C\xF5\x82点\x82\xE9
- //formStyles[arrayIdx].top = (document.height - 480).toString(); + "px"
-
- // body\x82\xAA\x92Z\x82\xA2\x8E\x9E\x82\xE0\x96\xBC\x91O\x97\x93\x82\xAA\x89B\x82\xEA\x82Ȃ\xA2\x82悤\x82Ɉʒu\x82\xAE\x82\xB7\x82\xE9
- var footbar01Elem = document.getElementById('footbar01');
- if (footbar01Elem.offsetTop < 280) { // \x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̒l
- formStyles[arrayIdx].top = 0; //14; // \x82\xE0\x82\xC1\x82Ƃ\xA2\x82\xA2\x8Ew\x92\xE8\x95\xFB\x96@\x82\xAA\x82\xA0\x82\xE9\x82悤\x82ȋC\x82\xAA\x82\xB7\x82\xE9
- var writeFormCloseBtnElem = document.getElementById('writeFormCloseBtn');
- writeFormCloseBtnElem.style.display = 'block';
- }
-
- formStyles[arrayIdx].display = 'block';
-
- return true;
+
+ var resize = false;
+ var adjust = 40;
+
+ var dw = YAHOO.util.Dom.getDocumentWidth();
+ //alert(dw);
+ var w = dw;
+
+ //var vw = YAHOO.util.Dom.getClientWidth();
+ var vw = YAHOO.util.Dom.getViewportWidth();
+ //alert(vw);
+ if (vw < dw) {
+ resize = true;
+ }
+
+ var dh = YAHOO.util.Dom.getDocumentHeight();
+ //alert(dh);
+ var h = dh;
+
+ var vh = YAHOO.util.Dom.getViewportHeight();
+ //alert(vh);
+ if (vh < h) {
+ resize = true;
+ }
+
+ if (window.outerHeight) {
+ w += (window.outerWidth - vw);
+ h += (window.outerHeight - vh);
+ } else {
+ w += 24;
+ h += 148;
+ }
+
+ var maxHeight = screen.height - adjust;
+ if (h > maxHeight) {
+ h = maxHeight;
+ }
+ //alert(maxHeight);
+ var maxWidth = screen.width - adjust;
+ if (w > maxWidth) {
+ w = maxWidth;
+ }
+
+ //alert(dh);
+ if (resize) {
+ window.resizeTo(w+2,h+2);
+ }
}
Modified: p2/trunk/menu_i.php
===================================================================
--- p2/trunk/menu_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/menu_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -60,8 +60,11 @@
?>
<title><?php eh($ptitle); ?></title>
-</head><body>
-<div class="toolbar"><h1 id="pageTitle"><?php eh($ptitle); ?></h1></div>
+</head>
+<body class="menu_i">
+<?php $index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue())); ?>
+<p><a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a></p>
+<div class="toolbar"><h1 class="pageTitle"><?php eh($ptitle); ?></h1></div>
<?php
P2Util::printInfoHtml();
@@ -77,7 +80,7 @@
// \x94Œ\x9F\x8D\xF5\x83t\x83H\x81[\x83\x80\x82\xF0HTML\x95\\x8E\xA6
if ($get['view'] != 'favita' && $get['view'] != 'rss' && empty($_GET['cateid'])) {
- echo '<div class="panel"><filedset>';
+ echo '<div class="panel itaKensaku"><filedset>';
echo BrdCtl::getMenuKSearchFormHtml();
echo '</filedset></div>';
}
@@ -86,8 +89,6 @@
// \x8C\x9F\x8D\x{14C2C9}ʂ\xF0HTML\x95\\x8E\xA6
//===========================================================
-$index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()));
-
$modori_url_ht = '';
// {{{ \x8C\x9F\x8D\x{1433C1}[\x83h\x82\xAA\x82\xA0\x82\xEA\x82\xCE
@@ -156,7 +157,6 @@
// \x83t\x83b\x83^\x82\xF0HTML\x95\\x8E\xA6
echo geti($GLOBALS['list_navi_ht']);
?>
-<p><a id="backButton"class="button" href="<?php eh($index_uri); ?>">TOP</a></p>
</body></html>
<?php
Modified: p2/trunk/post_form_i.php
===================================================================
--- p2/trunk/post_form_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/post_form_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -70,13 +70,13 @@
<div class="row"><label><span{$class_ttitle}>\x83^\x83C\x83g\x83\x8B</span></label><input type="text" id="subject" name="subject"{$sub_size_at} value="{$hs['subject']}"></div>
EOP;
if ($_conf['ktai']) {
- //$htm['subject'] = "<a id=\"backButton\" class=\"button\" href=\"{$_conf['subject_php']}?host={$host}&bbs={$bbs}{$_conf['k_at_a']}\">{$itaj}</a><br>" . $htm['subject'];
- $htm['back'] = "<a id=\"backButton\" class=\"button\" href=\"{$_conf['subject_php']}?host={$host}&bbs={$bbs}{$_conf['k_at_a']}\">{$itaj}</a>";
+ //$htm['subject'] = "<a class=\"tbutton itaButton\" href=\"{$_conf['subject_php']}?host={$host}&bbs={$bbs}{$_conf['k_at_a']}\">{$itaj}</a><br>" . $htm['subject'];
+ $htm['back'] = "<a class=\"tbutton itaButton\" href=\"{$_conf['subject_php']}?host={$host}&bbs={$bbs}{$_conf['k_at_a']}\">{$itaj}</a>";
}
$newthread_hidden_ht = '<input type="hidden" name="newthread" value="1">';
// }}}
-// {{{ \x8F\x91\x82\xAB\x8D\x9E\x82݂Ȃ\xE7
+// {{{ \x8F\x91\x82\xAB\x8D\x9E\x82݂Ȃ\xE7\x81i\x92ʏ\xED\x82̓|\x83b\x83v\x83A\x83b\x83v\x83t\x83H\x81[\x83\x80\x82\xF0\x8Eg\x82\xA4\x82̂ł\xB1\x82\xB1\x82ɂ͂\xB1\x82Ȃ\xA2\x81j
} else {
//$ptitle = "{$itaj} - \x83\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82\xDD";
@@ -91,9 +91,10 @@
UA::getQueryKey() => UA::getQueryValue()
)
);
- $html = $ttitle_hs ? $ttitle_hs : hs($uri);
+ //$html = $ttitle_hs ? $ttitle_hs : hs($uri);
+ $html = '\x83X\x83\x8C'; // \x95\xB6\x8E\x9A\x95\x9D\x82̓s\x8D\x87\x82\xC5
$htm['resform_ttitle'] = <<<EOP
-<p><a id="backButton" class="button" href="{$uri_hs}"{$target_read}>{$html}</a></p>
+<p><a id="backButton" class="tbutton" href="{$uri_hs}"{$target_read}>{$html}</a></p>
EOP;
$newthread_hidden_ht = '';
}
@@ -138,13 +139,13 @@
}
if (UA::isPC() || UA::isIPhoneGroup()) {
?><script type="text/javascript" src="js/basic.js?2012"></script><?php
-?><script type="text/javascript" src="js/post_form.js?v=201209"></script><?php
+?><script type="text/javascript" src="js/post_form.js?v=20130609"></script><?php
}
echo <<<EOP
</head>
<body{$body_on_load}>\n
<div class="toolbar">
-<h1 id="pageTitle">{$itaj}</h1>
+<h1 class="pageTitle">{$itaj}</h1>
</div>
EOP;
Modified: p2/trunk/read.php
===================================================================
--- p2/trunk/read.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/read.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -118,8 +118,9 @@
if (UA::isK() || UA::isIPhoneGroup()) {
$filter_page = isset($_REQUEST['filter_page']) ? max(1, intval($_REQUEST['filter_page'])) : 1;
$_filter_range = array();
- $_filter_range['start'] = ($filter_page - 1) * $_conf['k_rnum_range'] + 1;
- $_filter_range['to'] = $_filter_range['start'] + $_conf['k_rnum_range'] - 1;
+ $rr = UA::isIPhoneGroup() ? $_conf['i_rnum_range'] : $_conf['k_rnum_range'];
+ $_filter_range['start'] = ($filter_page - 1) * $rr + 1;
+ $_filter_range['to'] = $_filter_range['start'] + $rr - 1;
}
}
@@ -242,7 +243,7 @@
//\x81u\x90V\x92\x85\x83\x8C\x83X\x82̕\\x8E\xA6\x81v\x82̎\x9E\x82͓\xC1\x95ʂɂ\xBF\x82\xE5\x82\xC1\x82ƑO\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6
if (!empty($_GET['nt'])) {
- if (substr($aThread->ls, -1) == "-") {
+ if (substr($aThread->ls, -1) == '-') {
$n = $aThread->ls - $before_respointer;
if ($n < 1) { $n = 1; }
$aThread->ls = "$n-";
@@ -258,10 +259,10 @@
$aThread->ls = "$from_num-";
}
- if ($_conf['ktai'] && (!strstr($aThread->ls, "n"))) {
- $aThread->ls = $aThread->ls . "n";
+ if ((UA::isIPhoneGroup() || UA::isK()) && (!strstr($aThread->ls, 'n'))) {
+ $aThread->ls = $aThread->ls . 'n';
}
-
+
// \x96\xA2\x8E擾\x82Ȃ\xE7
} else {
if (!$aThread->ls) {
@@ -694,7 +695,7 @@
$aThread->lsToPoint();
}
- $body = $aThread->previewOne();
+ $bodyHtml = $aThread->previewOne(); // \x82\xB1\x82\xB1\x82ŃZ\x83b\x83g\x82\xB3\x82\xEA\x82\xE9$aThread\x82̃v\x83\x8D\x83p\x83e\x83B\x82\xAA\x82\xA0\x82\xE9
$ptitle_ht = hs($aThread->itaj) . ' / ' . hs($aThread->ttitle_hc);
if (UA::isIPhoneGroup()) {
@@ -709,7 +710,7 @@
}
require_once $read_header_inc_php;
- echo $body;
+ echo $bodyHtml;
require_once $read_footer_inc_php;
}
Modified: p2/trunk/read_filter_i.php
===================================================================
--- p2/trunk/read_filter_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/read_filter_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -79,13 +79,14 @@
<?php
P2View::printExtraHeadersHtml();
?>
- <link rel="stylesheet" type="text/css" href="./iui/read.css?201209">
+ <link rel="stylesheet" type="text/css" href="./iui/smartphone.css">
+ <link rel="stylesheet" type="text/css" href="./iui/read.css?20130606">
<title>\x83X\x83\x8C\x93\xE0\x8C\x9F\x8D\xF5</title>
</head>
<body<?php echo $body_at; ?>>
<div class="toolbar">
<h1><?php echo $ttitle_back_ht; ?></h1>
-<a id="backButton" class="button" href="<?php eh($index_uri); ?>">TOP</a>
+<p><a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a></p>
</div>
<?php
echo <<<EOF
Modified: p2/trunk/read_new.php
===================================================================
--- p2/trunk/read_new.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/read_new.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -521,16 +521,24 @@
$spd_ht = '<span class="spd" style="white-space: nowrap;" title="\x83\x8C\x83X\x8AԊu\x81\x81(\x8E\x9E\x8A\xD4/\x83\x8C\x83X)">' . $spd_st . '</span>';
}
+ // key.idx \x82̒l\x90ݒ\xE8
+ if ($aThread->rescount) {
+
+ $aThread->readnum = min($aThread->rescount, max(0, $data[5], $aThread->resrange['to']));
+
+ $newline = $aThread->readnum + 1; // $newline\x82͔p\x8E~\x97\\x92肾\x82\xAA\x81A\x8C\xE3\x95\xFB\x8C݊\xB7\x97p\x82ɔO\x82̂\xBD\x82\xDF
+
+ $sar = array(
+ $aThread->ttitle, $aThread->key, $data[2], $aThread->rescount, $aThread->modified,
+ $aThread->readnum, $data[6], $data[7], $data[8], $newline,
+ $data[10], $data[11], $aThread->datochiok
+ );
+ P2Util::recKeyIdx($aTread->keyidx, $sar); // key.idx \x82ɋL\x98^
+ }
+
// \x83t\x83b\x83^\x95\x94\x95\xAAHTML
- $read_atag = P2View::tagA(
- UriUtil::buildQueryUri($_conf['read_php'],
- array_merge($thread_qs, array(
- 'offline' => '1',
- 'rescount' => $aThread->rescount
- ))
- ) . '#r' . rawurlencode($aThread->rescount),
- hs($aThread->ttitle_hc)
- );
+ $read_atag = _getReadATag($aThread);
+
$read_footer_ht = <<<EOP
<table class="toolbar" width="100%" style="padding:0px 10px 0px 0px;">
<tr>
@@ -557,21 +565,6 @@
echo '<hr>' . "\n\n";
}
- // key.idx \x82̒l\x90ݒ\xE8
- if ($aThread->rescount) {
-
- $aThread->readnum = min($aThread->rescount, max(0, $data[5], $aThread->resrange['to']));
-
- $newline = $aThread->readnum + 1; // $newline\x82͔p\x8E~\x97\\x92肾\x82\xAA\x81A\x8C\xE3\x95\xFB\x8C݊\xB7\x97p\x82ɔO\x82̂\xBD\x82\xDF
-
- $sar = array(
- $aThread->ttitle, $aThread->key, $data[2], $aThread->rescount, $aThread->modified,
- $aThread->readnum, $data[6], $data[7], $data[8], $newline,
- $data[10], $data[11], $aThread->datochiok
- );
- P2Util::recKeyIdx($aThread->keyidx, $sar); // key.idx \x82ɋL\x98^
- }
-
unset($aThread);
}
@@ -641,6 +634,31 @@
NgAbornCtl::saveNgAborns();
+//==========================================================================
+// \x8A\x94\x81i\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x93\xE0\x82ł̂ݗ\x98\x97p\x81j
+//==========================================================================
+/**
+ * @return string HTML
+ */
+function _getReadATag($aThread)
+{
+ global $_conf;
+
+ $read_atag = P2View::tagA(
+ UriUtil::buildQueryUri($_conf['read_php'],
+ array(
+ 'host' => $aThread->host,
+ 'bbs' => $aThread->bbs,
+ 'key' => $aThread->key,
+ UA::getQueryKey() => UA::getQueryValue(),
+ 'offline' => '1',
+ 'rescount' => $aThread->rescount
+ )
+ ) . '#r' . rawurlencode(max(0, min($aThread->rescount, $aThread->readnum + 1) - $_conf['respointer'])),
+ hs($aThread->ttitle_hc)
+ );
+}
+
/*
* Local Variables:
* mode: php
Modified: p2/trunk/read_new_i.php
===================================================================
--- p2/trunk/read_new_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/read_new_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -102,12 +102,13 @@
$ptitle_atag = P2View::tagA(
$ptitle_uri,
- hs($aThreadList->ptitle)
+ hs($aThreadList->ptitle),
+ array('class' => 'tbutton itaButton longitaButton')
);
$ptitle_btm_atag = P2View::tagA(
$ptitle_uri,
- hs("{$_conf['k_accesskey']['up']}.$aThreadList->ptitle"),
+ hs($aThreadList->ptitle),
array(
$_conf['accesskey_for_k'] => $_conf['k_accesskey']['up']
)
@@ -149,7 +150,7 @@
<?php
P2View::printExtraHeadersHtml();
-?><script type="text/javascript" src="js/delelog.js?v=20100127"></script><?php
+?><script type="text/javascript" src="js/delelog.js?v=20130612"></script><?php
/*
<script type="text/javascript" src="js/respopup.js?v=20061206"></script>
<script type="text/javascript" src="js/setfavjs.js?v=20090428"></script>
@@ -159,12 +160,10 @@
?>
<script type="text/javascript" src="js/basic.js?2012"></script>
- <script type="text/javascript" src="iphone/js/respopup.iPhone.js?v=20061206"></script>
+ <script type="text/javascript" src="iphone/js/respopup.iPhone.js?v=20090429"></script>
<script type="text/javascript" src="iphone/js/setfavjs.js?v=20090428"></script>
- <script type="text/javascript" src="js/post_form.js?v=201209"></script>
- <?php // smartpopup.iPhone.js needs post_form.js's popUpFootbarFormIPhone(). ?>
- <script type="text/javascript" src="iphone/js/smartpopup.iPhone.js?v=20110715"></script>
- <script type="text/javascript" src="iphone/js/iphone.js"></script>
+ <script type="text/javascript" src="iphone/js/iphone.js?2013060918"></script>
+ <script type="text/javascript" src="iphone/js/smartpopup.iPhone.js?v=20130612"></script>
<script type="text/javascript">
<!--
gExistWord = false;
@@ -201,7 +200,9 @@
}
// -->
</script>
-<link rel="stylesheet" type="text/css" href="./iui/read.css?2013">
+<? // \x82\xB1\x82\xB1\x82ł\xCD iui.css \x82͓ǂ\xF1\x82ł\xA2\x82Ȃ\xA2\x82\xB1\x82Ƃɒ\x8D\x88\xD3 ?>
+<link rel="stylesheet" type="text/css" href="./iui/smartphone.css?20130612">
+<link rel="stylesheet" type="text/css" href="./iui/read.css?20130612">
<?php
echo "<title>{$ptitle_ht}</title>";
@@ -210,10 +211,12 @@
<body{$body_at}>\n
EOP;
+$index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()));
+
?>
-<div class="toolbar">
-<h1 id="pageTitle"><?php echo $ptitle_atag; ?>\x82̐V\x82܂Ƃ\xDF</h1>
-</div>
+<p><a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a></p>
+<?php echo $ptitle_atag; ?>
+<div class="toolbar"><h1 class="pageTitle noShinMatome">\x82̐V\x92\x85\x82܂Ƃߓǂ\xDD</h1></div>
<?php
P2Util::printInfoHtml();
@@ -247,7 +250,8 @@
$aThread->setThreadPathInfo($aThread->host, $aThread->bbs, $aThread->key);
$aThread->getThreadInfoFromIdx(); // \x8A\xF9\x93\xBE\x83X\x83\x8C\x83b\x83h\x83f\x81[\x83^\x82\xF0idx\x82\xA9\x82\xE7\x8E擾
-
+ //$aThread->readDatInfoFromFile();
+
// \x90V\x92\x85\x82̂\xDD(for subject)
if (!$aThreadList->spmode and $sb_view == "shinchaku" and !isset($GLOBALS['word'])) {
if ($aThread->unum < 1) {
@@ -373,9 +377,9 @@
//===========================================================
// \x8E擾\x8Dς݂Ȃ\xE7
if ($aThread->isKitoku()) {
- $from_num = $aThread->readnum +1 - $_conf['respointer'] - $_conf['before_respointer_new'];
+ $from_num = $aThread->readnum +1 - $_conf['respointer_i'] - $_conf['before_respointer_new_i'];
if ($from_num > $aThread->rescount) {
- $from_num = $aThread->rescount - $_conf['respointer'] - $_conf['before_respointer_new'];
+ $from_num = $aThread->rescount - $_conf['respointer_i'] - $_conf['before_respointer_new_i'];
}
if ($from_num < 1) {
$from_num = 1;
@@ -407,9 +411,8 @@
$prev_thre_ht = "<a href=\"#ntt{$prev_thre_num}\">\x81\xA3</a>";
}
$anchorId = "ntt_bt{$_newthre_num}"; // ntt{$next_thre_num}
- //$next_thre_ht = "<a href=\"#{$anchorId}\" onclick=\"if (!document.getElementById('{$anchorId}')) { location.href='#footbar01'; return false;}\">\x81\xA5</a> ";
$next_thre_ht = "<a href=\"#{$anchorId}\">\x81\xA5</a> ";
- //$next_thre_ht = "<a class=\"button\" href=\"#{$anchorId}\">\x81\xA5</a> ";
+ //$next_thre_ht = "<a class=\"tbutton buttonW\" href=\"#{$anchorId}\">\x81\xA5</a> ";
if ($spmode) {
$read_header_itaj_ht = sprintf(' (%s)', hs($aThread->itaj));
@@ -433,9 +436,9 @@
if ($_conf['k_save_packet']) {
$ttitle_hs = mb_convert_kana($ttitle_hs, 'rnsk');
}
-
+
$read_header_ht = <<<EOP
- <p id="ntt{$_newthre_num}" name="ntt{$_newthre_num}"><font color="{$STYLE['read_k_thread_title_color']}"><b>{$ttitle_hs}</b></font>{$read_header_itaj_ht} {$next_thre_ht}</p>\n
+ <div id="ntt{$_newthre_num}" name="ntt{$_newthre_num}" class="thread_title"><span class="thread_title"><b>{$ttitle_hs}</b></span>{$read_header_itaj_ht} {$next_thre_ht}</div>\n
EOP;
// {{{ \x83\x8D\x81[\x83J\x83\x8BDat\x82\xF0\x93ǂݍ\x9E\x82\xF1\x82\xC5HTML\x95\\x8E\xA6
@@ -516,25 +519,7 @@
// }}}
- $read_atag = _getReadATag($aThread);
-
- $read_footer_ht = <<<EOP
- <div class="read_new_thre_footer" id="ntt_bt{$_newthre_num}" name="ntt_bt{$_newthre_num}">
- $read_range_ht
- $read_atag{$toolbar_itaj_ht}
- <span style="white-space: nowrap;">[<span>$dele_atag</span>]</span>
- <a href="#ntt{$_newthre_num}">\x81\xA3</a>
- </div>
-EOP;
- // \x93\xA7\x96\xBE\x82\xA0\x82ځ[\x82\xF1\x82\xE2\x95\\x8E\xA6\x90\x94\x90\xA7\x8C\xC0\x82ŐV\x82\xB5\x82\xA2\x83\x8C\x83X\x95\\x8E\xA6\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82̓X\x83L\x83b\x83v
- if ($GLOBALS['newres_to_show_flag']) {
- echo $read_header_ht;
- echo $read_cont_ht;
- echo $hr;
- echo $read_footer_ht;
- }
-
// {{{ key.idx\x82̒l\x90ݒ\xE8
if ($aThread->rescount) {
@@ -553,6 +538,25 @@
// }}}
+ $read_atag = _getReadATag($aThread);
+
+ $read_footer_ht = <<<EOP
+ <div class="read_new_thre_footer" id="ntt_bt{$_newthre_num}" name="ntt_bt{$_newthre_num}">
+ $read_range_ht
+ $read_atag{$toolbar_itaj_ht}
+ <span style="white-space: nowrap;">[<span>$dele_atag</span>]</span>
+ <a href="#ntt{$_newthre_num}">\x81\xA3</a>
+ </div>
+EOP;
+
+ // \x93\xA7\x96\xBE\x82\xA0\x82ځ[\x82\xF1\x82\xE2\x95\\x8E\xA6\x90\x94\x90\xA7\x8C\xC0\x82ŐV\x82\xB5\x82\xA2\x83\x8C\x83X\x95\\x8E\xA6\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82̓X\x83L\x83b\x83v
+ if ($GLOBALS['newres_to_show_flag']) {
+ echo $read_header_ht;
+ echo $read_cont_ht;
+ echo $hr;
+ echo $read_footer_ht;
+ }
+
unset($aThread);
}
@@ -563,37 +567,30 @@
if (!$aThreadList->num) {
$GLOBALS['_is_matome_shinchaku_naipo'] = true;
- ?><br>\x90V\x92\x85\x83\x8C\x83X\x82͂Ȃ\xA2\x82\xDB<br><br><?php
+ ?><br><div>\x90V\x92\x85\x83\x8C\x83X\x82͂Ȃ\xA2\x82\xDB</div><br><?php
echo P2View::getMatomeCacheLinksHtml();
}
-$index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()));
-
-
?>
-<div id="footbar01" class="footbar">
+<div id="footToolbar" class="footbar">
<ul>
<li class="home"><a name="ntt_bt1" href="<?php eh($index_uri); ?>">TOP</a></li>
-<li class="other"><a onclick="document.getElementById('footbar02').style.visibility='visible';">\x82\xBB\x82̑\xBC</a></li>
+<li class="other" id="etcButoon" title="off"><a onclick="popUpFootbarFormIPhone(2);">\x82\xBB\x82̑\xBC</a></li>
<?php
-if (!isset($GLOBALS['rnum_all_range']) or $GLOBALS['rnum_all_range'] > 0 or !empty($GLOBALS['limit_to_eq_to'])) {
- if (!empty($GLOBALS['limit_to_eq_to'])) {
+if (!isset($GLOBALS['rnum_all_range']) or $GLOBALS['rnum_all_range'] > 0 or !empty($GLOBALS['_is_eq_limit_to_and_to'])) {
+ if (!empty($GLOBALS['_is_eq_limit_to_and_to'])) {
$str = '\x90V\x92\x85\x82܂Ƃ߂̍X\x90Vor\x91\xB1\x82\xAB';
} else {
$str = '\x90V\x82܂Ƃ߂\xF0\x8DX\x90V';
}
echo <<<EOP
- <li class="new">
- <a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}{$_conf['k_at_a']}">{$str}</a>
-</li>\n
-<li id="blank" class="next"></li>
+ <li class="next_disabled"></li>
+ <li class="new"><a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}{$_conf['k_at_a']}">{$str}</a></li>
EOP;
} else {
echo <<<EOP
- <li id="blank" class="new"></li>
- <li class="next">
- <a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}&norefresh=1{$_conf['k_at_a']}">\x90V\x82܂Ƃ߂̑\xB1\x82\xAB</a>
- </li>\n
+ <li class="next"><a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}&norefresh=1{$_conf['k_at_a']}">\x90V\x82܂Ƃ߂̑\xB1\x82\xAB</a></li>
+ <li class="new_disabled"></li>
EOP;
}
//{$sb_ht_btm}\x82\xCC
@@ -603,14 +600,16 @@
</ul>
</div>
-<div id="footbar02" class="dialog_other">
+<?php // \x81u\x82\xBB\x82̑\xBC\x81v\x82̃|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[ ?>
+<div id="footbarEtc">
<filedset>
<ul>
<li class="whiteButton"><?php echo $ptitle_btm_atag; ?></li>
- <li class="grayButton" onclick="document.getElementById('footbar02').style.visibility='hidden'">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
+ <li class="grayButton" onclick="popUpFootbarFormIPhone(2,1);">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
</ul>
- </filedset>
+</filedset>
</div>
+
</body></html>
<?php
$GLOBALS['_read_new_html'] .= ob_get_flush();
@@ -631,15 +630,13 @@
*/
function _getItaATag($aThread)
{
- global $_conf;
-
return $ita_atag = P2View::tagA(
UriUtil::buildQueryUri(
- $_conf['subject_php'],
+ $GLOBALS['_conf']['subject_php'],
array(
'host' => $aThread->host,
'bbs' => $aThread->bbs,
- 'key' => $aThread->key,
+ //'key' => $aThread->key,
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -669,7 +666,7 @@
'offline' => '1',
'rescount' => $aThread->rescount,
UA::getQueryKey() => UA::getQueryValue(),
- 'jsanc' => 'r' . $aThread->rescount
+ 'jsanc' => 'r' . max(0, min($aThread->rescount, $aThread->readnum + 1) - $_conf['respointer_i'])
)
),
// iPhone\x82̃|\x83b\x83v\x83A\x83b\x83v\x82ŗ\\x8A\xFA\x82\xB9\x82ʃA\x83\x93\x83J\x81[\x88ړ\xAE\x82\xAA\x90\xB6\x82\xB6\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x89\xF1\x94\xF0\x82\xB7\x82邽\x82߂ɃR\x83\x81\x83\x93\x83g\x83A\x83E\x83g
@@ -733,7 +730,8 @@
hs($dele_st),
array(
'onClick' => "return !deleLog('{$infoJs_query_es}', {$STYLE['info_pop_size']}, 'read_new_i', this);",
- 'title' => "\x83\x8D\x83O\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B\x8E\xA9\x93\xAE\x82Łu\x82\xA8\x8BC\x82ɃX\x83\x8C\x81v\x81u\x93a\x93\xB0\x81v\x82\xA9\x82\xE7\x82\xE0\x8AO\x82\xEA\x82܂\xB7\x81B"
+ 'title' => "\x83\x8D\x83O\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B\x8E\xA9\x93\xAE\x82Łu\x82\xA8\x8BC\x82ɃX\x83\x8C\x81v\x81u\x93a\x93\xB0\x81v\x82\xA9\x82\xE7\x82\xE0\x8AO\x82\xEA\x82܂\xB7\x81B",
+ 'target' => 'info'
)
);
}
Modified: p2/trunk/read_new_k.php
===================================================================
--- p2/trunk/read_new_k.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/read_new_k.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -404,7 +404,25 @@
*/
// }}}
+
+ // {{{ key.idx\x82̒l\x90ݒ\xE8
+
+ if ($aThread->rescount) {
+ $aThread->readnum = min($aThread->rescount, max(0, $data[5], $aThread->resrange['to']));
+
+ $newline = $aThread->readnum + 1; // $newline\x82͔p\x8E~\x97\\x92肾\x82\xAA\x81A\x8C\xE3\x95\xFB\x8C݊\xB7\x97p\x82ɔO\x82̂\xBD\x82\xDF
+
+ $sar = array(
+ $aThread->ttitle, $aThread->key, $data[2], $aThread->rescount, $aThread->modified,
+ $aThread->readnum, $data[6], $data[7], $data[8], $newline,
+ $data[10], $data[11], $aThread->datochiok
+ );
+ P2Util::recKeyIdx($aThread->keyidx, $sar); // key.idx\x82ɋL\x98^
+ }
+
+ // }}}
+
$read_atag = _getReadATag($aThread);
$read_footer_ht = <<<EOP
@@ -423,24 +441,6 @@
echo $read_footer_ht;
}
- // {{{ key.idx\x82̒l\x90ݒ\xE8
-
- if ($aThread->rescount) {
-
- $aThread->readnum = min($aThread->rescount, max(0, $data[5], $aThread->resrange['to']));
-
- $newline = $aThread->readnum + 1; // $newline\x82͔p\x8E~\x97\\x92肾\x82\xAA\x81A\x8C\xE3\x95\xFB\x8C݊\xB7\x97p\x82ɔO\x82̂\xBD\x82\xDF
-
- $sar = array(
- $aThread->ttitle, $aThread->key, $data[2], $aThread->rescount, $aThread->modified,
- $aThread->readnum, $data[6], $data[7], $data[8], $newline,
- $data[10], $data[11], $aThread->datochiok
- );
- P2Util::recKeyIdx($aThread->keyidx, $sar); // key.idx\x82ɋL\x98^
- }
-
- // }}}
-
unset($aThread);
}
@@ -562,7 +562,7 @@
'rescount' => $aThread->rescount,
UA::getQueryKey() => UA::getQueryValue()
)
- ) . '#r' . rawurlencode($aThread->rescount),
+ ) . '#r' . rawurlencode(min($aThread->rescount, $aThread->readnum + 1) - $_conf['respointer']),
$ttitle_hs
);
}
Modified: p2/trunk/subject.php
===================================================================
--- p2/trunk/subject.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/subject.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -92,7 +92,7 @@
$threads_num = _getThreadsNum($spmode, $p2_setting, $sb_view);
// \x83N\x83G\x83\x8A\x81[\x82\xA9\x82\xE7\x83t\x83B\x83\x8B\x83^\x83\x8F\x81[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
-_setFilterWord();
+sbSetFilterWord();
//============================================================
@@ -834,96 +834,6 @@
}
/**
- * \x83N\x83G\x83\x8A\x81[\x82\xA9\x82\xE7\x83t\x83B\x83\x8B\x83^\x83\x8F\x81[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
- *
- * @return void
- */
-function _setFilterWord()
-{
- global $_conf;
-
- $GLOBALS['sb_filter'] = array(); // 2011/02/08 \x82Ȃ\xF1\x82Ŕz\x97\xF1\x82ɂ\xB5\x82\xBD\x82낤\x81H
- $GLOBALS['sb_filter']['method'] = null;
-
- $GLOBALS['word'] = null;
- $GLOBALS['word_fm'] = null;
- $GLOBALS['wakati_word'] = null;
-
- // \x81u\x8DX\x90V\x81v\x82ł͂Ȃ\xAD\x82āA\x8C\x9F\x8D\xF5\x8Ew\x92肪\x82\xA0\x82\xEA\x82A\x8C\x9F\x8D\x{1433C1}[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
- if (empty($_REQUEST['submit_refresh']) or !empty($_REQUEST['submit_kensaku'])) {
-
- if (isset($_GET['word'])) {
- $GLOBALS['word'] = $_GET['word'];
- } elseif (isset($_POST['word'])) {
- $GLOBALS['word'] = $_POST['word'];
- }
-
- if (isset($_GET['method'])) {
- $GLOBALS['sb_filter']['method'] = $_GET['method'];
- } elseif (isset($_POST['method'])) {
- $GLOBALS['sb_filter']['method'] = $_POST['method'];
- }
-
- if (isset($GLOBALS['sb_filter']['method']) and $GLOBALS['sb_filter']['method'] == 'similar') {
- $GLOBALS['wakati_word'] = $GLOBALS['word'];
- $GLOBALS['wakati_words'] = _wakati($GLOBALS['word']);
-
- if (!$GLOBALS['wakati_words']) {
- unset($GLOBALS['wakati_word'], $GLOBALS['wakati_words']);
- } else {
- require_once P2_LIB_DIR . '/StrCtl.php';
- $wakati_words2 = array_filter($GLOBALS['wakati_words'], '_wakatiFilter');
-
- if (!$wakati_words2) {
- $GLOBALS['wakati_hl_regex'] = $GLOBALS['wakati_word'];
- } else {
- rsort($wakati_words2, SORT_STRING);
- $GLOBALS['wakati_hl_regex'] = implode(' ', $wakati_words2);
- $GLOBALS['wakati_hl_regex'] = mb_convert_encoding($GLOBALS['wakati_hl_regex'], 'SJIS-win', 'UTF-8');
- }
-
- $GLOBALS['wakati_hl_regex'] = StrCtl::wordForMatch($GLOBALS['wakati_hl_regex'], 'or');
- $GLOBALS['wakati_hl_regex'] = str_replace(' ', '|', $GLOBALS['wakati_hl_regex']);
- $GLOBALS['wakati_length'] = mb_strlen($GLOBALS['wakati_word'], 'SJIS-win');
- $GLOBALS['wakati_score'] = _getSbScore($GLOBALS['wakati_words'], $GLOBALS['wakati_length']);
-
- if (!isset($_conf['expack.min_similarity'])) {
- $_conf['expack.min_similarity'] = 0.05;
- } elseif ($_conf['expack.min_similarity'] > 1) {
- $_conf['expack.min_similarity'] /= 100;
- }
- if (count($GLOBALS['wakati_words']) == 1) {
- $_conf['expack.min_similarity'] /= 100;
- }
- $_conf['expack.min_similarity'] = (float) $_conf['expack.min_similarity'];
- }
- $GLOBALS['word'] = '';
-
- } elseif (preg_match('/^\.+$/', $GLOBALS['word'])) {
- $GLOBALS['word'] = '';
- }
-
- if (strlen($GLOBALS['word']) > 0) {
-
- // \x83f\x83t\x83H\x83\x8B\x83g\x83I\x83v\x83V\x83\x87\x83\x93
- if (!$GLOBALS['sb_filter']['method']) { $GLOBALS['sb_filter']['method'] = 'and'; } // or
-
- require_once P2_LIB_DIR . '/StrCtl.php';
- $GLOBALS['word_fm'] = StrCtl::wordForMatch($GLOBALS['word'], $GLOBALS['sb_filter']['method']);
- if ($GLOBALS['sb_filter']['method'] != 'just') {
- if (P2_MBREGEX_AVAILABLE == 1) {
- $GLOBALS['words_fm'] = mb_split('\s+', $GLOBALS['word_fm']);
- $GLOBALS['word_fm'] = mb_ereg_replace('\s+', '|', $GLOBALS['word_fm']);
- } else {
- $GLOBALS['words_fm'] = preg_split('/\s+/', $GLOBALS['word_fm']);
- $GLOBALS['word_fm'] = preg_replace('/\s+/', '|', $GLOBALS['word_fm']);
- }
- }
- }
- }
-}
-
-/**
* \x83X\x83\x8C\x83^\x83C\x81i\x82Ɩ{\x95\xB6\x81j\x82Ń}\x83b\x83`\x82\xB5\x82\xBD\x82\xE7true\x82\xF0\x95Ԃ\xB7
*
* @return boolean
Modified: p2/trunk/subject_i.php
===================================================================
--- p2/trunk/subject_i.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/subject_i.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -93,7 +93,7 @@
$threads_num = _getThreadsNum($spmode, $p2_setting, $sb_view);
// \x83N\x83G\x83\x8A\x81[\x82\xA9\x82\xE7\x83t\x83B\x83\x8B\x83^\x83\x8F\x81[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
-_setFilterWord();
+sbSetFilterWord();
//============================================================
@@ -228,7 +228,7 @@
unset($aThread);
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('word_filter_for_sb');
continue;
-
+
// \x83}\x83b\x83`\x82\xB5\x82\xBD\x8E\x9E
} else {
$GLOBALS['sb_mikke_num'] = isset($GLOBALS['sb_mikke_num']) ? $GLOBALS['sb_mikke_num'] + 1 : 1;
@@ -414,7 +414,7 @@
}
$GLOBALS['debug'] && $GLOBALS['profiler']->enterSection('FORLOOP_HIP');
-
+
// subjexct\x82\xA9\x82\xE7rescount\x82\xAA\x8E\xE6\x82\xEA\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82́Agotnum\x82𗘗p\x82\xB7\x82\xE9\x81B
if ((!$aThread->rescount) and $aThread->gotnum) {
$aThread->rescount = $aThread->gotnum;
@@ -424,9 +424,11 @@
// \x90V\x92\x85\x82\xA0\x82\xE8
if ($aThread->unum > 0) {
$shinchaku_num += $aThread->unum; // \x90V\x92\x85\x90\x94set
- } elseif ($aThread->fav) { // \x82\xA8\x8BC\x82ɃX\x83\x8C
+ // \x82\xA8\x8BC\x82ɃX\x83\x8C
+ } elseif ($aThread->fav) {
;
- } elseif ($aThread->new) { // \x90V\x8BK\x83X\x83\x8C
+ // \x90V\x8BK\x83X\x83\x8C
+ } elseif ($aThread->new) {
;
// \x8A\xF9\x93\xBE\x83X\x83\x8C
} elseif ($_conf['viewall_kitoku'] && $aThread->isKitoku()) {
@@ -466,14 +468,13 @@
// \x83\x8A\x83X\x83g\x82ɒlj\xC1
$aThreadList->addThread($aThread);
-
+
unset($aThread);
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('FORLOOP_HIP');
}
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('FORLOOP');
-
$GLOBALS['debug'] && $GLOBALS['profiler']->enterSection('FOOT');
// \x8A\xF9\x82\xC9dat\x97\x8E\x82\xBF\x82\xB5\x82Ă\xA2\x82\xE9\x83X\x83\x8C\x82͎\xA9\x93\xAE\x93I\x82ɂ\xA0\x82ځ[\x82\xF1\x82\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9
@@ -493,7 +494,7 @@
// HTML\x83v\x83\x8A\x83\x93\x83g
//===============================================================
// \x8Cg\x91\xD1
-if ($_conf['ktai']) {
+if (UA::isK() || UA::isIPhoneGroup()) {
// {{{ \x91q\x8Cɂ\xC9torder\x95t\x97^
@@ -535,15 +536,12 @@
// \x83w\x83b\x83_HTML\x83v\x83\x8A\x83\x93\x83g
require_once P2_IPHONE_LIB_DIR . '/sb_header_k.inc.php';
- if (isset($GLOBALS['sb_filter']['method']) and $GLOBALS['sb_filter']['method'] == 'similar') {
- require_once './info_i.php';
- }
-
// \x83\x81\x83C\x83\x93HTML\x83v\x83\x8A\x83\x93\x83g
- echo '<ul><li class="group">\x83X\x83\x8C\x88ꗗ</li>';
+ ?><ul><li class="group">\x83X\x83\x8C\x88ꗗ</li><?php
require_once P2_LIB_DIR . '/sb_print_k.func.php'; // \x83X\x83\x8C\x83b\x83h\x83T\x83u\x83W\x83F\x83N\x83g\x83\x81\x83C\x83\x93\x95\x94\x95\xAAHTML\x95\\x8E\xA6\x8A\x94
sb_print_k($aThreadList);
- echo '</ul>';
+ ?></ul><?php
+
// \x83t\x83b\x83^HTML\x83v\x83\x8A\x83\x93\x83g
require_once P2_IPHONE_LIB_DIR . '/sb_footer_k.inc.php';
@@ -559,7 +557,7 @@
// $subject_keys \x82\xF0\x83V\x83\x8A\x83A\x83\x89\x83C\x83Y\x82\xB5\x82ĕۑ\xB6\x82\xB7\x82\xE9
_saveSubjectKeys($subject_keys, $sb_keys_txt, $sb_keys_b_txt);
-$debug && $profiler->leaveSection('FOOT');
+$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('FOOT');
exit;
@@ -576,7 +574,7 @@
*/
function _autoTAbornOff(&$aThreadList, $ta_keys)
{
- global $ta_num;
+ global $ta_num; // \x82\xA0\x82ځ[\x82X\x83g\x82̐\x94
$result = '';
@@ -591,6 +589,7 @@
require_once P2_LIB_DIR . '/settaborn_off.inc.php';
$ta_vkeys = array_keys($ta_keys);
settaborn_off($aThreadList->host, $aThreadList->bbs, $ta_vkeys);
+
foreach ($ta_vkeys as $k) {
$ta_num--;
if ($k) {
@@ -715,7 +714,7 @@
function _saveSubjectKeys($subject_keys, $sb_keys_txt, $sb_keys_b_txt)
{
global $_conf;
-
+
//if (file_exists($sb_keys_b_txt)) { unlink($sb_keys_b_txt); }
if ($subject_keys) {
if (file_exists($sb_keys_txt)) {
@@ -801,99 +800,6 @@
}
/**
- * \x83N\x83G\x83\x8A\x81[\x82\xA9\x82\xE7\x83t\x83B\x83\x8B\x83^\x83\x8F\x81[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
- *
- * @return void
- */
-function _setFilterWord()
-{
- global $_conf;
-
- $GLOBALS['sb_filter'] = array();
- $GLOBALS['sb_filter']['method'] = null;
-
- $GLOBALS['word'] = null;
- $GLOBALS['word_fm'] = null;
- $GLOBALS['wakati_word'] = null;
-
- // \x81u\x8DX\x90V\x81v\x82ł͂Ȃ\xAD\x82āA\x8C\x9F\x8D\xF5\x8Ew\x92肪\x82\xA0\x82\xEA\x82\xCE
- if (empty($_REQUEST['submit_refresh']) or !empty($_REQUEST['submit_kensaku'])) {
-
- if (isset($_GET['word'])) {
- $GLOBALS['word'] = $_GET['word'];
- } elseif (isset($_POST['word'])) {
- $GLOBALS['word'] = $_POST['word'];
- }
-
- if (isset($_GET['method'])) {
- $GLOBALS['sb_filter']['method'] = $_GET['method'];
- } elseif (isset($_POST['method'])) {
- $GLOBALS['sb_filter']['method'] = $_POST['method'];
- }
-
- if (isset($GLOBALS['sb_filter']['method']) and $GLOBALS['sb_filter']['method'] == 'similar') {
- $GLOBALS['wakati_word'] = $GLOBALS['word'];
- $GLOBALS['wakati_words'] = _wakati($GLOBALS['word']);
-
- if (!$GLOBALS['wakati_words']) {
- unset($GLOBALS['wakati_word'], $GLOBALS['wakati_words']);
- } else {
- require_once P2_LIB_DIR . '/StrCtl.php';
- $wakati_words2 = array_filter($GLOBALS['wakati_words'], '_wakatiFilter');
-
- if (!$wakati_words2) {
- $GLOBALS['wakati_hl_regex'] = $GLOBALS['wakati_word'];
- } else {
- rsort($wakati_words2, SORT_STRING);
- $GLOBALS['wakati_hl_regex'] = implode(' ', $wakati_words2);
- $GLOBALS['wakati_hl_regex'] = mb_convert_encoding($GLOBALS['wakati_hl_regex'], 'SJIS-win', 'UTF-8');
- }
-
- $GLOBALS['wakati_hl_regex'] = StrCtl::wordForMatch($GLOBALS['wakati_hl_regex'], 'or');
- $GLOBALS['wakati_hl_regex'] = str_replace(' ', '|', $GLOBALS['wakati_hl_regex']);
- $GLOBALS['wakati_length'] = mb_strlen($GLOBALS['wakati_word'], 'SJIS-win');
- $GLOBALS['wakati_score'] = _getSbScore($GLOBALS['wakati_words'], $GLOBALS['wakati_length']);
-
- if (!isset($_conf['expack.min_similarity'])) {
- $_conf['expack.min_similarity'] = 0.05;
- } elseif ($_conf['expack.min_similarity'] > 1) {
- $_conf['expack.min_similarity'] /= 100;
- }
- if (count($GLOBALS['wakati_words']) == 1) {
- $_conf['expack.min_similarity'] /= 100;
- }
- $_conf['expack.min_similarity'] = (float) $_conf['expack.min_similarity'];
- }
- $GLOBALS['word'] = '';
-
- } elseif (preg_match('/^\.+$/', $GLOBALS['word'])) {
- $GLOBALS['word'] = '';
- }
-
- if (strlen($GLOBALS['word'])) {
-
- // \x83f\x83t\x83H\x83\x8B\x83g\x83I\x83v\x83V\x83\x87\x83\x93
- // $GLOBALS['sb_filter'] \x82\xCD global @see sb_print.inc.php
- if (!$GLOBALS['sb_filter']['method']) {
- $GLOBALS['sb_filter']['method'] = 'or';
- }
-
- require_once P2_LIB_DIR . '/StrCtl.php';
- $GLOBALS['word_fm'] = StrCtl::wordForMatch($GLOBALS['word'], $GLOBALS['sb_filter']['method']);
- if ($GLOBALS['sb_filter']['method'] != 'just') {
- if (P2_MBREGEX_AVAILABLE == 1) {
- $GLOBALS['words_fm'] = mb_split('\s+', $GLOBALS['word_fm']);
- $GLOBALS['word_fm'] = mb_ereg_replace('\s+', '|', $GLOBALS['word_fm']);
- } else {
- $GLOBALS['words_fm'] = preg_split('/\s+/', $GLOBALS['word_fm']);
- $GLOBALS['word_fm'] = preg_replace('/\s+/', '|', $GLOBALS['word_fm']);
- }
- }
- }
- }
-}
-
-/**
* \x83X\x83\x8C\x83^\x83C\x81i\x82Ɩ{\x95\xB6\x81j\x82Ń}\x83b\x83`\x82\xB5\x82\xBD\x82\xE7true\x82\xF0\x95Ԃ\xB7
*
* @return boolean
@@ -1014,7 +920,6 @@
/**
* \x82\xB7\x82\xB2\x82\xAD\x93K\x93\x96\x82ȕ\xAA\x82\xA9\x82\xBF\x8F\x91\x82\xAB\x97p\x90\xB3\x8BK\x95\\x8C\xBB\x83p\x83^\x81[\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9
- * \x81i\x8A\x94\x82Ŏ擾\x82\xB7\x82\xE9\x82͔̂\xF1\x8C\xF8\x97\xA6\x93I\x82\xBE\x82\xAA\x81j
*
* @return string
*/
Modified: p2/trunk/title.php
===================================================================
--- p2/trunk/title.php 2013-06-05 18:47:01 UTC (rev 951)
+++ p2/trunk/title.php 2013-06-13 09:51:17 UTC (rev 952)
@@ -68,7 +68,9 @@
array(
UA::getQueryKey() => UA::getPCQuery()
)
- )
+ ),
+ null,
+ array('target' => '_top')
);
// \x91O\x89\xF1\x82̃\x8D\x83O\x83C\x83\x93\x8F\xEE\x95