r29559 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r29558‎ \| r29559 \| r29560 >
Date:	21:39, 10 January 2008
Author:	dale
Status:	old
Tags:
Comment:	layout updates moved interface styles to css added IE conditionals *Improved IE compatibility
Modified paths:	/trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Component.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_MetavidInterface.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Overlay.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Tools.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_VideoPlayer.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_Title.php (modified) (history) /trunk/extensions/MetavidWiki/skins/MV_custom.css (modified) (history) /trunk/extensions/MetavidWiki/skins/MV_customIE.css (added) (history) /trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js (modified) (history) /trunk/extensions/MetavidWiki/skins/mv_stream.js (modified) (history)

Diff [purge]

Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php
—	—	@@ -164,9 +164,14 @@
165	165	$wgOut->addLink(array(
166	166	'rel' => 'stylesheet',
167	167	'type' => 'text/css',
168		~~- 'media' => 'screen, projection',~~
	168	+ 'media' => 'all',
169	169	'href' => $mvCssUrl
170	170	));
	171	+ //add extra IE styles fixes
	172	+ $mvCssUrlIE = $mvgScriptPath . '/skins/MV_customIE.css';
	173	+ $wgOut->addScript('<!--[if IE]>' .
	174	+ '<link href="'.$mvCssUrlIE.'" rel="stylesheet" media="all" type="text/css">'.
	175	+ '<![endif]-->');
171	176
172	177	$mvgHeadersInPlace=true;
173	178	}
Index: trunk/extensions/MetavidWiki/includes/MV_Title.php
—	—	@@ -169,12 +169,8 @@
170	170	}
171	171	return $this->stream_name . '/'.$start_ntp . $end_ntp;
172	172	}
173		~~- function getTimeDesc(){~~
174		~~- $time_str = $this->getStartTime();~~
175		~~- if($this->getEndTime()!=''){~~
176		~~- $time_str.=wfMsg('mv_time_separator') . $this->getEndTime();~~
177		~~- }~~
178		~~- return $time_str;~~
	173	+ function getTimeDesc(){
	174	+ return wfMsg('mv_time_separator', $this->getStartTime(), $this->getEndTime());
179	175	}
180	176	function getStreamImageURL($size=null, $req_time=null, $foce_server=''){
181	177	global $mvImageArchive, $mvDefaultVideoPlaybackRes;
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_MetavidInterface.php
—	—	@@ -18,18 +18,7 @@
19	19	var $components = array();
20	20	var $context=null;
21	21	var $page_title='';
22		~~- var $page_header='';~~
23		~~- //default layout:~~
24		~~- var $cpLayout = array(~~
25		~~- 'MV_VideoPlayer'=>'position:absolute;width:322px;top:30px;height:270px;left:10px;margin:4px;',~~
26		~~- 'MV_Overlay'=>'position:absolute;left:365px;right:10px;top:30px;bottom:10px;margin:4px;',~~
27		~~- 'MV_Tools'=>'position:absolute;width:322px;top:312px;left:10px;bottom:10px;margin:4px;',~~
28		~~- 'MV_StreamMeta'=>'position:absolute;width:322px;top:307px;left:10px;bottom:10px;margin:4px;',~~
29		-
30		~~- 'MV_SequencePlayer'=>'position:absolute;width:322px;top:25px;bottom:195px;left:10px;margin:4px;',~~
31		~~- 'MV_SequenceTools'=>'position:absolute;left:365px;right:10px;top:25px;bottom:195px;margin:4px;',~~
32		~~- 'MV_SequenceTimeline'=>'position:absolute;left:10px;right:10px;height:174px;bottom:0px;margin:4px;',~~
33		~~- );~~
	22	+ var $page_header='';
34	23	function __construct($contextType, & $contextArticle=null ){
35	24	global $mv_default_view;
36	25	$this->context = $contextType;
—	—	@@ -115,12 +104,7 @@
116	105
117	106
118	107	$this->page_title = $this->article->mvTitle->getStreamNameText().' '.$this->article->mvTitle->getTimeDesc();
119		~~- }~~
120		~~- /renders style position based on default layout /~~
121		~~- function getStylePos($cp_name){~~
122		~~- if(isset($this->cpLayout[$cp_name]))return $this->cpLayout[$cp_name];~~
123		~~- return '';~~
124		~~- }~~
	108	+ }
125	109	/*
126	110	* renders the full page to the wgOut object
127	111	*/
—	—	@@ -130,22 +114,38 @@
131	115
132	116	//output title and header:
133	117	$wgOut->setHTMLTitle($this->page_title);
	118	+
134	119	if($this->page_header=='')$this->page_header = '<span style="position:relative;top:-12px;font-weight:bold">' .
135	120	$this->page_title . '</span>';
136		~~- $wgOut->addHTML($this->page_header);~~
137		-
138		-
	121	+ $wgOut->addHTML($this->page_header);
139	122	//output the time range
140	123	//output basic steam info in the
141	124	//$out.='<div id="mv_base_container" style="position:absolute;border:solid;border-color:red;width:100%;height:100%">';
	125	+
	126	+ //start swiching interfaces over to table layout
	127	+ //seems easier to get IE & firefox to layout stuff the same way
	128	+ //if someone wants to prove me wrong and write cross-browser div/css layout ... by all means :)
	129	+ /*if($this->context=='stream'){
	130	+ $wgOut->addHTML('<table width="100%" height="600">');
	131	+ $wgOut->addHTML('<tr>' .
	132	+ '<td width="330" >'
	133	+ '</tr>' .
	134	+ '<tr>' .
	135	+ '</tr>');
	136	+ $wgOut->addHTML('</table>');
	137	+ }else{*/
	138	+ //@@todo dynamic resize page_spacer:
	139	+ $wgOut->addHTML('<div id="mv_page_spacer" style="width:100%;height:550px">');
142	140	foreach($this->components as $cpKey => &$component){
143		~~- $component->render_full();~~
144		~~- }~~
	141	+ $component->render_full();
	142	+ }
	143	+ $wgOut->addHTML('</div>');
