| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js |
| — | — | @@ -151,7 +151,7 @@ |
| 152 | 152 | |
| 153 | 153 | $j('#seq_resource_import').dialog('destroy').dialog({ |
| 154 | 154 | bgiframe: true, |
| 155 | | - width:700, |
| | 155 | + width:750, |
| 156 | 156 | height:480, |
| 157 | 157 | modal: true, |
| 158 | 158 | buttons: { |
| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js |
| — | — | @@ -294,7 +294,7 @@ |
| 295 | 295 | }, |
| 296 | 296 | //some default layout values: |
| 297 | 297 | thumb_width : 80, |
| 298 | | - image_edit_width : 600, |
| | 298 | + image_edit_width : 400, |
| 299 | 299 | video_edit_width : 400, |
| 300 | 300 | insert_text_pos : 0, //insert at the start (will be overwritten by the user cursor pos) |
| 301 | 301 | result_display_mode : 'box', //box or list |
| — | — | @@ -942,7 +942,7 @@ |
| 943 | 943 | if(rObj.mime.indexOf('image')!=-1){ |
| 944 | 944 | //set width to default image_edit_width |
| 945 | 945 | var maxWidth = _this.image_edit_width; |
| 946 | | - var mediaType = 'image'; |
| | 946 | + var mediaType = 'image'; |
| 947 | 947 | }else if(rObj.mime.indexOf('audio')!=-1){ |
| 948 | 948 | var maxWidth = _this.video_edit_width; |
| 949 | 949 | var mediaType = 'audio'; |
| — | — | @@ -950,21 +950,21 @@ |
| 951 | 951 | //set to default video size: |
| 952 | 952 | var maxWidth = _this.video_edit_width; |
| 953 | 953 | var mediaType = 'video'; |
| 954 | | - } |
| | 954 | + } |
| 955 | 955 | //so that transcripts show ontop |
| 956 | 956 | var overflow_style = ( mediaType =='video' )?'':'overflow:auto;'; |
| 957 | 957 | //append to the top level of model window: |
| 958 | 958 | $j( _this.target_container ).append('<div id="rsd_resource_edit" '+ |
| 959 | 959 | 'style="position:absolute;top:0px;left:0px;bottom:85px;right:4px;background-color:#FFF;">' + |
| 960 | 960 | '<div id="clip_edit_disp" style="position:absolute;' + overflow_style + 'width:100%;height:100%;padding:5px;'+ |
| 961 | | - 'width:' + (maxWidth + 10) + 'px;" >' + |
| | 961 | + 'width:' + (maxWidth) + 'px;" >' + |
| 962 | 962 | mv_get_loading_img('position:absolute;top:30px;left:30px') + |
| 963 | 963 | '</div>'+ |
| 964 | 964 | '<div id="clip_edit_ctrl" class="ui-widget ui-widget-content ui-corner-all" style="position:absolute;'+ |
| 965 | 965 | 'left:' + ( maxWidth + 10 ) +'px;top:5px;bottom:10px;right:0px;overflow:auto;padding:5px;">'+ |
| 966 | 966 | mv_get_loading_img() + |
| 967 | 967 | '</div>'+ |
| 968 | | - '</div>'); |
| | 968 | + '</div>'); |
| 969 | 969 | //update add media wizard title: |
| 970 | 970 | $j( _this.target_container ).dialog( 'option', 'title', gM('add_media_wizard')+': '+ gM('rsd_resource_edit', rObj.title ) ); |
| 971 | 971 | js_log('did append to: '+ _this.target_container ); |
| — | — | @@ -988,7 +988,7 @@ |
| 989 | 989 | var tRatio = 1; //set ratio to 1 if the width of the thumbnail can't be found for some reason |
| 990 | 990 | |
| 991 | 991 | js_log('set from ' + $j('#rsd_edit_img').width()+'x'+ $j('#rsd_edit_img').height() + ' to init thumbimage to ' + maxWidth + ' x ' + parseInt( tRatio * maxWidth) ); |
| 992 | | - //scale up image and swap with high res version |
| | 992 | + //scale up image and to swap with high res version |
| 993 | 993 | $j('#rsd_edit_img').animate({ |
| 994 | 994 | 'opacity':1, |
| 995 | 995 | 'top':'0px', |
| Index: branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js |
| — | — | @@ -262,7 +262,7 @@ |
| 263 | 263 | var res_src = _this.rObj.src; |
| 264 | 264 | var res_title = parseUri(_this.rObj.src).file; |
| 265 | 265 | } |
| 266 | | - o+= '<tr>'+ |
| | 266 | + o+= '<tr>'+ |
| 267 | 267 | '<td colspan="2"><b>'+gM('mv_other_properties')+'</b></td>'+ |
| 268 | 268 | '</tr>'+ |
| 269 | 269 | '<tr>'+ |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/images/kaltura_logo_sm.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/images/kaltura_logo_sm.png |
| ___________________________________________________________________ |
| Name: svn:mime-type |
| 270 | 270 | + application/octet-stream |