| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_baseEmbed.js |
| — | — | @@ -1722,16 +1722,17 @@ |
| 1723 | 1723 | o+='<a class="email" href="'+this.linkback+'">Share Clip via Link</a> '+ |
| 1724 | 1724 | '<p>or</p> '; |
| 1725 | 1725 | } |
| 1726 | | - o+='<span style="color:#FFF;font-size:14px;">Embed Clip in Blog or Site</span><br>'+ |
| 1727 | | - '<span style="color:#FFF;font-size:12px;"><a style="color:red" href="http://metavid.org/wiki/Security_Notes_on_Remote_Embedding">'+ |
| 1728 | | - 'Read This</a> before embeding.</span>'+ |
| 1729 | | - '<div class="embed_code"> '+ |
| 1730 | | - '<textarea onClick="this.select();" id="embedding_user_html_'+this.id+'" name="embed">' + |
| 1731 | | - embed_code+ |
| 1732 | | - '</textarea> '+ |
| 1733 | | - '<button onClick="$j(\'#'+this.id+'\').get(0).copyText(); return false;" class="copy_to_clipboard">Copy to Clipboard</button> '+ |
| 1734 | | - '</div> '+ |
| 1735 | | - '</div>'; |
| | 1726 | + o+='<div>' + |
| | 1727 | + '<span style="color:#FFF;font-size:14px;">Embed Clip in Blog or Site</span><br>'+ |
| | 1728 | + '<span style="color:#FFF;font-size:12px;"><a style="color:red" href="http://metavid.org/wiki/Security_Notes_on_Remote_Embedding">'+ |
| | 1729 | + 'Read This</a> before embeding.</span>'+ |
| | 1730 | + '<div class="embed_code"> '+ |
| | 1731 | + '<textarea onClick="this.select();" id="embedding_user_html_'+this.id+'" name="embed">' + |
| | 1732 | + embed_code+ |
| | 1733 | + '</textarea> '+ |
| | 1734 | + '<button onClick="$j(\'#'+this.id+'\').get(0).copyText(); return false;" class="copy_to_clipboard">Copy to Clipboard</button> '+ |
| | 1735 | + '</div> '+ |
| | 1736 | + '</div>'; |
| 1736 | 1737 | this.displayHTML(o); |
| 1737 | 1738 | }, |
| 1738 | 1739 | copyText:function(){ |
| — | — | @@ -1787,7 +1788,7 @@ |
| 1788 | 1789 | }, |
| 1789 | 1790 | /** Generic function to display custom HTML inside the mv_embed element. |
| 1790 | 1791 | The code should call the closeDisplayedHTML function to close the |
| 1791 | | - display of the custom HTML and restore the regular mv_embed display. |
| | 1792 | + display of the custom HTML and restore the regular mv_embed display. |
| 1792 | 1793 | @param {String} HTML code for the selection list. |
| 1793 | 1794 | */ |
| 1794 | 1795 | displayHTML:function(html_code) |
| — | — | @@ -1816,7 +1817,6 @@ |
| 1817 | 1818 | //fade in a black bg div ontop of everything |
| 1818 | 1819 | var div_code = '<div id="blackbg_'+sel_id+'" class="videoComplete" ' + |
| 1819 | 1820 | 'style="height:'+parseInt(height)+'px;width:'+parseInt(width)+'px;">'+ |
| 1820 | | -// '<span class="displayHTML" id="con_vl_'+this.id+'" style="position:absolute;top:20px;left:20px;color:white;">' + |
| 1821 | 1821 | '<div class="videoOptionsComplete">'+ |
| 1822 | 1822 | //@@TODO: this style should go to .css |
| 1823 | 1823 | '<span style="float:right;margin-right:10px">' + |
| — | — | @@ -1825,7 +1825,6 @@ |
| 1826 | 1826 | '<div id="mv_disp_inner_'+sel_id+'" style="padding-top:10px;">'+ |
| 1827 | 1827 | html_code |
| 1828 | 1828 | +'</div>'+ |
| 1829 | | -// close_link+'</span>'+ |
| 1830 | 1829 | '</div></div>'; |
| 1831 | 1830 | $j('#'+sel_id).prepend(div_code); |
| 1832 | 1831 | if (fade_in) |
| — | — | @@ -1942,11 +1941,12 @@ |
| 1943 | 1942 | } |
| 1944 | 1943 | }, |
| 1945 | 1944 | getShowVideoDownload:function(){ |
| 1946 | | - var out='<b style="color:white;">'+gM('download_segment')+'</b><br>'; |
| 1947 | | - out+='<span style="color:white"><blockquote style="background:#000">'; |
| | 1945 | + var out='<div style="color:white">' + |
| | 1946 | + '<b style="color:white;">'+gM('download_segment')+'</b><br>'; |
| | 1947 | + out+='<blockquote style="background:#000">'+ |
| | 1948 | + gM('download_right_click') + '</blockquote><br>'; |
| 1948 | 1949 | var dl_list=''; |
| 1949 | | - var dl_txt_list=''; |
| 1950 | | - |
| | 1950 | + var dl_txt_list=''; |
| 1951 | 1951 | $j.each(this.media_element.getSources(), function(index, source){ |
| 1952 | 1952 | var dl_line = '<li>' + '<a style="color:white" href="' + source.getURI() +'"> ' |
| 1953 | 1953 | + source.getTitle()+'</a> '+ '</li>'+"\n"; |
| — | — | @@ -1957,13 +1957,14 @@ |
| 1958 | 1958 | }else{ |
| 1959 | 1959 | dl_list+=dl_line; |
| 1960 | 1960 | } |
| 1961 | | - }); |
| 1962 | | - out+= gM('download_right_click') + '<br>'; |
| | 1961 | + }); |
| | 1962 | + |
| 1963 | 1963 | if(dl_list!='') |
| 1964 | | - out+='</blockquote>'+gM('download_full') + '<blockquote style="background:#000">' + dl_list + '</blockquote>'; |
| | 1964 | + out+=gM('download_full') + '<blockquote style="background:#000">' + dl_list + '</blockquote>'; |
| 1965 | 1965 | if(dl_txt_list!='') |
| 1966 | | - out+='</blockquote>'+gM('download_text')+'<blockquote style="background:#000">' + dl_txt_list +'</blockquote></span>'; |
| 1967 | | - return out; |
| | 1966 | + out+=gM('download_text')+'<blockquote style="background:#000">' + dl_txt_list +'</blockquote>'; |
| | 1967 | + out+='</div>'; |
| | 1968 | + return out; |
| 1968 | 1969 | }, |
| 1969 | 1970 | /* |
| 1970 | 1971 | * base embed controls |