| Index: branches/MetavidWiki-exp/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php |
| — | — | @@ -646,23 +646,23 @@ |
| 647 | 647 | $val = str_replace(' ','_',$val); |
| 648 | 648 | |
| 649 | 649 | //make sure people know they can "search" too (formated by |
| 650 | | - $out='do_search|'.wfMsg('mv_search_transcripts_for').' <B>$1</B>|no_image'."\n"; |
| | 650 | + $out='do_search|'.wfMsg('mv_search_transcripts_for','<B>$1</B>').'|no_image'."\n"; |
| 651 | 651 | //get people |
| 652 | 652 | $person_out = MV_SpecialMediaSearch::auto_complete_person($val, 3); |
| 653 | 653 | if($person_out!=''){ |
| 654 | | - $out.='Category:Person|<h2>People:</h2> |no_image'."\n"; |
| | 654 | + $out.='Category:Person|<h6>'.wfMsg('mv_people_matches').'</h6>|no_image'."\n"; |
| 655 | 655 | $out.=$person_out; |
| 656 | 656 | } |
| 657 | 657 | //get bills |
| 658 | 658 | $bill_out = MV_SpecialMediaSearch::auto_complete_category('Bill', $val, 3); |
| 659 | 659 | if($bill_out!=''){ |
| 660 | | - $out.='Category:Bill|<h2>Bills:</h2>|no_image'."\n"; |
| | 660 | + $out.='Category:Bill|<h6>'.wfMsg('mv_bill_matches').'</h6>|no_image'."\n"; |
| 661 | 661 | $out.=$bill_out; |
| 662 | 662 | } |
| 663 | 663 | //get intrests |
| 664 | 664 | $intrest_out = MV_SpecialMediaSearch::auto_complete_category('Interest_Group', $val, 3); |
| 665 | 665 | if($intrest_out!=''){ |
| 666 | | - $out.='Category:Interest Group|<h2>Interest Group:</h2>|no_image'."\n"; |
| | 666 | + $out.='Category:Interest Group|<h6>'.wfMsg('mv_interest_group_matches').'</h6>|no_image'."\n"; |
| 667 | 667 | $out.=$intrest_out; |
| 668 | 668 | } |
| 669 | 669 | return $out; |
| Index: branches/MetavidWiki-exp/MetavidWiki/languages/MV_Messages.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | #tools |
| 86 | 86 | 'mv_tool_search' => 'Search', |
| 87 | 87 | 'mv_tool_search_title' => 'Search within this Stream', |
| 88 | | - 'mv_search_transcripts_for' => 'Search transcripts for', |
| | 88 | + 'mv_search_transcripts_for' => 'Search videos for $1 (hide this box)', |
| 89 | 89 | 'mv_tool_navigate' => 'Navigate', |
| 90 | 90 | 'mv_tool_navigate_title' => 'Navigate the full stream', |
| 91 | 91 | 'mv_tool_export' => 'Export', |
| — | — | @@ -99,7 +99,11 @@ |
| 100 | 100 | 'mv_watch_clip' => 'Watch Clip', |
| 101 | 101 | 'mv_close_clip' => 'Close Clip', |
| 102 | 102 | 'mv_improve_transcript' => 'Improve Transcript', |
| | 103 | + 'mv_people_matches' => 'People Matches', |
| | 104 | + 'mv_bill_matches' => 'Bill Matches', |
| | 105 | + 'mv_interest_group_matches' => 'Interest Group Matches', |
| 103 | 106 | |
| | 107 | + |
| 104 | 108 | #mvd types: |
| 105 | 109 | 'ht_en' => 'Transcript', |
| 106 | 110 | 'ht_en_desc' => 'English transcripts. This overlay type is for spoken text', |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_custom.css |
| — | — | @@ -139,7 +139,7 @@ |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | .ac_loading { |
| 143 | | - background : Window url('./images/indicator.gif') right center no-repeat; |
| | 143 | + background : Window url('images/indicator.gif') right center no-repeat; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | .ac_over { |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_allpages.js |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | mvJsLoader.doLoad( |
| 17 | 17 | reqLibs, function(){ |
| 18 | 18 | //js_log('allpage_ auto and hover check'+mv_setup_allpage_flag); |
| 19 | | - if(!mv_setup_allpage_flag){//have no idea why this gets called twice |
| | 19 | + if(!mv_setup_allpage_flag){ |
| 20 | 20 | mv_setup_search_ac(); |
| 21 | 21 | mv_do_mvd_link_rewrite(); |
| 22 | 22 | mv_setup_allpage_flag=true; |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | function mv_setup_search_ac(){ |
| 156 | 156 | var uri = wgScript; |
| 157 | 157 | //add the person choices div to searchInput |
| 158 | | - var obj = $j('#searchInput').get(0); |
| | 158 | + /*var obj = $j('#searchInput').get(0); |
| 159 | 159 | //base offset: |
| 160 | 160 | var curleft=55; |
| 161 | 161 | var curtop=20; |
| — | — | @@ -168,39 +168,41 @@ |
| 169 | 169 | //get the search pos: |
| 170 | 170 | $j('body').append('<div class="ac_results" id="mv_ac_choices" ' + |
| 171 | 171 | 'style="border:solid black;background:#FFF;position:absolute;left:'+curleft+'px;top:'+curtop+'px;z-index:99;width:300px;display: none;"/>'); |
| | 172 | + */ |
| 172 | 173 | //turn off browser baseed autocomplete: |
| 173 | | - $j('#searchInput').attr('autocomplete',"off"); |
| | 174 | + $j('#search_field').attr('autocomplete',"off"); |
| 174 | 175 | //add hook: |
| 175 | | - $j('#searchInput').autocomplete( |
| | 176 | + $j('#search_field').autocomplete( |
| 176 | 177 | uri, |
| 177 | 178 | { |
| 178 | 179 | autoFill:false, |
| 179 | 180 | onItemSelect:function(v){ |
| 180 | 181 | //alert('selected:' + v.innerHTML + ' page:'+$j('#searchInput').val()); |
| 181 | 182 | //jump to page: |
| 182 | | - if($j('#searchInput').val()=='do_search'){ |
| | 183 | + if($j('#search_field').val()=='do_search'){ |
| 183 | 184 | qs = v.innerHTML.toLowerCase().indexOf('<b>')+3; |
| 184 | 185 | qe = v.innerHTML.toLowerCase().indexOf('</b>'); |
| 185 | 186 | //update the search input (incase redirect fails) |
| 186 | | - $j('#searchInput').val(v.innerHTML.substring(qs,qe)); |
| | 187 | + $j('#search_field').val(v.innerHTML.substring(qs,qe)); |
| 187 | 188 | window.location=uri+'/'+'Special:Search?search='+v.innerHTML.substring(qs,qe); |
| 188 | 189 | }else{ |
| 189 | | - window.location =uri+'/'+$j('#searchInput').val(); |
| | 190 | + window.location =uri+'/'+$j('#search_field').val(); |
| 190 | 191 | } |
| 191 | 192 | }, |
| 192 | 193 | formatItem:function(row){ |
| 193 | 194 | if(row[0]=='do_search'){ |
| 194 | | - return row[1].replace('$1',$j('#searchInput').val()); |
| | 195 | + return row[1].replace('$1',$j('#search_field').val()); |
| 195 | 196 | }else if(row[2]=='no_image'){ |
| 196 | 197 | return row[1]; |
| 197 | 198 | }else{ |
| 198 | | - return '<img width="44" src="'+ row[2] + '">'+row[1]; |
| | 199 | + return '<img width="44" src="'+ row[2] + '"><span class="ac_img_txt">'+row[1]+'</span>'; |
| 199 | 200 | } |
| 200 | 201 | }, |
| 201 | 202 | matchSubset:0, |
| 202 | 203 | extraParams:{action:'ajax',rs:'mv_auto_complete_all'}, |
| 203 | 204 | paramName:'rsargs[]', |
| 204 | | - resultElem:'#mv_ac_choices' |
| | 205 | + resultElem:'#suggestionsInner', |
| | 206 | + resultContainer:'#suggestions' |
| 205 | 207 | }); |
| 206 | 208 | //var offset = $j('#mv_person_input_'+inx).offset(); |
| 207 | 209 | //$j('#mv_person_choices_'+inx).css('left', offset.left-205); |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/jquery/plugins/jquery.autocomplete.js |
| — | — | @@ -235,6 +235,9 @@ |
| 236 | 236 | }else{ |
| 237 | 237 | $results.show(); |
| 238 | 238 | } |
| | 239 | + if(options.resultContainer){ |
| | 240 | + $(options.resultContainer).show(); |
| | 241 | + } |
| 239 | 242 | }; |
| 240 | 243 | |
| 241 | 244 | function hideResults() { |
| — | — | @@ -248,6 +251,9 @@ |
| 249 | 252 | if ($results.is(":visible")) { |
| 250 | 253 | $results.hide(); |
| 251 | 254 | } |
| | 255 | + if(options.resultContainer){ |
| | 256 | + $(options.resultContainer).hide(); |
| | 257 | + } |
| 252 | 258 | if (options.mustMatch) { |
| 253 | 259 | var v = $input.val(); |
| 254 | 260 | if (v != input.lastSelected) { |
| — | — | @@ -293,6 +299,8 @@ |
| 294 | 300 | |
| 295 | 301 | function dataToDom(data) { |
| 296 | 302 | var ul = document.createElement("ul"); |
| | 303 | + if(options.ul_class)$(ul).addClass(options.ul_class); |
| | 304 | + |
| 297 | 305 | var num = data.length; |
| 298 | 306 | |
| 299 | 307 | // limited results to a max number |
| — | — | @@ -481,7 +489,7 @@ |
| 482 | 490 | options.paramName = options.paramName || 'q'; |
| 483 | 491 | |
| 484 | 492 | options.inputClass = options.inputClass || "ac_input"; |
| 485 | | - options.resultsClass = options.resultsClass || "ac_results"; |
| | 493 | + options.resultsClass = options.resultsClass || "ac_results"; |
| 486 | 494 | options.lineSeparator = options.lineSeparator || "\n"; |
| 487 | 495 | options.cellSeparator = options.cellSeparator || "|"; |
| 488 | 496 | options.minChars = options.minChars || 1; |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/mv_embed.css |
| — | — | @@ -15,6 +15,9 @@ |
| 16 | 16 | font-size:14px; |
| 17 | 17 | float:left; |
| 18 | 18 | } |
| | 19 | +.set_ogg_player_pref{ |
| | 20 | + text-align:left; |
| | 21 | +} |
| 19 | 22 | |
| 20 | 23 | .inputTrackerInput { |
| 21 | 24 | height:20; |