svnno****@sourc*****
svnno****@sourc*****
2010年 1月 30日 (土) 22:44:10 JST
Revision: 827
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=827
Author: rsk
Date: 2010-01-30 22:44:10 +0900 (Sat, 30 Jan 2010)
Log Message:
-----------
expack:
- rev.100130.2245.
- Opera 10ã§Lightboxã®CSSãŒã‚·ãƒ³ã‚¿ãƒƒã‚¯ã‚¹ã‚¨ãƒ©ãƒ¼ã¨ãªã£ã¦ã„ãŸã®ã‚’ä¿®æ£ã€‚
- E_NOTICE削減ä¸ã€‚
Modified Paths:
--------------
p2ex/trunk/conf/conf.inc.php
p2ex/trunk/css/lightbox/lightbox.css
p2ex/trunk/iv2.php
p2ex/trunk/js/iv2.js
p2ex/trunk/lib/DownloadDatMachiBbs.php
p2ex/trunk/lib/expack/ic2/templates/_iv2_lightbox.tpl.html
p2ex/trunk/style/read_css.inc
p2ex/trunk/style/style_css.inc
-------------- next part --------------
Modified: p2ex/trunk/conf/conf.inc.php
===================================================================
--- p2ex/trunk/conf/conf.inc.php 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/conf/conf.inc.php 2010-01-30 13:44:10 UTC (rev 827)
@@ -7,7 +7,7 @@
// ƒo[ƒWƒ‡ƒ“î•ñ
$_conf = array(
'p2version' => '1.7.29+1.8.x', // rep2‚̃o[ƒWƒ‡ƒ“
- 'p2expack' => '100130.2200', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
+ 'p2expack' => '100130.2245', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
'p2name' => 'expack', // rep2‚Ì–¼‘O
);
Modified: p2ex/trunk/css/lightbox/lightbox.css
===================================================================
--- p2ex/trunk/css/lightbox/lightbox.css 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/css/lightbox/lightbox.css 2010-01-30 13:44:10 UTC (rev 827)
@@ -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;
Modified: p2ex/trunk/iv2.php
===================================================================
--- p2ex/trunk/iv2.php 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/iv2.php 2010-01-30 13:44:10 UTC (rev 827)
@@ -931,16 +931,6 @@
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);
// ]]>
</script>\n
EOJS;
Modified: p2ex/trunk/js/iv2.js
===================================================================
--- p2ex/trunk/js/iv2.js 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/js/iv2.js 2010-01-30 13:44:10 UTC (rev 827)
@@ -177,7 +177,21 @@
}
// }}}
+// {{{ 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);
+
+// }}}
+
/*
* Local Variables:
* mode: javascript
Modified: p2ex/trunk/lib/DownloadDatMachiBbs.php
===================================================================
--- p2ex/trunk/lib/DownloadDatMachiBbs.php 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/lib/DownloadDatMachiBbs.php 2010-01-30 13:44:10 UTC (rev 827)
@@ -99,7 +99,7 @@
while ($thread->gotnum < $resnum) {
$abn = "‚ ‚Ú[‚ñ<>‚ ‚Ú[‚ñ<>‚ ‚Ú[‚ñ<>‚ ‚Ú[‚ñ<>";
if ($thread->gotnum == 1) {
- $abn .= $lar[4];
+ $abn .= $lar[4]; // ƒXƒŒƒ^ƒCƒgƒ‹
}
$abn .= "\n";
fwrite($fp, $abn);
@@ -108,6 +108,7 @@
// s‚ð‘‚«ž‚Þ
fwrite($fp, implode('<>', $lar) . "\n");
} else {
+ $thread->gotnum--;
$lineno = $i + 1;
P2Util::pushInfoHtml("<p>rep2 info: dat‘Ž®ƒGƒ‰[: line {$lineno} of {$url}.</p>");
break;
Modified: p2ex/trunk/lib/expack/ic2/templates/_iv2_lightbox.tpl.html
===================================================================
--- p2ex/trunk/lib/expack/ic2/templates/_iv2_lightbox.tpl.html 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/lib/expack/ic2/templates/_iv2_lightbox.tpl.html 2010-01-30 13:44:10 UTC (rev 827)
@@ -2,3 +2,6 @@
<script type="text/javascript" src="js/lightbox/lightbox_plus.js?{p2vid:h}"></script>
<script type="text/javascript" src="js/lightbox/lightbox_ic2ext.js?{p2vid:h}"></script>
<link rel="stylesheet" type="text/css" href="css/lightbox/lightbox.css?{p2vid:h}" />
+<!--[if lte IE 6]>
+<link rel="stylesheet" type="text/css" href="css/lightbox/lightbox-ie6.css" />
+<![endif]-->
Modified: p2ex/trunk/style/read_css.inc
===================================================================
--- p2ex/trunk/style/read_css.inc 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/style/read_css.inc 2010-01-30 13:44:10 UTC (rev 827)
@@ -19,7 +19,7 @@
$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 <<<EOSTYLE
Modified: p2ex/trunk/style/style_css.inc
===================================================================
--- p2ex/trunk/style/style_css.inc 2010-01-30 13:00:07 UTC (rev 826)
+++ p2ex/trunk/style/style_css.inc 2010-01-30 13:44:10 UTC (rev 827)
@@ -30,7 +30,7 @@
EOSTYLE;
}
-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 <<<EOSTYLE