svnno****@sourc*****
svnno****@sourc*****
2011年 7月 4日 (月) 02:03:59 JST
Revision: 919
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=919
Author: akid
Date: 2011-07-04 02:03:59 +0900 (Mon, 04 Jul 2011)
Log Message:
-----------
p2/ for version 1.8.70
Modified Paths:
--------------
p2/trunk/doc/ChangeLog.txt
p2/trunk/iphone/ShowThreadK.php
p2/trunk/iphone/index_print_k.inc.php
p2/trunk/iui/iui.css
p2/trunk/menu_i.php
p2/trunk/menu_k.php
p2/trunk/read_new_i.php
-------------- next part --------------
Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/doc/ChangeLog.txt 2011-07-03 17:03:59 UTC (rev 919)
@@ -1,3 +1,8 @@
+2011/07/04
+ * rep2 version 1.8.70
+
+ [C³] iPhone—p•\Ž¦‚ŃXƒŒ“à‚̃ŒƒX”ÔˆÚ“®‚ª³í‚É“®ì‚µ‚È‚¢ƒP[ƒX‚ª‚ ‚Á‚½‚Ì‚ðC³‚µ‚½B
+
2011/06/27
* rep2 version 1.8.69
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/iphone/ShowThreadK.php 2011-07-03 17:03:59 UTC (rev 919)
@@ -1352,7 +1352,7 @@
}
if ($id) {
return <<<EOP
-<a href="mailto:?subject=rep2iPhone ‚©‚çƒjƒRƒjƒR&body=http:%2F%2Fwww.nicovideo.jp%2Fwatch%2F{$id_hs}"><img class="nico" src="http://tn-skr.smilevideo.jp/smile?i={$ids_hs}"></a>
+<a href="mailto:?subject=rep2‚©‚çƒjƒRƒjƒR&body=http:%2F%2Fwww.nicovideo.jp%2Fwatch%2F{$id_hs}"><img class="nico" src="http://tn-skr.smilevideo.jp/smile?i={$ids_hs}"></a>
<a href="$url_hs" target="_blank">{$html}</a>
EOP;
}
Modified: p2/trunk/iphone/index_print_k.inc.php
===================================================================
--- p2/trunk/iphone/index_print_k.inc.php 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/iphone/index_print_k.inc.php 2011-07-03 17:03:59 UTC (rev 919)
@@ -14,6 +14,9 @@
$menuKLinkHtmls = getIndexMenuKLinkHtmls(getIndexMenuKIni());
$ptitle = $_conf['p2name'] . 'iPhone';
+ if (UA::isAndroidWebKit()) {
+ $ptitle = $_conf['p2name'] . 'Android(‰¼)';
+ }
// ƒƒOƒCƒ“ƒ†[ƒUî•ñ
$auth_user_ht = sprintf(
Modified: p2/trunk/iui/iui.css
===================================================================
--- p2/trunk/iui/iui.css 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/iui/iui.css 2011-07-03 17:03:59 UTC (rev 919)
@@ -66,7 +66,7 @@
margin: 1px 0 0 -75px;
height: 45px;
font-size: 20px;
- width: 150px;
+ width: 160px; /* 150px */
font-weight: bold;
text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
text-align: center;
Modified: p2/trunk/menu_i.php
===================================================================
--- p2/trunk/menu_i.php 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/menu_i.php 2011-07-03 17:03:59 UTC (rev 919)
@@ -39,15 +39,7 @@
$get['view'] = isset($_GET['view']) ? $_GET['view'] : null;
-if ($get['view'] == "favita") {
- $ptitle = "‚¨‹C‚É”Â";
-} elseif ($get['view'] == "cate"){
- $ptitle = "”ƒŠƒXƒg";
-} elseif (isset($_GET['cateid'])) {
- $ptitle = "”ƒŠƒXƒg";
-} else {
- $ptitle = "嬲涎製p2";
-}
+$ptitle = _getPtitle(geti($_GET['view']), geti($_GET['cateid']));
P2View::printDoctypeTag();
?>
@@ -166,3 +158,28 @@
<?php
exit;
+
+
+//==============================================================================
+// ŠÖ”i‚±‚̃tƒ@ƒCƒ‹“à‚Å‚Ì‚Ý—˜—pj
+//==============================================================================
+/**
+ * @return string
+ */
+function _getPtitle($view, $cateid)
+{
+ $ptitle = '';
+ if ($view == 'favita') {
+ $ptitle = '‚¨‹C‚É”Â';
+ } elseif ($view == 'cate'){
+ $ptitle = '”ƒŠƒXƒg';
+ } elseif (isset($cateid)) {
+ $ptitle = '”ƒŠƒXƒg';
+ } else {
+ $ptitle = 'rep2iPhone'; // '嬲涎製p2';
+ if (UA::isAndroidWebKit()) {
+ $ptitle = 'rep2Android(‰¼)';
+ }
+ }
+ return $ptitle;
+}
\ No newline at end of file
Modified: p2/trunk/menu_k.php
===================================================================
--- p2/trunk/menu_k.php 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/menu_k.php 2011-07-03 17:03:59 UTC (rev 919)
@@ -40,15 +40,7 @@
$get['view'] = isset($_GET['view']) ? $_GET['view'] : null;
-if ($get['view'] == "favita") {
- $ptitle = "‚¨‹C‚É”Â";
-} elseif ($get['view'] == "cate"){
- $ptitle = "”ÂؽÄ";
-} elseif (isset($_GET['cateid'])) {
- $ptitle = "”ÂؽÄ";
-} else {
- $ptitle = "嬲涎製p2";
-}
+$ptitile = _getPtitle(geti($_GET['view']), geti($_GET['cateid']));
P2View::printDoctypeTag();
@@ -158,3 +150,27 @@
<?php
exit;
+
+
+//==============================================================================
+// ŠÖ”i‚±‚̃tƒ@ƒCƒ‹“à‚Å‚Ì‚Ý—˜—pj
+//==============================================================================
+/**
+ * @return string
+ */
+function _getPtitle($view, $cateid)
+{
+ $ptitle = '';
+ if ($view == 'favita') {
+ $ptitle = '‚¨‹C‚É”Â';
+ //} elseif ($view == 'rss') {
+ // $ptitle = 'RSS';
+ } elseif ($view == 'cate') {
+ $ptitle = '”ÂؽÄ';
+ } elseif (isset($cateid)) {
+ $ptitle = '”ÂؽÄ';
+ } else {
+ $ptitle = '嬲涎製p2';
+ }
+ return $ptitle;
+}
Modified: p2/trunk/read_new_i.php
===================================================================
--- p2/trunk/read_new_i.php 2011-07-03 16:59:54 UTC (rev 918)
+++ p2/trunk/read_new_i.php 2011-07-03 17:03:59 UTC (rev 919)
@@ -54,6 +54,8 @@
$hr = P2View::getHrHtmlK();
+$_newthre_num = 0;
+
//====================================================================
// ƒƒCƒ“
//====================================================================