diff --git a/conf/conf.inc.php b/conf/conf.inc.php index 61afcbc6f..5d7e1603e 100644 --- a/conf/conf.inc.php +++ b/conf/conf.inc.php @@ -7,7 +7,7 @@ // バージョン情報 $_conf = array( 'p2version' => '1.7.29+1.8.x', // rep2のバージョン - 'p2expack' => '100130.2200', // 拡張パックのバージョン + 'p2expack' => '100130.2245', // 拡張パックのバージョン 'p2name' => 'expack', // rep2の名前 ); diff --git a/css/lightbox/lightbox.css b/css/lightbox/lightbox.css index 0baf7b94d..b975e250d 100644 --- a/css/lightbox/lightbox.css +++ b/css/lightbox/lightbox.css @@ -14,7 +14,7 @@ color: #333; background-color: #eee; font-size: 90%; - lihe-height: 100%; + line-height: 100%; text-align: center; border-bottom: 1px solid #666; border-right: 1px solid #666; @@ -25,12 +25,6 @@ #lightboxOverallView { background-image: url(../../img/lightbox/overlay.png); } -* html #lightboxOverallView, -* html #overlay { - background-color: #000; - background-image: url(../../img/lightbox/blank.gif); - filter: Alpha(opacity=50); -} #lightboxIC2Rank { margin: 0; padding: 2px; diff --git a/iv2.php b/iv2.php index 09ae43e2f..6754ec111 100644 --- a/iv2.php +++ b/iv2.php @@ -931,16 +931,6 @@ function iv2_sqlite_unix2date($ts) no_loop: false, no_updown: false }; -p2BindReady(function(){ - var toolbar = document.getElementById('toolbar'); - var toolbarHeight = getCurrentStyle(toolbar).height; - if (toolbarHeight == 'auto') { - toolbarHeight = toolbar.clientHeight; - } else { - toolbarHeight = parsePixels(toolbarHeight); - } - document.getElementById('header').style.height = toolbarHeight + 'px'; -}, null); // ]]> \n EOJS; diff --git a/js/iv2.js b/js/iv2.js index fc47b1050..c7ec1ed11 100644 --- a/js/iv2.js +++ b/js/iv2.js @@ -176,6 +176,20 @@ function setRank(itemId, rank) return false; } +// }}} +// {{{ p2BindReady() + +p2BindReady(function(){ + var toolbar = document.getElementById('toolbar'); + var toolbarHeight = getCurrentStyle(toolbar).height; + if (toolbarHeight == 'auto') { + toolbarHeight = toolbar.clientHeight; + } else { + toolbarHeight = parsePixels(toolbarHeight); + } + document.getElementById('header').style.height = toolbarHeight + 'px'; +}, null); + // }}} /* diff --git a/lib/DownloadDatMachiBbs.php b/lib/DownloadDatMachiBbs.php index d343f89a2..7a8566356 100644 --- a/lib/DownloadDatMachiBbs.php +++ b/lib/DownloadDatMachiBbs.php @@ -99,7 +99,7 @@ static public function invoke(ThreadRead $thread) while ($thread->gotnum < $resnum) { $abn = "あぼーん<>あぼーん<>あぼーん<>あぼーん<>"; if ($thread->gotnum == 1) { - $abn .= $lar[4]; + $abn .= $lar[4]; // スレタイトル } $abn .= "\n"; fwrite($fp, $abn); @@ -108,6 +108,7 @@ static public function invoke(ThreadRead $thread) // 行を書き込む fwrite($fp, implode('<>', $lar) . "\n"); } else { + $thread->gotnum--; $lineno = $i + 1; P2Util::pushInfoHtml("

rep2 info: dat書式エラー: line {$lineno} of {$url}.

"); break; diff --git a/lib/expack/ic2/templates/_iv2_lightbox.tpl.html b/lib/expack/ic2/templates/_iv2_lightbox.tpl.html index db252effd..81cc057fc 100644 --- a/lib/expack/ic2/templates/_iv2_lightbox.tpl.html +++ b/lib/expack/ic2/templates/_iv2_lightbox.tpl.html @@ -2,3 +2,6 @@ + diff --git a/style/read_css.inc b/style/read_css.inc index cf29a4725..8e088e86d 100644 --- a/style/read_css.inc +++ b/style/read_css.inc @@ -19,7 +19,7 @@ if (isset($STYLE['respop_color']) && strlen($STYLE['respop_color']) > 0) { $respop_color = ''; } -if ($STYLE['fontfamily_bold']) { +if (!empty($STYLE['fontfamily_bold'])) { $fontstyle_bold = empty($STYLE['fontstyle_bold']) ? 'normal' : $STYLE['fontstyle_bold']; $fontweight_bold = empty($STYLE['fontweight_bold']) ? 'normal' : $STYLE['fontweight_bold']; echo <<