| Index: trunk/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | //@@todo (should get that from the api or inpage vars) |
| 68 | 68 | |
| 69 | 69 | 'enable_upload_tab':true, // if we want to enable an uploads tab: |
| 70 | | - 'upload_api_target' : 'http://127.0.0.1/wiki_trunk/api.php' // can be local or the url of the upload api. |
| | 70 | + 'upload_api_target' : 'http://localhost/wiki_trunk/api.php' // can be local or the url of the upload api. |
| 71 | 71 | } |
| 72 | 72 | if(typeof wgServer == 'undefined') |
| 73 | 73 | wgServer = ''; |
| — | — | @@ -586,11 +586,11 @@ |
| 587 | 587 | "api_target" : _this.upload_api_target , |
| 588 | 588 | "ondone_cb" : function( resultData ){ |
| 589 | 589 | var cat = resultData; |
| 590 | | - debugger; |
| | 590 | + debugger; |
| 591 | 591 | return false; |
| 592 | 592 | } |
| 593 | 593 | }) |
| 594 | | - }); |
| | 594 | + }); |
| 595 | 595 | }else{ |
| 596 | 596 | //setup the proxy |
| 597 | 597 | js_log('do proxy:: ' + parseUri( _this.upload_api_target ).host); |
| Index: trunk/phase3/js2/mwEmbed/libAddMedia/simpleUploadForm.js |
| — | — | @@ -24,6 +24,7 @@ |
| 25 | 25 | |
| 26 | 26 | (function($) { |
| 27 | 27 | $.fn.simpleUploadForm = function( opt , callback){ |
| | 28 | + var _this = this; |
| 28 | 29 | //set the options: |
| 29 | 30 | for(var i in default_form_options){ |
| 30 | 31 | if(!opt[i]) |
| — | — | @@ -38,30 +39,39 @@ |
| 39 | 40 | |
| 40 | 41 | //@@todo this is just a proof of concept |
| 41 | 42 | //much todo to improved this web form |
| 42 | | - get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){ |
| 43 | | - debugger; |
| | 43 | + get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){ |
| | 44 | + |
| 44 | 45 | if( !eToken || eToken == '+\\' ){ |
| 45 | 46 | $(this.selector).html( gM('error_not_loggedin') ); |
| 46 | 47 | return false; |
| 47 | 48 | } |
| 48 | | - |
| | 49 | + //build the api based upload form: |
| 49 | 50 | var o = '<div style="margin: 0 auto;width:450px;">'+ |
| 50 | | - '<form id="suf-upload" enctype="multipart/form-data" action="" method="post">' + |
| 51 | | - '<label for="wpUploadFile">' + gM('select_file') + '</label><br>'+ |
| 52 | | - '<input type="file" style="display: inline;" name="wpUploadFile" id="wpUploadFile" size="10"/><br>' + |
| 53 | | - '<label for="wpDestFile">' +gM('destfilename') + '</label><br>'+ |
| 54 | | - '<input type="text" id="wpDestFile" name="wpDestFile" size="30" /><br>'+ |
| 55 | | - '<label for="wpUploadDescription">' + gM('summary') + ':</label><br>' + |
| 56 | | - '<textarea cols="30" rows="3" id="wpUploadDescription" name="wpUploadDescription" tabindex="3"/><br>'+ |
| 57 | | - gM('select_ownwork') + '<br>' + |
| | 51 | + '<form id="suf-upload" enctype="multipart/form-data" action="' + opt.api_target + '" method="post">' + |
| | 52 | + //hidden input: |
| | 53 | + '<input type="hidden" name="action" value="upload">'+ |
| | 54 | + '<input type="hidden" name="format" value="jsonfm">'+ |
| | 55 | + '<input type="hidden" name="token" value="'+ eToken +'">' + |
| | 56 | + |
| | 57 | + //api form name set: |
| | 58 | + '<label for="file">' + gM('select_file') + '</label><br>'+ |
| | 59 | + '<input type="file" style="display: inline;" name="file" size="15"/><br>' + |
| | 60 | + |
| | 61 | + '<label for="filename">' +gM('destfilename') + '</label><br>'+ |
| | 62 | + '<input type="text" name="filename" size="30" /><br>'+ |
| | 63 | + |
| | 64 | + '<label for="comment">' + gM('summary') + ':</label><br>' + |
| | 65 | + '<textarea cols="30" rows="3" name="comment" tabindex="3"/><br>'+ |
| | 66 | + |
| | 67 | + gM('select_ownwork') + '<br>' + |
| 58 | 68 | '<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' + |
| 59 | 69 | |
| 60 | 70 | '<input type="submit" accesskey="s" value="' + gM('upload') + '" name="wpUploadBtn" id="wpUploadBtn" tabindex="9"/>' + |
| 61 | 71 | //close the form and div |
| 62 | | - '</form></div>'; |
| | 72 | + '</form></div>'; |
| 63 | 73 | |
| 64 | 74 | //set the target with the form output: |
| 65 | | - $( this.selector ).html( o ); |
| | 75 | + $( _this.selector ).html( o ); |
| 66 | 76 | //by default dissable: |
| 67 | 77 | $j('#wpUploadBtn').attr('disabled', 'disabled'); |
| 68 | 78 | |
| Index: trunk/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js |
| — | — | @@ -202,12 +202,8 @@ |
| 203 | 203 | |
| 204 | 204 | //add json format |
| 205 | 205 | if( $j(_this.editForm).find("[name='format']").length == 0) |
| 206 | | - $j(_this.editForm).append('<input type="hidden" name="format" value="jsonfm">'); |
| | 206 | + $j(_this.editForm).append('<input type="hidden" name="format" value="jsonfm">'); |
| 207 | 207 | |
| 208 | | - //add text format type request (IE tries to "run"/download the script otherwise) |
| 209 | | - if( $j(_this.editForm).find("[name='ctypetext']").length == 0) |
| 210 | | - $j(_this.editForm).append('<input type="hidden" name="ctypetext" value="true">'); |
| 211 | | - |
| 212 | 208 | //map the form vars to api vars: |
| 213 | 209 | $j(_this.editForm).find('#wpUploadFile').attr('name', 'file'); |
| 214 | 210 | $j(_this.editForm).find('#wpDestFile').attr('name', 'filename'); |
| Index: trunk/phase3/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | } |
| 72 | 72 | return $out; |
| 73 | 73 | } else { |
| 74 | | - print "could not get any json vars\n"; |
| | 74 | + print "could not get any json vars from:$curFileName \n"; |
| 75 | 75 | return ''; |
| 76 | 76 | } |
| 77 | 77 | } |
| Index: trunk/phase3/js2/mwEmbed/php/jsAutoloadLocalClasses.php |
| — | — | @@ -85,6 +85,7 @@ |
| 86 | 86 | $wgJSAutoloadLocalClasses['mvSequencer'] = $wgMwEmbedDirectory . 'libSequencer/mvSequencer.js'; |
| 87 | 87 | $wgJSAutoloadLocalClasses['mvSequencer'] = $wgMwEmbedDirectory . 'libSequencer/mvSequencer.js'; |
| 88 | 88 | $wgJSAutoloadLocalClasses['mvFirefoggRender'] = $wgMwEmbedDirectory . 'libSequencer/mvFirefoggRender.js'; |
| | 89 | +$wgJSAutoloadLocalClasses['mvTimedEffectsEdit'] = $wgMwEmbedDirectory . 'libSequencer/mvTimedEffectsEdit.js'; |
| 89 | 90 | |
| 90 | | -// libTimedText: |
| 91 | | -$wgJSAutoloadLocalClasses['mvTimedEffectsEdit'] = $wgMwEmbedDirectory . 'libSequencer/mvTimedEffectsEdit.js'; |
| | 91 | +// libTimedText |
| | 92 | +$wgJSAutoloadLocalClasses['mvTextInterface'] = $wgMwEmbedDirectory . 'libTimedText/mvTextInterface.js'; |
| Index: trunk/phase3/js2/mwEmbed/php/languages/mwEmbed.i18n.php |
| — | — | @@ -10,53 +10,77 @@ |
| 11 | 11 | #<JAVASCRIPT EN REPLACE> |
| 12 | 12 | $messages['en'] = array( |
| 13 | 13 | /* |
| 14 | | - * js file: /libTimedText/mvTextInterface.js |
| | 14 | + * js file: /libSequencer/mvSequencer.js |
| 15 | 15 | */ |
| 16 | | - 'select_transcript_set' => 'Select Layers', |
| 17 | | - 'auto_scroll' => 'auto scroll', |
| 18 | | - 'close' => 'close', |
| 19 | | - 'improve_transcript' => 'Improve', |
| | 16 | + 'menu_clipedit' => 'Edit Media', |
| | 17 | + 'menu_transition' => 'Transitions & Effects', |
| | 18 | + 'menu_cliplib' => 'Add Media', |
| | 19 | + 'menu_resource_overview' => 'Resource Overview', |
| | 20 | + 'menu_options' => 'Options', |
| | 21 | + 'loading_timeline' => 'Loading TimeLine <blink>...</blink>', |
| | 22 | + 'loading_user_rights' => 'Loading user rights <blink>...</blink>', |
| | 23 | + 'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence', |
| | 24 | + 'edit_clip' => 'Edit Clip', |
| | 25 | + 'edit_save' => 'Save Sequence Changes', |
| | 26 | + 'saving_wait' => 'Save in Progress (please wait)', |
| | 27 | + 'save_done' => 'Save Done', |
| | 28 | + 'edit_cancel' => 'Cancel Sequence Edit', |
| | 29 | + 'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost', |
| | 30 | + 'zoom_in' => 'Zoom In', |
| | 31 | + 'zoom_out' => 'Zoom Out', |
| | 32 | + 'cut_clip' => 'Cut Clips', |
| | 33 | + 'expand_track' => 'Expand Track', |
| | 34 | + 'colapse_track' => 'Collapse Track', |
| | 35 | + 'play_from_position' => 'Play From Playline Position', |
| | 36 | + 'pixle2sec' => 'pixles to seconds', |
| | 37 | + 'rmclip' => 'Remove Clip', |
| | 38 | + 'clip_in' => 'clip in', |
| | 39 | + 'clip_out' => 'clip out', |
| | 40 | + 'mv_welcome_to_sequencer' => '<h3>Welcome to the sequencer demo</h3> very <b>limited</b> functionality right now. Not much documentation yet either', |
| | 41 | + 'no_selected_resource' => '<h3>No Resource Selected</h3> Select a Clip to enable editing', |
| | 42 | + 'error_edit_multiple' => '<h3>Multiple Resources Selected</h3> Select a single clip to edit it', |
| | 43 | + 'mv_editor_options' => 'Editor options', |
| | 44 | + 'mv_editor_mode' => 'Editor mode', |
| | 45 | + 'mv_simple_editor_desc' => 'simple editor (iMovie style)', |
| | 46 | + 'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)', |
| | 47 | + 'mv_other_options' => 'Other Options', |
| | 48 | + 'mv_contextmenu_opt' => 'Enable Context Menus', |
| | 49 | + 'mv_sequencer_credit_line' => 'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a> in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> ( <a href="#">more info</a> )', |
| 20 | 50 | |
| 21 | 51 | /* |
| 22 | | - * js file: /libAddMedia/mvBaseUploadInterface.js |
| | 52 | + * js file: /libSequencer/mvTimedEffectsEdit.js |
| 23 | 53 | */ |
| 24 | | - 'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)', |
| 25 | | - 'upload-in-progress' => 'Upload in Progress (do not close this window)', |
| 26 | | - 'upload-transcoded-status' => 'Transcoded', |
| 27 | | - 'uploaded-status' => 'Uploaded', |
| 28 | | - 'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, <a href="http://firefogg.org">please upgrade</a> ', |
| 29 | | - 'upload-stats-fileprogres' => '$1 of $2', |
| 30 | | - 'mv_upload_completed' => 'Your upload is complete', |
| 31 | | - 'mv_upload_done' => 'Your upload <i>should be</i> accessible <a href="$1">here</a>', |
| 32 | | - 'upload-unknown-size' => 'Unknown size', |
| 33 | | - 'mv-cancel-confim' => 'Are you sure you want to cancel?', |
| 34 | | - 'successfulupload' => 'Successful Upload', |
| 35 | | - 'uploaderror' => 'Upload error', |
| 36 | | - 'uploadwarning' => 'Upload warning', |
| 37 | | - 'unknown-error' => 'Unknown Error', |
| 38 | | - 'return-to-form' => 'Return to form', |
| 39 | | - 'file-exists-duplicate' => 'This file is a duplicate of the following file', |
| 40 | | - 'fileexists' => 'A file with this name exists already, please check <b><tt>$1</tt></b> if you are not sure if you want to change it.', |
| 41 | | - 'fileexists-thumb' => '<center><b>Existing file</b></center>', |
| 42 | | - 'ignorewarning' => 'Ignore warning and save file anyway', |
| 43 | | - 'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>', |
| 44 | | - 'go-to-resource' => 'Go to Resource Page', |
| 45 | | - 'upload-misc-error' => 'Unknown upload error', |
| 46 | | - 'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).', |
| 47 | | - 'cancel-button' => 'Cancel', |
| 48 | | - 'ok-button' => 'OK', |
| | 54 | + 'transition_in' => 'Transition In', |
| | 55 | + 'transition_out' => 'Transition Out', |
| | 56 | + 'effects' => 'Effects Stack', |
| | 57 | + 'remove_transition' => 'Remove Transition', |
| | 58 | + 'edit_transin' => 'Edit Transition Into Clip', |
| | 59 | + 'edit_transout' => 'Edit Transition Out of Clip', |
| 49 | 60 | |
| 50 | 61 | /* |
| 51 | | - * js file: /libAddMedia/mvAdvFirefogg.js |
| | 62 | + * js file: /libClipEdit/mvClipEdit.js |
| 52 | 63 | */ |
| 53 | | - 'help-sticky' => 'Help (Click to Stick)', |
| 54 | | - 'fogg-cg-preset' => 'Preset: <strong>$1</strong>', |
| 55 | | - 'fogg-cg-quality' => 'Basic Quality and Resolution Control', |
| 56 | | - 'fogg-cg-meta' => 'Meta Data for the Clip', |
| 57 | | - 'fogg-cg-range' => 'Encoding Range', |
| 58 | | - 'fogg-cg-advVideo' => 'Advanced Video Encoding Controls', |
| 59 | | - 'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls', |
| 60 | | - 'fogg-preset-custom' => 'Custom Settings', |
| | 64 | + 'mv_crop' => 'Crop Image', |
| | 65 | + 'mv_apply_crop' => 'Apply Crop to Image', |
| | 66 | + 'mv_reset_crop' => 'Rest Crop', |
| | 67 | + 'mv_insert_image_page' => 'Insert Into page', |
| | 68 | + 'mv_insert_into_sequence' => 'Insert Into Sequence', |
| | 69 | + 'mv_preview_insert' => 'Preview Insert', |
| | 70 | + 'mv_cancel_image_insert' => 'Cancel Insert', |
| | 71 | + 'sc_fileopts' => 'Clip Detail Edit', |
| | 72 | + 'sc_inoutpoints' => 'Set In-Out points', |
| | 73 | + 'sc_overlays' => 'Overlays', |
| | 74 | + 'sc_audio' => 'Audio Control', |
| | 75 | + 'sc_duration' => 'Duration', |
| | 76 | + 'mv_template_properties' => 'Template Properties', |
| | 77 | + 'mv_custom_title' => 'Custom Title', |
| | 78 | + 'mv_edit_properties' => 'Edit Properties', |
| | 79 | + 'mv_other_properties' => 'Other Properties', |
| | 80 | + 'mv_resource_page' => 'Resource Page:', |
| | 81 | + 'mv_set_in_out_points' => 'Set in-out points', |
| | 82 | + 'mv_start_time' => 'Start Time', |
| | 83 | + 'mv_end_time' => 'End Time', |
| | 84 | + 'mv_preview_inout' => 'Preview/Play In-out points', |
| 61 | 85 | |
| 62 | 86 | /* |
| 63 | 87 | * js file: /libAddMedia/searchLibs/metavidSearch.js |
| — | — | @@ -69,22 +93,6 @@ |
| 70 | 94 | 'imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more info', |
| 71 | 95 | |
| 72 | 96 | /* |
| 73 | | - * js file: /libAddMedia/mvFirefogg.js |
| 74 | | - */ |
| 75 | | - 'fogg-select_file' => 'Select File', |
| 76 | | - 'fogg-select_new_file' => 'Select New File', |
| 77 | | - 'fogg-select_url' => 'Select Url', |
| 78 | | - 'fogg-save_local_file' => 'Save Ogg', |
| 79 | | - 'fogg-check_for_fogg' => 'Checking for Firefogg <blink>...</blink>', |
| 80 | | - 'fogg-installed' => 'Firefogg is Installed', |
| 81 | | - 'fogg-for_improved_uplods' => 'For Improved uploads: ', |
| 82 | | - 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about firefogg</a>', |
| 83 | | - 'fogg-use_latest_fox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>then revisit this page to install the <b>firefogg</b> extention</i>', |
| 84 | | - 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file', |
| 85 | | - 'fogg-transcoding' => 'Encoding Video to Ogg', |
| 86 | | - 'fogg-encoding-done' => 'Encoding Done', |
| 87 | | - |
| 88 | | - /* |
| 89 | 97 | * js file: /libAddMedia/remoteSearchDriver.js |
| 90 | 98 | */ |
| 91 | 99 | 'add_media_wizard' => 'Add Media Wizard', |
| — | — | @@ -95,7 +103,7 @@ |
| 96 | 104 | 'rsd_results_next' => 'next ', |
| 97 | 105 | 'rsd_results_prev' => 'previous ', |
| 98 | 106 | 'rsd_no_results' => 'No search results for <b>$1</b>', |
| 99 | | - 'mv_upload' => 'Upload', |
| | 107 | + 'upload_tab' => 'Upload', |
| 100 | 108 | 'rsd_layout' => 'Layout:', |
| 101 | 109 | 'rsd_resource_edit' => 'Edit Resource: $1', |
| 102 | 110 | 'resource_description_page' => 'Resource Description Page', |
| — | — | @@ -111,56 +119,96 @@ |
| 112 | 120 | 'no_import_by_url' => 'This User or Wiki <b>can not</b> import assets from remote URLs. </p><p> Do you need to Login? </p><p> If permissions are set you may have to enable $wgAllowCopyUploads, <a href="http://www.mediawiki.org/wiki/Manual:$wgAllowCopyUploads">more info</a></p>', |
| 113 | 121 | 'results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| 114 | 122 | 'missing_desc_see_soruce' => 'This Asset is missing a description. Please see the [$1 orginal source] and help describe it', |
| | 123 | + 'rsd_config_error' => 'Add media Wizard configuation error: $1', |
| 115 | 124 | |
| 116 | 125 | /* |
| 117 | | - * js file: /libSequencer/mvSequencer.js |
| | 126 | + * js file: /libAddMedia/mvFirefogg.js |
| 118 | 127 | */ |
| 119 | | - 'menu_clipedit' => 'Edit Media', |
| 120 | | - 'menu_transition' => 'Transitions & Effects', |
| 121 | | - 'menu_cliplib' => 'Add Media', |
| 122 | | - 'menu_resource_overview' => 'Resource Overview', |
| 123 | | - 'menu_options' => 'Options', |
| 124 | | - 'loading_timeline' => 'Loading TimeLine <blink>...</blink>', |
| 125 | | - 'loading_user_rights' => 'Loading user rights <blink>...</blink>', |
| 126 | | - 'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence', |
| 127 | | - 'edit_clip' => 'Edit Clip', |
| 128 | | - 'edit_save' => 'Save Sequence Changes', |
| 129 | | - 'saving_wait' => 'Save in Progress (please wait)', |
| 130 | | - 'save_done' => 'Save Done', |
| 131 | | - 'edit_cancel' => 'Cancel Sequence Edit', |
| 132 | | - 'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost', |
| 133 | | - 'zoom_in' => 'Zoom In', |
| 134 | | - 'zoom_out' => 'Zoom Out', |
| 135 | | - 'cut_clip' => 'Cut Clips', |
| 136 | | - 'expand_track' => 'Expand Track', |
| 137 | | - 'colapse_track' => 'Collapse Track', |
| 138 | | - 'play_from_position' => 'Play From Playline Position', |
| 139 | | - 'pixle2sec' => 'pixles to seconds', |
| 140 | | - 'rmclip' => 'Remove Clip', |
| 141 | | - 'clip_in' => 'clip in', |
| 142 | | - 'clip_out' => 'clip out', |
| 143 | | - 'mv_welcome_to_sequencer' => '<h3>Welcome to the sequencer demo</h3> very <b>limited</b> functionality right now. Not much documentation yet either', |
| 144 | | - 'no_selected_resource' => '<h3>No Resource Selected</h3> Select a Clip to enable editing', |
| 145 | | - 'error_edit_multiple' => '<h3>Multiple Resources Selected</h3> Select a single clip to edit it', |
| 146 | | - 'mv_editor_options' => 'Editor options', |
| 147 | | - 'mv_editor_mode' => 'Editor mode', |
| 148 | | - 'mv_simple_editor_desc' => 'simple editor (iMovie style)', |
| 149 | | - 'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)', |
| 150 | | - 'mv_other_options' => 'Other Options', |
| 151 | | - 'mv_contextmenu_opt' => 'Enable Context Menus', |
| 152 | | - 'mv_sequencer_credit_line' => 'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a> in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> ( <a href="#">more info</a> )', |
| | 128 | + 'fogg-select_file' => 'Select File', |
| | 129 | + 'fogg-select_new_file' => 'Select New File', |
| | 130 | + 'fogg-select_url' => 'Select Url', |
| | 131 | + 'fogg-save_local_file' => 'Save Ogg', |
| | 132 | + 'fogg-check_for_fogg' => 'Checking for Firefogg <blink>...</blink>', |
| | 133 | + 'fogg-installed' => 'Firefogg is Installed', |
| | 134 | + 'fogg-for_improved_uplods' => 'For Improved uploads: ', |
| | 135 | + 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about firefogg</a>', |
| | 136 | + 'fogg-use_latest_fox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>then revisit this page to install the <b>firefogg</b> extention</i>', |
| | 137 | + 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file', |
| | 138 | + 'fogg-transcoding' => 'Encoding Video to Ogg', |
| | 139 | + 'fogg-encoding-done' => 'Encoding Done', |
| 153 | 140 | |
| 154 | 141 | /* |
| 155 | | - * js file: /libSequencer/mvTimedEffectsEdit.js |
| | 142 | + * js file: /libAddMedia/mvBaseUploadInterface.js |
| 156 | 143 | */ |
| 157 | | - 'transition_in' => 'Transition In', |
| 158 | | - 'transition_out' => 'Transition Out', |
| 159 | | - 'effects' => 'Effects Stack', |
| 160 | | - 'remove_transition' => 'Remove Transition', |
| 161 | | - 'edit_transin' => 'Edit Transition Into Clip', |
| 162 | | - 'edit_transout' => 'Edit Transition Out of Clip', |
| | 144 | + 'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)', |
| | 145 | + 'upload-in-progress' => 'Upload in Progress (do not close this window)', |
| | 146 | + 'upload-transcoded-status' => 'Transcoded', |
| | 147 | + 'uploaded-status' => 'Uploaded', |
| | 148 | + 'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, <a href="http://firefogg.org">please upgrade</a> ', |
| | 149 | + 'upload-stats-fileprogres' => '$1 of $2', |
| | 150 | + 'mv_upload_completed' => 'Your upload is complete', |
| | 151 | + 'mv_upload_done' => 'Your upload <i>should be</i> accessible <a href="$1">here</a>', |
| | 152 | + 'upload-unknown-size' => 'Unknown size', |
| | 153 | + 'mv-cancel-confim' => 'Are you sure you want to cancel?', |
| | 154 | + 'successfulupload' => 'Successful Upload', |
| | 155 | + 'uploaderror' => 'Upload error', |
| | 156 | + 'uploadwarning' => 'Upload warning', |
| | 157 | + 'unknown-error' => 'Unknown Error', |
| | 158 | + 'return-to-form' => 'Return to form', |
| | 159 | + 'file-exists-duplicate' => 'This file is a duplicate of the following file', |
| | 160 | + 'fileexists' => 'A file with this name exists already, please check <b><tt>$1</tt></b> if you are not sure if you want to change it.', |
| | 161 | + 'fileexists-thumb' => '<center><b>Existing file</b></center>', |
| | 162 | + 'ignorewarning' => 'Ignore warning and save file anyway', |
| | 163 | + 'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>', |
| | 164 | + 'go-to-resource' => 'Go to Resource Page', |
| | 165 | + 'upload-misc-error' => 'Unknown upload error', |
| | 166 | + 'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).', |
| | 167 | + 'cancel-button' => 'Cancel', |
| | 168 | + 'ok-button' => 'OK', |
| 163 | 169 | |
| 164 | 170 | /* |
| | 171 | + * js file: /libAddMedia/simpleUploadForm.js |
| | 172 | + */ |
| | 173 | + 'select_file' => 'Select File', |
| | 174 | + 'more_licence_options' => 'For more licence options view the <a href="$1">normal upload page</a>', |
| | 175 | + 'select_ownwork' => 'I am uploading entirely my own work, and licencing it under:', |
| | 176 | + 'licence_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| | 177 | + 'upload' => 'Upload File', |
| | 178 | + 'destfilename' => 'Destination filename:', |
| | 179 | + 'summary' => 'Summary', |
| | 180 | + 'error_not_loggedin' => 'You don\'t appear to be logged in or don\'t have upload privlages.', |
| | 181 | + |
| | 182 | + /* |
| | 183 | + * js file: /libAddMedia/mvAdvFirefogg.js |
| | 184 | + */ |
| | 185 | + 'help-sticky' => 'Help (Click to Stick)', |
| | 186 | + 'fogg-cg-preset' => 'Preset: <strong>$1</strong>', |
| | 187 | + 'fogg-cg-quality' => 'Basic Quality and Resolution Control', |
| | 188 | + 'fogg-cg-meta' => 'Meta Data for the Clip', |
| | 189 | + 'fogg-cg-range' => 'Encoding Range', |
| | 190 | + 'fogg-cg-advVideo' => 'Advanced Video Encoding Controls', |
| | 191 | + 'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls', |
| | 192 | + 'fogg-preset-custom' => 'Custom Settings', |
| | 193 | + |
| | 194 | + /* |
| | 195 | + * js file: /libTimedText/mvTextInterface.js |
| | 196 | + */ |
| | 197 | + 'select_transcript_set' => 'Select Layers', |
| | 198 | + 'auto_scroll' => 'auto scroll', |
| | 199 | + 'close' => 'close', |
| | 200 | + 'improve_transcript' => 'Improve', |
| | 201 | + |
| | 202 | + /* |
| | 203 | + * js file: /mv_embed.js |
| | 204 | + */ |
| | 205 | + 'loading_txt' => 'loading <blink>...</blink>', |
| | 206 | + 'loading_title' => 'Loading...', |
| | 207 | + 'size-gigabytes' => '$1 GB', |
| | 208 | + 'size-megabytes' => '$1 MB', |
| | 209 | + 'size-kilobytes' => '$1 K', |
| | 210 | + 'size-bytes' => '$1 B', |
| | 211 | + |
| | 212 | + /* |
| 165 | 213 | * js file: /libEmbedVideo/embedVideo.js |
| 166 | 214 | */ |
| 167 | 215 | 'loading_plugin' => 'loading plugin<blink>...</blink>', |
| — | — | @@ -200,40 +248,5 @@ |
| 201 | 249 | 'mv_generic_missing_plugin' => 'You browser does not appear to support playback type: <b>$1</b><br> visit the <a href="http://commons.wikimedia.org/wiki/Commons:Media_help">Playback Methods</a> page to download a player<br>', |
| 202 | 250 | 'mv_for_best_experience' => 'For a better video playback experience we recommend:<br> <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">Firefox 3.5</a></b>', |
| 203 | 251 | 'mv_do_not_warn_again' => 'Dissmiss for now.', |
| 204 | | - |
| 205 | | - /* |
| 206 | | - * js file: /libClipEdit/mvClipEdit.js |
| 207 | | - */ |
| 208 | | - 'mv_crop' => 'Crop Image', |
| 209 | | - 'mv_apply_crop' => 'Apply Crop to Image', |
| 210 | | - 'mv_reset_crop' => 'Rest Crop', |
| 211 | | - 'mv_insert_image_page' => 'Insert Into page', |
| 212 | | - 'mv_insert_into_sequence' => 'Insert Into Sequence', |
| 213 | | - 'mv_preview_insert' => 'Preview Insert', |
| 214 | | - 'mv_cancel_image_insert' => 'Cancel Insert', |
| 215 | | - 'sc_fileopts' => 'Clip Detail Edit', |
| 216 | | - 'sc_inoutpoints' => 'Set In-Out points', |
| 217 | | - 'sc_overlays' => 'Overlays', |
| 218 | | - 'sc_audio' => 'Audio Control', |
| 219 | | - 'sc_duration' => 'Duration', |
| 220 | | - 'mv_template_properties' => 'Template Properties', |
| 221 | | - 'mv_custom_title' => 'Custom Title', |
| 222 | | - 'mv_edit_properties' => 'Edit Properties', |
| 223 | | - 'mv_other_properties' => 'Other Properties', |
| 224 | | - 'mv_resource_page' => 'Resource Page:', |
| 225 | | - 'mv_set_in_out_points' => 'Set in-out points', |
| 226 | | - 'mv_start_time' => 'Start Time', |
| 227 | | - 'mv_end_time' => 'End Time', |
| 228 | | - 'mv_preview_inout' => 'Preview/Play In-out points', |
| 229 | | - |
| 230 | | - /* |
| 231 | | - * js file: /mv_embed.js |
| 232 | | - */ |
| 233 | | - 'loading_txt' => 'loading <blink>...</blink>', |
| 234 | | - 'loading_title' => 'Loading...', |
| 235 | | - 'size-gigabytes' => '$1 GB', |
| 236 | | - 'size-megabytes' => '$1 MB', |
| 237 | | - 'size-kilobytes' => '$1 K', |
| 238 | | - 'size-bytes' => '$1 B', |
| 239 | 252 | ); |
| 240 | 253 | #</JAVASCRIPT EN REPLACE> |
| \ No newline at end of file |
| Index: trunk/phase3/js2/mwEmbed/mv_embed.js |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | /* |
| 3 | | - * ~mv_embed version 1.0~ |
| | 3 | + * ~mv_embed ~ |
| 4 | 4 | * for details see: http://metavid.org/wiki/index.php/Mv_embed |
| 5 | 5 | * |
| 6 | 6 | * All Metavid Wiki code is Released under the GPL2 |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | MV_DO_INIT=false; |
| 22 | 22 | } |
| 23 | 23 | //used to grab fresh copies of scripts. (should be changed on commit) |
| 24 | | -var MV_EMBED_VERSION = '1.0r18'; |
| | 24 | +var MV_EMBED_VERSION = '1.0r19'; |
| 25 | 25 | |
| 26 | 26 | /* |
| 27 | 27 | * Configuration variables (can be set from some precceding script) |
| — | — | @@ -231,8 +231,7 @@ |
| 232 | 232 | ]); |
| 233 | 233 | |
| 234 | 234 | //depencency mapping for css files for self contained included plugins: |
| 235 | | -lcCssPath({ |
| 236 | | - '$j.ui' : 'jquery/' + jQueryUiVN + '.custom.css', |
| | 235 | +lcCssPath({ |
| 237 | 236 | '$j.Jcrop' : 'libClipEdit/Jcrop/css/jquery.Jcrop.css', |
| 238 | 237 | '$j.fn.ColorPicker' : 'libClipEdit/colorpicker/css/colorpicker.css' |
| 239 | 238 | }) |
| Index: branches/new-upload/phase3/js2/mwEmbed/libTimedText/mvTextInterface.js |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | "select_transcript_set" : "Select Layers", |
| 5 | 5 | "auto_scroll" : "auto scroll", |
| 6 | 6 | "close" : "close", |
| 7 | | - "improve_transcript" : "Improve", |
| | 7 | + "improve_transcript" : "Improve" |
| 8 | 8 | }) |
| 9 | 9 | |
| 10 | 10 | // text interface object (for inline display captions) |