| Index: trunk/phase3/js2/mwEmbed/libAddMedia/simpleUploadForm.js |
| — | — | @@ -64,7 +64,8 @@ |
| 65 | 65 | '<textarea cols="30" rows="3" name="wpUploadDescription" tabindex="3"/><br>'+ |
| 66 | 66 | |
| 67 | 67 | '<div id="wpDestFile-warning"></div>' + |
| 68 | | - |
| | 68 | + '<div style="clear:both;"></div>' + |
| | 69 | + |
| 69 | 70 | gM('select_ownwork') + '<br>' + |
| 70 | 71 | '<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' + |
| 71 | 72 | |
| — | — | @@ -90,16 +91,16 @@ |
| 91 | 92 | opt.ondone_cb = false; |
| 92 | 93 | |
| 93 | 94 | //set up the binding per the config |
| 94 | | - if( opt.enable_fogg ){ |
| | 95 | + if( opt.enable_fogg ){ |
| 95 | 96 | $j("#suf-upload [name='wpUploadFile']").firefogg({ |
| 96 | 97 | //an api url (we won't submit directly to action of the form) |
| 97 | 98 | 'api_url' : opt.api_target, |
| 98 | 99 | 'form_rewrite': true, |
| 99 | 100 | 'target_edit_from' : '#suf-upload', |
| 100 | 101 | 'new_source_cb' : function( orgFilename, oggName ){ |
| 101 | | - $j("#suf-upload [name='wpDestFile']").val( oggName ).doDestCheck({ |
| 102 | | - warn_target: "#wpDestFile-warning" |
| 103 | | - }); |
| | 102 | + $j("#suf-upload [name='wpDestFile']").val( oggName ).doDestCheck({ |
| | 103 | + warn_target: "#wpDestFile-warning" |
| | 104 | + }); |
| 104 | 105 | }, |
| 105 | 106 | 'done_upload_cb' : opt.ondone_cb |
| 106 | 107 | }); |
| Index: trunk/phase3/js2/mwEmbed/libSequencer/mvPlayList.js |
| — | — | @@ -425,7 +425,7 @@ |
| 426 | 426 | //append title & controler: |
| 427 | 427 | $j('#dc_'+_this.id).append( |
| 428 | 428 | '<div style="font-size:13px;border:solid thin;width:'+this.width+'px;" id="ptitle_'+this.id+'"></div>' + |
| 429 | | - '<div class="videoPlayer" style="position:absolute;top:'+(_this.height+_this.pl_layout.title_bar_height+4)+'px">' + |
| | 429 | + '<div class="videoPlayer" style="z-index:-1;position:absolute;top:'+(_this.height+_this.pl_layout.title_bar_height+4)+'px">' + |
| 430 | 430 | //'<div id="mv_embedded_controls_'+_this.id+'" class="ui-widget ui-corner-bottom ui-state-default controls" '+ |
| 431 | 431 | '<div class="k-control-bar ui-widget-header ui-helper-clearfix" ' + |
| 432 | 432 | 'style="width:' + _this.width + 'px" >' + |
| Index: trunk/phase3/js2/mwEmbed/libSequencer/mvSequencer.js |
| — | — | @@ -1431,7 +1431,7 @@ |
| 1432 | 1432 | $j(this.target_sequence_container).append('<div id="'+ this.timeline_id +'_pl_control"'+ |
| 1433 | 1433 | ' style="position:absolute;top:' + (this.plObj.height) +'px;'+ |
| 1434 | 1434 | 'right:1px;width:'+this.plObj.width+'px;height:'+this.plObj.org_control_height+'" '+ |
| 1435 | | - 'class="videoPlayer"><div class="ui-widget ui-corner-bottom ui-state-default controls">'+ |
| | 1435 | + 'class="k-player"><div class="ui-widget ui-corner-bottom ui-state-default k-control-bar">'+ |
| 1436 | 1436 | this.plObj.getControlsHTML() + |
| 1437 | 1437 | '</div>'+ |
| 1438 | 1438 | '</div>'); |
| Index: trunk/phase3/js2/mwEmbed/skins/ctrlBuilder.js |
| — | — | @@ -405,9 +405,11 @@ |
| 406 | 406 | 'closed_captions':{ |
| 407 | 407 | 'w':24, |
| 408 | 408 | 'o':function(){ |
| 409 | | - return '<div title="' + gM('closed_captions') + '" id="timed_text_' + ctrlBuilder.id +'" ' + |
| | 409 | + return '<button class="ui-state-default ui-corner-all k-close_captions" title="' + gM('closed_captions') + '">' + |
| | 410 | + '<span class="ui-icon ui-icon-comment"></span></button>' |
| | 411 | + /*return '<div title="' + gM('closed_captions') + '" id="timed_text_' + ctrlBuilder.id +'" ' + |
| 410 | 412 | 'class="ui-state-default ui-corner-all ui-icon_link rButton">' + |
| 411 | | - '<span class="ui-icon ui-icon-comment"></span></div>'; |
| | 413 | + '<span class="ui-icon ui-icon-comment"></span></div>';*/ |
| 412 | 414 | } |
| 413 | 415 | }, |
| 414 | 416 | 'fullscreen':{ |
| Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/styles.css |
| — | — | @@ -678,24 +678,23 @@ |
| 679 | 679 | /* jquery.ui overides */ |
| 680 | 680 | |
| 681 | 681 | .ui-icon_link { |
| 682 | | - padding: .4em 1em .4em 20px; |
| 683 | | - text-decoration: none; |
| | 682 | + padding: .4em 1em .4em 20px !Important; |
| | 683 | + text-decoration: none !Important; |
| 684 | 684 | position: relative; |
| 685 | 685 | } |
| 686 | 686 | .ui-icon_link span.ui-icon { |
| 687 | | - margin: 0 5px 0 0; |
| 688 | | - position: absolute; |
| 689 | | - left: 0.2em; |
| 690 | | - right: auto; |
| 691 | | - top: 50%; |
| 692 | | - margin-top: -8px; |
| 693 | | - zoom: 1; |
| | 687 | + margin: 0 5px 0 0 !Important; |
| | 688 | + position: absolute !Important; |
| | 689 | + left: 0.2em !Important; |
| | 690 | + right: auto !Important; |
| | 691 | + top: 50% !Important; |
| | 692 | + margin-top: -8px !Important; |
| 694 | 693 | } |
| 695 | 694 | .ui-icon_link span.ui-text { |
| 696 | | - position: absolute; |
| 697 | | - left: 0.2em; |
| 698 | | - right: auto; |
| 699 | | - margin-top: -3px; |
| | 695 | + position: absolute !Important; |
| | 696 | + left: 0.2em !Important; |
| | 697 | + right: auto; |
| | 698 | + margin-top: -3px !Important; |
| 700 | 699 | zoom: 1; |
| 701 | 700 | } |
| 702 | 701 | |
| — | — | @@ -853,12 +852,12 @@ |
| 854 | 853 | .k-control-bar .k-volume-slider a:hover.ui-slider-handle { border: solid 1px #999;} |
| 855 | 854 | .k-control-bar .k-volume-slider .ui-slider-range { height:17px; position:absolute; background: url(images/ksprite.png) repeat-x -66px -306px; -moz-border-radius:0; -webkit-border-radius:0;} |
| 856 | 855 | |
| 857 | | -.play-btn-large { width:120px; height:55px; border:none; background: url(images/ksprite.png) no-repeat 28px -433px; position:absolute; cursor:pointer;} /*.ui-state-default */ |
| | 856 | +.play-btn-large { width:120px; height:55px; border:none; background: url(images/ksprite.png) no-repeat 28px -433px !Important; position:absolute; cursor:pointer;} /*.ui-state-default */ |
| 858 | 857 | .play-btn-large.ui-state-hover { background: url(images/ksprite.png) no-repeat 28px -377px; } |
| 859 | 858 | |
| 860 | 859 | .k-volume.ui-state-hover { margin-left:6px; } |
| 861 | 860 | |
| 862 | | - |
| | 861 | + |
| 863 | 862 | /* move to ie css */ |
| 864 | 863 | .k-volume-slider span, span.ui-icon-play, span.ui-icon-volume-on, button.k-fullscreen { *margin-top:-1px;} |
| 865 | 864 | span.ui-icon-volume-on { *margin-left:0 !important;} |
| — | — | @@ -871,6 +870,9 @@ |
| 872 | 871 | /* end debug */ |
| 873 | 872 | |
| 874 | 873 | .ui-state-default, .ui-widget-content .ui-state-default { |
| 875 | | - border:none; |
| | 874 | + border: thin solid; |
| 876 | 875 | } |
| | 876 | +.k-player .ui-state-default, .ui-widget-content .ui-state-default { |
| | 877 | + border: none; |
| | 878 | +} |
| 877 | 879 | /*** end player ***/ |
| \ No newline at end of file |