145	144	//for now output spacers
146	145	//@@todo output a dynamic spacer javascript layout
147		~~- $out='';~~
148		~~- for($i=0;$i<28;$i++)$out.="<br>";~~
149		~~- $wgOut->addHTML($out);~~
	146	+ //$out='';
	147	+ //for($i=0;$i<28;$i++)$out.="<br>";
	148	+ //$wgOut->addHTML($out);
	149	+ //}
150	150	}
151	151	}
152	152	?>
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Tools.php
—	—	@@ -14,7 +14,7 @@
15	15	function getHTML(){
16	16	global $wgOut;
17	17	//@@todo look at mv_interface context to get what to display in tool box:
18		~~- $wgOut->addHTML('<div style="overflow:auto;width:100%;height:90%" id="mv_tool_cont">');~~
	18	+ $wgOut->addHTML('<div id="mv_tool_cont">');
19	19	$this->get_tool_html('stream_page');
20	20	$wgOut->addHTML('</div>');
21	21	}
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Overlay.php
—	—	@@ -33,10 +33,10 @@
34	34	$this->load_transcripts();
35	35	$out='';
36	36	//set up left hand side timeline
37		~~- $wgOut->addHTML('<div id="mv_time_line" style="float:left;background:#DDDDDD;width:2em;height:95%;overflow:hidden;">' .~~
	37	+ $wgOut->addHTML('<div id="mv_time_line">' .
38	38	$this->get_video_timeline() .
39	39	'</div>');
40		~~- $wgOut->addHTML("<div id=\"mv_fd_mvd_cont\" style=\"position:relative;height:95%;width:98%;margin:4px;overflow:auto;\">");~~
	40	+ $wgOut->addHTML("<div id=\"mv_fd_mvd_cont\" >");
41	41	$wgOut->addHTML("<div id=\"mv_add_new_mvd\" style=\"display:none;\"></div>");
42	42	$this->get_transcript_pages();
43	43	$wgOut->addHTML("</div>");
—	—	@@ -153,7 +153,7 @@
154	154	'onmouseup="mv_do_play()" ' .
155	155	*/
156	156	'style="position:absolute;background:#'.$this->getMvdBgColor($mvd_page).';'.
157		~~- 'width:2em;';~~
	157	+ 'width:25px;';
158	158	//check if duration is set (for php calculation of height position)
159	159	if($this->duration){
160	160	$page_duration = $mvd_page->end_time - $mvd_page->start_time;
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Component.php
—	—	@@ -44,7 +44,7 @@
45	45	function render_full(){
46	46	global $wgOut;
47	47	//"<div >" .
48		~~- $wgOut->addHTML("<fieldset id=\"".get_class($this)."\" style=\"". $this->mv_interface->getStylePos(get_class($this))."\">\n" .~~
	48	+ $wgOut->addHTML("<fieldset id=\"".get_class($this)."\" >\n" .
49	49	"<legend id=\"mv_leg_".get_class($this)."\">".$this->render_menu()."</legend>\n");
50	50	//do the implemented html
51	51	$this->getHTML();
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_VideoPlayer.php
—	—	@@ -30,8 +30,7 @@
31	31	//check if media is availible:
32	32	$stream_web_url = $cur_stream->getWebStreamURL();
33	33	if($stream_web_url){
34		~~- $out='<span class="mv_video_time_hr"~~
35		~~- id="mv_videoPlayerTime">'.$cur_stream->mvTitle->getStartTime().' to '.~~
	34	+ $out='<span id="mv_videoPlayerTime">'.$cur_stream->mvTitle->getStartTime().' to '.
36	35	$cur_stream->mvTitle->getEndTime() .
37	36	'</span>';
38	37	$out.="<video id=\"embed_vid\" thumbnail=\"".$cur_stream->getStreamImageURL() ."\"".
Index: trunk/extensions/MetavidWiki/skins/MV_customIE.css
—	—	@@ -0,0 +1,9 @@
	2	+#mv_videoPlayerTime{
	3	+ top:40px;
	4	+}
	5	+#mv_fd_mvd_cont{
	6	+ top:30px;right:0px;bottom:0px;
	7	+}
	8	+#mv_tool_cont{
	9	+ position:absolute;top:30px;left:5px;right:0px;bottom:0px;overflow:auto;
	10	+}
Index: trunk/extensions/MetavidWiki/skins/MV_custom.css
—	—	@@ -166,4 +166,40 @@
167	167	.set_ogg_player_pref{
168	168	text-align:left;
169	169	}
170		-
	170	+
	171	+/stream interface/
	172	+#MV_VideoPlayer{
	173	+ position:absolute;width:322px;top:30px;height:270px;left:10px;margin:4px;
	174	+}
	175	+#MV_Overlay{
	176	+ position:absolute;left:365px;top:30px;right:15px;bottom:10px;margin:4px;
	177	+}
	178	+#mv_fd_mvd_cont{
	179	+ position:absolute;top:0px;left:25px;bottom:30px;right:12px;overflow-x:hidden;overflow-y:auto;
	180	+}
	181	+#mv_time_line{
	182	+ position:absolute;background:#DDDDDD;left:0px;width:25px;height:94%;overflow:hidden;
	183	+}
	184	+#MV_Tools{
	185	+ position:absolute;width:322px;top:312px;left:10px;bottom:10px;margin:4px;
	186	+}
	187	+#mv_tool_cont{
	188	+ position:absolute;top:0px;left:0px;right:13px;bottom:30px;overflow:auto;
	189	+}
	190	+
	191	+
	192	+#mv_videoPlayerTime{
	193	+ position:absolute;top:10px;right:30px;z-index:5;font-weight: 100;background:black;color:white;
	194	+}
	195	+/sequence interface/
	196	+#MV_SequencePlayer{
	197	+ position:absolute;width:322px;top:25px;bottom:195px;left:10px;margin:4px;
	198	+}
	199	+#MV_SequenceTools{
	200	+ position:absolute;left:365px;right:10px;top:25px;bottom:195px;margin:4px;
	201	+}
	202	+#MV_SequenceTimeline{
	203	+ position:absolute;left:10px;right:10px;height:174px;bottom:0px;margin:4px;
	204	+}
	205	+
	206	+
