• R/O
  • SSH
  • HTTPS

y2pukiwiki: Commit


Commit MetaInfo

Revision118 (tree)
Time2010-04-06 11:24:15
Authory2katayama

Log Message

videoプラグインとu2bプラグインで共通のスタイルを適用

Change Summary

Incremental Difference

--- pukiwiki-1.4.7_notb_utf8/plugin/video.inc.php (revision 117)
+++ pukiwiki-1.4.7_notb_utf8/plugin/video.inc.php (revision 118)
@@ -20,7 +20,7 @@
2020
2121 http://www.dailymotion.com/jp
2222 動画のサイズの上限: 150MB
23-推奨される動画の設定:
23+推奨される動画の設定:
2424 MP4(H264), MOV, WMV, AVIファイル (その他にも多くのファイル形式に対応しています)
2525 解像度: 640x480 もしくは 320x240
2626 毎秒25フレーム
@@ -27,13 +27,13 @@
2727
2828 http://video.google.com/
2929 We accept many popular formats, such as AVI, ASF, QuickTime, Windows Media and MPEG formats. For example, .avi, .asf, .mov, .wmv, .mpg, .mpeg, .mp4, .ra, .ram, and .mod are all acceptable file extensions.
30-If your video file is over 100 MB, please use the desktop uploader.
30+If your video file is over 100 MB, please use the desktop uploader.
3131
3232 */
3333
3434
3535
36-function plugin_video_convert()
36+function plugin_video_convert()
3737 {
3838
3939 if (func_num_args() < 2) return FALSE;
@@ -50,7 +50,7 @@
5050 $video_h = 364;
5151 $v_width = ($video_size == '') ? $video_w : floor( ($div_w - floor($video_size * 20)) / $video_size);
5252 $v_height= ($video_size == '') ? $video_h : $v_width / $video_w * $video_h;
53-
53+
5454 $body = '<embed class=video src="http://images.video.msn.com/flash/soapbox1_1.swf" quality="high" width="' . $v_width . '" height="' . $v_height . '" base="http://images.video.msn.com" type="application/x-shockwave-flash" allowFullScreen="true" allowScriptAccess="always" pluginspage="http://macromedia.com/go/getflashplayer" flashvars="c=v&v=' . $video_id . '&ifs=true&fr=msnvideo&mkt=ja-JP&brand="></embed>';
5555
5656 } elseif ($video_site == 'youtube' || $video_site == 'y2b') {
@@ -97,7 +97,7 @@
9797 return FALSE;
9898 }
9999
100- return $body ;
100+ return '<div class=video_img>' . $body .'</div>';
101101
102102 }
103103
--- pukiwiki-1.4.7_notb_utf8/skin/pukiwiki_gs2.css.php (revision 117)
+++ pukiwiki-1.4.7_notb_utf8/skin/pukiwiki_gs2.css.php (revision 118)
@@ -899,8 +899,8 @@
899899 margin-right: 10px;
900900 }
901901
902-/* u2b.inc.php */
903-div.u2b_img {
902+/* u2b.inc.php, video.inc.php */
903+div.u2b_img, div.video_img {
904904 margin: 3px 20px 3px 10px;
905905 }
906906
Show on old repository browser