* slightly better sequencer css layout.

* now to fix the mismatched selectors *****I hate kskin right now****

diff --git a/js2/mwEmbed/libAddMedia/simpleUploadForm.js b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
index 6d74146..f80a548 100644 (file)
--- a/js2/mwEmbed/libAddMedia/simpleUploadForm.js
+++ b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
@@ -64,7 +64,8 @@ var default_form_options = {
                                '<textarea cols="30" rows="3" name="wpUploadDescription" tabindex="3"/><br>'+
                                
                                '<div id="wpDestFile-warning"></div>' +
-                                                               
+                               '<div style="clear:both;"></div>' +
+                               
                                gM('select_ownwork') + '<br>' +
                                '<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' +
 
@@ -90,16 +91,16 @@ var default_form_options = {
                                opt.ondone_cb = false;
 
                        //set up the binding per the config
-                       if( opt.enable_fogg ){                          
+                       if( opt.enable_fogg ){
                                $j("#suf-upload [name='wpUploadFile']").firefogg({
                                        //an api url (we won't submit directly to action of the form)
                                        'api_url' : opt.api_target,
                                        'form_rewrite': true,
                                        'target_edit_from' : '#suf-upload',
                                        'new_source_cb' : function( orgFilename, oggName ){
-                                                       $j("#suf-upload [name='wpDestFile']").val( oggName ).doDestCheck({                                                              
-                                                               warn_target: "#wpDestFile-warning" 
-                                                       });                                                     
+                                               $j("#suf-upload [name='wpDestFile']").val( oggName ).doDestCheck({                                                              
+                                                       warn_target: "#wpDestFile-warning" 
+                                               });                                                     
                                        },
                                        'done_upload_cb' : opt.ondone_cb
                                });

diff --git a/js2/mwEmbed/libSequencer/mvPlayList.js b/js2/mwEmbed/libSequencer/mvPlayList.js
index 772a324..a01b2c0 100644 (file)
--- a/js2/mwEmbed/libSequencer/mvPlayList.js
+++ b/js2/mwEmbed/libSequencer/mvPlayList.js
@@ -425,7 +425,7 @@ mvPlayList.prototype = {
                        //append title & controler:
                        $j('#dc_'+_this.id).append(
                                '<div style="font-size:13px;border:solid thin;width:'+this.width+'px;" id="ptitle_'+this.id+'"></div>' +
-                               '<div class="videoPlayer" style="position:absolute;top:'+(_this.height+_this.pl_layout.title_bar_height+4)+'px">' +
+                               '<div class="videoPlayer" style="z-index:-1;position:absolute;top:'+(_this.height+_this.pl_layout.title_bar_height+4)+'px">' +
                                //'<div id="mv_embedded_controls_'+_this.id+'" class="ui-widget ui-corner-bottom ui-state-default controls" '+
                                '<div class="k-control-bar ui-widget-header ui-helper-clearfix" ' + 
                                        'style="width:' + _this.width + 'px" >' + 

diff --git a/js2/mwEmbed/libSequencer/mvSequencer.js b/js2/mwEmbed/libSequencer/mvSequencer.js
index 8946f47..487348b 100644 (file)
--- a/js2/mwEmbed/libSequencer/mvSequencer.js
+++ b/js2/mwEmbed/libSequencer/mvSequencer.js
@@ -1431,7 +1431,7 @@ mvSequencer.prototype = {
                $j(this.target_sequence_container).append('<div id="'+ this.timeline_id +'_pl_control"'+
                        ' style="position:absolute;top:' + (this.plObj.height) +'px;'+
                        'right:1px;width:'+this.plObj.width+'px;height:'+this.plObj.org_control_height+'" '+
-                       'class="videoPlayer"><div class="ui-widget ui-corner-bottom ui-state-default controls">'+
+                       'class="k-player"><div class="ui-widget ui-corner-bottom ui-state-default k-control-bar">'+
                                         this.plObj.getControlsHTML() +
                                 '</div>'+
                        '</div>');

diff --git a/js2/mwEmbed/skins/ctrlBuilder.js b/js2/mwEmbed/skins/ctrlBuilder.js
index 758ce87..214299c 100644 (file)
--- a/js2/mwEmbed/skins/ctrlBuilder.js
+++ b/js2/mwEmbed/skins/ctrlBuilder.js
@@ -405,9 +405,11 @@ var ctrlBuilder = {
                'closed_captions':{
                        'w':24,
                        'o':function(){
-                               return '<div title="' + gM('closed_captions') + '" id="timed_text_' + ctrlBuilder.id +'" ' +
+                               return '<button class="ui-state-default ui-corner-all k-close_captions" title="' + gM('closed_captions')  + '">' +
+                                               '<span class="ui-icon  ui-icon-comment"></span></button>'
+                               /*return '<div title="' + gM('closed_captions') + '" id="timed_text_' + ctrlBuilder.id +'" ' +
                                                        'class="ui-state-default ui-corner-all ui-icon_link rButton">' +
-                                               '<span class="ui-icon ui-icon-comment"></span></div>';
+                                               '<span class="ui-icon ui-icon-comment"></span></div>';*/
                        }
                },
                'fullscreen':{

diff --git a/js2/mwEmbed/skins/mvpcf/styles.css b/js2/mwEmbed/skins/mvpcf/styles.css
index 5389010..a3a0b29 100644 (file)
--- a/js2/mwEmbed/skins/mvpcf/styles.css
+++ b/js2/mwEmbed/skins/mvpcf/styles.css
@@ -678,24 +678,23 @@ div.rsd_selected {
 /* jquery.ui overides */
 
 .ui-icon_link {
-       padding: .4em 1em .4em 20px;
-       text-decoration: none;
+       padding: .4em 1em .4em 20px !Important;
+       text-decoration: none !Important;
        position: relative;     
 }
 .ui-icon_link span.ui-icon {
-       margin: 0 5px 0 0;
-       position: absolute;
-       left: 0.2em;
-       right: auto;
-       top: 50%;
-       margin-top: -8px;
-       zoom: 1;
+       margin: 0 5px 0 0 !Important;   
+       position: absolute !Important;  
+       left: 0.2em !Important; 
+       right: auto !Important; 
+       top: 50% !Important;    
+       margin-top: -8px !Important;    
 }
 .ui-icon_link span.ui-text {   
-       position: absolute;
-       left: 0.2em;
-       right: auto;    
-       margin-top: -3px;
+       position: absolute !Important;  
+       left: 0.2em !Important; 
+       right: auto;            
+       margin-top: -3px !Important;    
        zoom: 1;
 }
 
@@ -853,12 +852,12 @@ a:hover.k-next-credit { background-position: 0px -260px;}
 .k-control-bar .k-volume-slider a:hover.ui-slider-handle { border: solid 1px #999;}
 .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;}  
 
-.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 */
+.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 */
 .play-btn-large.ui-state-hover { background: url(images/ksprite.png) no-repeat 28px -377px; }
 
 .k-volume.ui-state-hover { margin-left:6px; }
 
-
+       
 /* move to ie css */
 .k-volume-slider span, span.ui-icon-play, span.ui-icon-volume-on, button.k-fullscreen { *margin-top:-1px;}
 span.ui-icon-volume-on { *margin-left:0 !important;}
@@ -871,6 +870,9 @@ span.ui-icon-k-menu { *margin-top:3px;}
 /* end debug */
 
 .ui-state-default, .ui-widget-content .ui-state-default {
-       border:none;
+       border: thin solid;
+}
+.k-player .ui-state-default, .ui-widget-content .ui-state-default {
+       border: none;
 }
 /*** end player ***/
\ No newline at end of file