Index: trunk/extensions/MetavidWiki/skins/mv_stream.js
—	—	@@ -914,7 +914,7 @@
915	915	case 'search':
916	916	//load search.js ... @@todo cleanup path
917	917	mvJsLoader.doLoad({
918		~~- 'mv_setup_search':'../mv_search.js',~~
	918	+ 'mv_setup_search':'../mv_search.js'
919	919	},function(){
920	920	$j('#mv_tool_cont').html( mv_result['innerHTML']);
921	921	mv_setup_search();
Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
—	—	@@ -780,7 +780,8 @@
781	781	});
782	782	}
783	783	}
784		~~- },selectPlaybackMethod:function(){~~
	784	+ },
	785	+ selectPlaybackMethod:function(){
785	786	//put select list on-top
786	787	//make sure the parent is relatively positioned:
787	788	$j('#'+this.id).css('position', 'relative');
—	—	@@ -1327,7 +1328,6 @@
1328	1329	}
1329	1330	}
1330	1331
1331		-
1332	1332	/*
1333	1333	* utility functions:
1334	1334	*/
—	—	@@ -1339,9 +1339,9 @@
1340	1340	/*
1341	1341	* IE and non-firebug debug:
1342	1342	*/
1343		~~- /* var log_elm = document.getElementById('mv_js_log');~~
	1343	+ /*var log_elm = document.getElementById('mv_js_log');
1344	1344	if(!log_elm){
1345		~~- document.write('<textarea id="mv_js_log" cols="80" rows="6"></textarea>');~~
	1345	+ document.write('<div style="position:absolute;z-index:50;top:0px;left:0px;right:0px;height:150px;"><textarea id="mv_js_log" cols="80" rows="6"></textarea></div>');
1346	1346	var log_elm = document.getElementById('mv_js_log');
1347	1347	}
1348	1348	if(log_elm){

Status & tagging log

15:23, 12 September 2011 Meno25 (talk | contribs) changed the status of r29559 [removed: ok added: old]