| Index: branches/js2-work/phase3/js/mwEmbed/includes/languages/mwEmbed.i18n.php |
| — | — | @@ -12,23 +12,65 @@ |
| 13 | 13 | |
| 14 | 14 | $messages['en'] = array( |
| 15 | 15 | /* |
| 16 | | - * js file: /skins/kskin/kskinConfig.js |
| | 16 | + * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| 17 | 17 | */ |
| 18 | | - 'mwe-credit-title' => 'Title: $1', |
| 19 | | - 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| | 18 | + 'mwe-loading_plugin' => 'loading plugin ...', |
| | 19 | + 'mwe-select_playback' => 'Set playback preference', |
| | 20 | + 'mwe-link_back' => 'Link back', |
| | 21 | + 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface', |
| | 22 | + 'mwe-add_to_end_of_sequence' => 'Add to end of sequence', |
| | 23 | + 'mwe-missing_video_stream' => 'The video file for this stream is missing', |
| | 24 | + 'mwe-play_clip' => 'Play clip', |
| | 25 | + 'mwe-pause_clip' => 'Pause clip', |
| | 26 | + 'mwe-volume_control' => 'Volume control', |
| | 27 | + 'mwe-player_options' => 'Player options', |
| | 28 | + 'mwe-timed_text' => 'Timed text', |
| | 29 | + 'mwe-player_fullscreen' => 'Fullscreen', |
| | 30 | + 'mwe-next_clip_msg' => 'Play next clip', |
| | 31 | + 'mwe-prev_clip_msg' => 'Play previous clip', |
| | 32 | + 'mwe-current_clip_msg' => 'Continue playing this clip', |
| | 33 | + 'mwe-seek_to' => 'Seek $1', |
| | 34 | + 'mwe-paused' => 'paused', |
| | 35 | + 'mwe-download_segment' => 'Download selection:', |
| | 36 | + 'mwe-download_full' => 'Download full video file:', |
| | 37 | + 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>', |
| | 38 | + 'mwe-download_clip' => 'Download video', |
| | 39 | + 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):', |
| | 40 | + 'mwe-download' => 'Download', |
| | 41 | + 'mwe-share' => 'Share', |
| | 42 | + 'mwe-credits' => 'Credits', |
| | 43 | + 'mwe-clip_linkback' => 'Clip source page', |
| | 44 | + 'mwe-chose_player' => 'Choose video player', |
| | 45 | + 'mwe-no-player' => 'No player available for $1', |
| | 46 | + 'mwe-share_this_video' => 'Share this video', |
| | 47 | + 'mwe-video_credits' => 'Video credits', |
| | 48 | + 'mwe-menu_btn' => 'Menu', |
| | 49 | + 'mwe-close_btn' => 'Close', |
| | 50 | + 'mwe-ogg-player-vlc-player' => 'VLC player', |
| | 51 | + 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| | 52 | + 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| | 53 | + 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| | 54 | + 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| | 55 | + 'mwe-ogg-player-cortado' => 'Java Cortado', |
| | 56 | + 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| | 57 | + 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| | 58 | + 'mwe-ogg-player-selected' => '(selected)', |
| | 59 | + 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| | 60 | + 'mwe-generic_missing_plugin' => 'You browser does not appear to support the following 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 />', |
| | 61 | + 'mwe-for_best_experience' => 'For a better video playback experience we recommend the <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">latest firefox</a>.</b>', |
| | 62 | + 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| | 63 | + 'mwe-playerSelect' => 'Players', |
| | 64 | + 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| | 65 | + 'mwe-embed_site_or_blog' => 'Embed on a page', |
| | 66 | + 'mwe-related_videos' => 'Related videos', |
| | 67 | + 'mwe-seeking' => 'seeking', |
| | 68 | + 'mwe-copy-code' => 'Copy code', |
| | 69 | + 'mwe-video-h264' => 'H.264 video', |
| | 70 | + 'mwe-video-flv' => 'Flash video', |
| | 71 | + 'mwe-video-ogg' => 'Ogg video', |
| | 72 | + 'mwe-video-audio' => 'Ogg audio', |
| 20 | 73 | |
| 21 | 74 | /* |
| 22 | | - * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| 23 | | - */ |
| 24 | | - 'mwe-transition_in' => 'Transition in', |
| 25 | | - 'mwe-transition_out' => 'Transition out', |
| 26 | | - 'mwe-effects' => 'Effects stack', |
| 27 | | - 'mwe-remove_transition' => 'Remove transition', |
| 28 | | - 'mwe-edit_transin' => 'Edit transition into clip', |
| 29 | | - 'mwe-edit_transout' => 'Edit transition out of clip', |
| 30 | | - 'mwe-add-transition' => 'Add a transition', |
| 31 | | - |
| 32 | | - /* |
| 33 | 75 | * js file: /modules/Sequencer/mw.Sequencer.js |
| 34 | 76 | */ |
| 35 | 77 | 'mwe-menu_clipedit' => 'Edit media', |
| — | — | @@ -67,12 +109,65 @@ |
| 68 | 110 | 'mwe-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 information</a>).', |
| 69 | 111 | |
| 70 | 112 | /* |
| | 113 | + * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| | 114 | + */ |
| | 115 | + 'mwe-transition_in' => 'Transition in', |
| | 116 | + 'mwe-transition_out' => 'Transition out', |
| | 117 | + 'mwe-effects' => 'Effects stack', |
| | 118 | + 'mwe-remove_transition' => 'Remove transition', |
| | 119 | + 'mwe-edit_transin' => 'Edit transition into clip', |
| | 120 | + 'mwe-edit_transout' => 'Edit transition out of clip', |
| | 121 | + 'mwe-add-transition' => 'Add a transition', |
| | 122 | + |
| | 123 | + /* |
| 71 | 124 | * js file: /modules/Sequencer/remotes/RemoteMwSequencer.js |
| 72 | 125 | */ |
| 73 | 126 | 'mwe-no-sequence-create' => 'No sequence exists named $1, You can $2', |
| 74 | 127 | 'mwe-sequence-create-one' => 'start a sequence', |
| 75 | 128 | |
| 76 | 129 | /* |
| | 130 | + * js file: /modules/ClipEdit/mw.ClipEdit.js |
| | 131 | + */ |
| | 132 | + 'mwe-crop' => 'Crop image', |
| | 133 | + 'mwe-apply_crop' => 'Apply crop to image', |
| | 134 | + 'mwe-reset_crop' => 'Reset crop', |
| | 135 | + 'mwe-insert_image_page' => 'Insert into page', |
| | 136 | + 'mwe-insert_into_sequence' => 'Insert into sequence', |
| | 137 | + 'mwe-preview_insert' => 'Preview insert', |
| | 138 | + 'mwe-cancel_image_insert' => 'Cancel insert', |
| | 139 | + 'mwe-sc_attributes' => 'Clip detail edit', |
| | 140 | + 'mwe-sc_inoutpoints' => 'Set in-out points', |
| | 141 | + 'mwe-sc_overlays' => 'Overlays', |
| | 142 | + 'mwe-sc_audio' => 'Audio control', |
| | 143 | + 'mwe-sc_duration' => 'Duration', |
| | 144 | + 'mwe-template_properties' => 'Template properties', |
| | 145 | + 'mwe-custom_title' => 'Custom title', |
| | 146 | + 'mwe-edit_properties' => 'Edit properties', |
| | 147 | + 'mwe-other_properties' => 'Other properties', |
| | 148 | + 'mwe-resource_page' => 'Resource page:', |
| | 149 | + 'mwe-set_in_out_points' => 'Set in-out points', |
| | 150 | + 'mwe-start_time' => 'Start time', |
| | 151 | + 'mwe-end_time' => 'End time', |
| | 152 | + 'mwe-preview_inout' => 'Preview in-out points', |
| | 153 | + 'mwe-edit-tools' => 'Edit tools', |
| | 154 | + 'mwe-inline-description' => 'Caption', |
| | 155 | + 'mwe-edit-video-tools' => 'Edit video tools:', |
| | 156 | + 'mwe-duration' => 'Duration:', |
| | 157 | + 'mwe-layout' => 'Layout', |
| | 158 | + 'mwe-layout_right' => 'Right side image layout', |
| | 159 | + 'mwe-layout_left' => 'Left side image layout', |
| | 160 | + |
| | 161 | + /* |
| | 162 | + * js file: /modules/ApiProxy/mw.proxy.js |
| | 163 | + */ |
| | 164 | + 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| | 165 | + 'mwe-re-try' => 'Retry API request', |
| | 166 | + 'mwe-re-trying' => 'Retrying API request...', |
| | 167 | + 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| | 168 | + 'mwe-please-login' => 'You are not <a target="_new" href="$1">logged in</a> on $2 or mwEmbed has not been enabled. Resolve the issue, and then retry the request.', |
| | 169 | + 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| | 170 | + |
| | 171 | + /* |
| 77 | 172 | * js file: /modules/TimedText/mw.TimedTextEdit.js |
| 78 | 173 | */ |
| 79 | 174 | 'mew-timedtext-editor' => 'Timed text editor', |
| — | — | @@ -131,70 +226,70 @@ |
| 132 | 227 | 'mwe-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2', |
| 133 | 228 | |
| 134 | 229 | /* |
| 135 | | - * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| | 230 | + * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| 136 | 231 | */ |
| 137 | | - 'mwe-loading_plugin' => 'loading plugin ...', |
| 138 | | - 'mwe-select_playback' => 'Set playback preference', |
| 139 | | - 'mwe-link_back' => 'Link back', |
| 140 | | - 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface', |
| 141 | | - 'mwe-add_to_end_of_sequence' => 'Add to end of sequence', |
| 142 | | - 'mwe-missing_video_stream' => 'The video file for this stream is missing', |
| 143 | | - 'mwe-play_clip' => 'Play clip', |
| 144 | | - 'mwe-pause_clip' => 'Pause clip', |
| 145 | | - 'mwe-volume_control' => 'Volume control', |
| 146 | | - 'mwe-player_options' => 'Player options', |
| 147 | | - 'mwe-timed_text' => 'Timed text', |
| 148 | | - 'mwe-player_fullscreen' => 'Fullscreen', |
| 149 | | - 'mwe-next_clip_msg' => 'Play next clip', |
| 150 | | - 'mwe-prev_clip_msg' => 'Play previous clip', |
| 151 | | - 'mwe-current_clip_msg' => 'Continue playing this clip', |
| 152 | | - 'mwe-seek_to' => 'Seek $1', |
| 153 | | - 'mwe-paused' => 'paused', |
| 154 | | - 'mwe-download_segment' => 'Download selection:', |
| 155 | | - 'mwe-download_full' => 'Download full video file:', |
| 156 | | - 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>', |
| 157 | | - 'mwe-download_clip' => 'Download video', |
| 158 | | - 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):', |
| 159 | | - 'mwe-download' => 'Download', |
| 160 | | - 'mwe-share' => 'Share', |
| 161 | | - 'mwe-credits' => 'Credits', |
| 162 | | - 'mwe-clip_linkback' => 'Clip source page', |
| 163 | | - 'mwe-chose_player' => 'Choose video player', |
| 164 | | - 'mwe-no-player' => 'No player available for $1', |
| 165 | | - 'mwe-share_this_video' => 'Share this video', |
| 166 | | - 'mwe-video_credits' => 'Video credits', |
| 167 | | - 'mwe-menu_btn' => 'Menu', |
| 168 | | - 'mwe-close_btn' => 'Close', |
| 169 | | - 'mwe-ogg-player-vlc-player' => 'VLC player', |
| 170 | | - 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| 171 | | - 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| 172 | | - 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| 173 | | - 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| 174 | | - 'mwe-ogg-player-cortado' => 'Java Cortado', |
| 175 | | - 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| 176 | | - 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| 177 | | - 'mwe-ogg-player-selected' => '(selected)', |
| 178 | | - 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| 179 | | - 'mwe-generic_missing_plugin' => 'You browser does not appear to support the following 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 />', |
| 180 | | - 'mwe-for_best_experience' => 'For a better video playback experience we recommend the <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">latest firefox</a>.</b>', |
| 181 | | - 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| 182 | | - 'mwe-playerSelect' => 'Players', |
| 183 | | - 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| 184 | | - 'mwe-embed_site_or_blog' => 'Embed on a page', |
| 185 | | - 'mwe-related_videos' => 'Related videos', |
| 186 | | - 'mwe-seeking' => 'seeking', |
| 187 | | - 'mwe-copy-code' => 'Copy code', |
| 188 | | - 'mwe-video-h264' => 'H.264 video', |
| 189 | | - 'mwe-video-flv' => 'Flash video', |
| 190 | | - 'mwe-video-ogg' => 'Ogg video', |
| 191 | | - 'mwe-video-audio' => 'Ogg audio', |
| | 232 | + 'mwe-add_media_wizard' => 'Add media wizard', |
| | 233 | + 'mwe-media_search' => 'Media search', |
| | 234 | + 'rsd_box_layout' => 'Box layout', |
| | 235 | + 'rsd_list_layout' => 'List layout', |
| | 236 | + 'rsd_results_desc' => 'Results $1 to $2', |
| | 237 | + 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| | 238 | + 'rsd_results_next' => 'next', |
| | 239 | + 'rsd_results_prev' => 'previous', |
| | 240 | + 'rsd_no_results' => 'No search results for <b>$1</b>', |
| | 241 | + 'mwe-upload_tab' => 'Upload', |
| | 242 | + 'rsd_layout' => 'Layout:', |
| | 243 | + 'rsd_resource_edit' => 'Edit resource: $1', |
| | 244 | + 'mwe-resource_description_page' => 'Resource description page', |
| | 245 | + 'mwe-link' => 'link', |
| | 246 | + 'rsd_do_insert' => 'Do insert', |
| | 247 | + 'mwe-cc_title' => 'Creative Commons', |
| | 248 | + 'mwe-cc_by_title' => 'Attribution', |
| | 249 | + 'mwe-cc_nc_title' => 'Noncommercial', |
| | 250 | + 'mwe-cc_nd_title' => 'No Derivative Works', |
| | 251 | + 'mwe-cc_sa_title' => 'Share Alike', |
| | 252 | + 'mwe-cc_pd_title' => 'Public Domain', |
| | 253 | + 'mwe-unknown_license' => 'Unknown license', |
| | 254 | + 'mwe-no_import_by_url' => 'This user or wiki <b>cannot</b> import assets from remote URLs.<p>Do you need to login?</p><p>Is upload_by_url permission set for you?<br />Does the wiki have <a href="http://www.mediawiki.org/wiki/Manual:$wgAllowCopyUploads">$wgAllowCopyUploads</a> enabled?</p>', |
| | 255 | + 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| | 256 | + 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| | 257 | + 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| | 258 | + 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| | 259 | + 'mwe-no_recent_uploads' => 'No recent uploads', |
| | 260 | + 'mwe-upload_a_file' => 'Upload a new file to $1', |
| | 261 | + 'mwe-resource_page_desc' => 'Resource page description:', |
| | 262 | + 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| | 263 | + 'mwe-local_resource_title' => 'Local resource title:', |
| | 264 | + 'mwe-watch_this_page' => 'Watch this page', |
| | 265 | + 'mwe-do_import_resource' => 'Import resource', |
| | 266 | + 'mwe-update_preview' => 'Update resource page preview', |
| | 267 | + 'mwe-return-search-results' => 'Return to search results', |
| | 268 | + 'mwe-importing_asset' => 'Importing asset', |
| | 269 | + 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| | 270 | + 'mwe-do-more-modification' => 'Do More Modification', |
| | 271 | + 'mwe-checking-resource' => 'Checking for resource', |
| | 272 | + 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| | 273 | + 'mwe-ftype-svg' => 'SVG vector file', |
| | 274 | + 'mwe-ftype-jpg' => 'JPEG image file', |
| | 275 | + 'mwe-ftype-png' => 'PNG image file', |
| | 276 | + 'mwe-ftype-oga' => 'Ogg audio file', |
| | 277 | + 'mwe-ftype-ogg' => 'Ogg video file', |
| | 278 | + 'mwe-ftype-unk' => 'Unknown file format', |
| | 279 | + 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| | 280 | + 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| | 281 | + 'rsd-kaltura-title' => 'All Sources', |
| | 282 | + 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers', |
| | 283 | + 'rsd-this_wiki-title' => 'This wiki', |
| | 284 | + 'rsd-this_wiki-desc' => 'The local wiki install', |
| | 285 | + 'rsd-archive_org-title' => 'Archive.org', |
| | 286 | + 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| | 287 | + 'rsd-flickr-title' => 'Flickr.com', |
| | 288 | + 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| | 289 | + 'rsd-metavid-title' => 'Metavid.org', |
| | 290 | + 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| | 291 | + 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| 192 | 292 | |
| 193 | 293 | /* |
| 194 | | - * js file: /modules/AddMedia/loader.js |
| 195 | | - */ |
| 196 | | - 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| 197 | | - |
| 198 | | - /* |
| 199 | 294 | * js file: /modules/AddMedia/mw.BaseUploadInterface.js |
| 200 | 295 | */ |
| 201 | 296 | 'mwe-upload-transcode-in-progress' => 'Transcode and upload in progress (do not close this window)', |
| — | — | @@ -221,6 +316,64 @@ |
| 222 | 317 | 'mwe-wgfogg_warning_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>).', |
| 223 | 318 | |
| 224 | 319 | /* |
| | 320 | + * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| | 321 | + */ |
| | 322 | + 'mwe-select_file' => 'Select file', |
| | 323 | + 'mwe-more_license_options' => 'For more license options, view the <a href="$1">normal upload page</a>', |
| | 324 | + 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licencing it under:', |
| | 325 | + 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| | 326 | + 'mwe-upload' => 'Upload file', |
| | 327 | + 'mwe-destfilename' => 'Destination filename:', |
| | 328 | + 'mwe-summary' => 'Summary', |
| | 329 | + 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| | 330 | + 'mwe-watch-this-file' => 'Watch this file', |
| | 331 | + 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| | 332 | + |
| | 333 | + /* |
| | 334 | + * js file: /modules/AddMedia/mw.Firefogg.js |
| | 335 | + */ |
| | 336 | + 'fogg-select_file' => 'Select file', |
| | 337 | + 'fogg-select_new_file' => 'Select new file', |
| | 338 | + 'fogg-select_url' => 'Select URL', |
| | 339 | + 'fogg-save_local_file' => 'Save Ogg', |
| | 340 | + 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| | 341 | + 'fogg-installed' => 'Firefogg is installed', |
| | 342 | + 'fogg-for_improved_uploads' => 'For improved uploads:', |
| | 343 | + 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.', |
| | 344 | + 'fogg-use_latest_firefox' => '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> extension.</i>', |
| | 345 | + 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file', |
| | 346 | + 'fogg-transcoding' => 'Encoding video to Ogg...', |
| | 347 | + 'fogg-encoding-done' => 'Encoding complete', |
| | 348 | + 'fogg-badtoken' => 'Token is not valid', |
| | 349 | + 'fogg-preview' => 'Preview video', |
| | 350 | + 'fogg-hidepreview' => 'Hide preview', |
| | 351 | + |
| | 352 | + /* |
| | 353 | + * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| | 354 | + */ |
| | 355 | + 'mwe-stream_title' => '$1 $2 to $3', |
| | 356 | + |
| | 357 | + /* |
| | 358 | + * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| | 359 | + */ |
| | 360 | + 'rsd-media-filter-title' => 'Media', |
| | 361 | + 'rsd-media-filter-videos' => 'Videos', |
| | 362 | + 'rsd-media-filter-images' => 'Images', |
| | 363 | + 'rsd-provider-filter-title' => 'Providers', |
| | 364 | + |
| | 365 | + /* |
| | 366 | + * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| | 367 | + */ |
| | 368 | + 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| | 369 | + 'mwe-import-description' => '$1, imported from $2', |
| | 370 | + |
| | 371 | + /* |
| | 372 | + * js file: /modules/AddMedia/jquery.dragDropFile.js |
| | 373 | + */ |
| | 374 | + 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| | 375 | + 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| | 376 | + |
| | 377 | + /* |
| 225 | 378 | * js file: /modules/AddMedia/mw.FirefoggGUI.js |
| 226 | 379 | */ |
| 227 | 380 | 'fogg-help-sticky' => 'Help (click to stick)', |
| — | — | @@ -287,168 +440,11 @@ |
| 288 | 441 | 'fogg-contact-help' => 'Contact link', |
| 289 | 442 | |
| 290 | 443 | /* |
| 291 | | - * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| | 444 | + * js file: /modules/AddMedia/loader.js |
| 292 | 445 | */ |
| 293 | | - 'mwe-stream_title' => '$1 $2 to $3', |
| | 446 | + 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| 294 | 447 | |
| 295 | 448 | /* |
| 296 | | - * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| 297 | | - */ |
| 298 | | - 'rsd-media-filter-title' => 'Media', |
| 299 | | - 'rsd-media-filter-videos' => 'Videos', |
| 300 | | - 'rsd-media-filter-images' => 'Images', |
| 301 | | - 'rsd-provider-filter-title' => 'Providers', |
| 302 | | - |
| 303 | | - /* |
| 304 | | - * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| 305 | | - */ |
| 306 | | - 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| 307 | | - 'mwe-import-description' => '$1, imported from $2', |
| 308 | | - |
| 309 | | - /* |
| 310 | | - * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| 311 | | - */ |
| 312 | | - 'mwe-select_file' => 'Select file', |
| 313 | | - 'mwe-more_license_options' => 'For more license options, view the <a href="$1">normal upload page</a>', |
| 314 | | - 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licencing it under:', |
| 315 | | - 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| 316 | | - 'mwe-upload' => 'Upload file', |
| 317 | | - 'mwe-destfilename' => 'Destination filename:', |
| 318 | | - 'mwe-summary' => 'Summary', |
| 319 | | - 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| 320 | | - 'mwe-watch-this-file' => 'Watch this file', |
| 321 | | - 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| 322 | | - |
| 323 | | - /* |
| 324 | | - * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| 325 | | - */ |
| 326 | | - 'mwe-add_media_wizard' => 'Add media wizard', |
| 327 | | - 'mwe-media_search' => 'Media search', |
| 328 | | - 'rsd_box_layout' => 'Box layout', |
| 329 | | - 'rsd_list_layout' => 'List layout', |
| 330 | | - 'rsd_results_desc' => 'Results $1 to $2', |
| 331 | | - 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| 332 | | - 'rsd_results_next' => 'next', |
| 333 | | - 'rsd_results_prev' => 'previous', |
| 334 | | - 'rsd_no_results' => 'No search results for <b>$1</b>', |
| 335 | | - 'mwe-upload_tab' => 'Upload', |
| 336 | | - 'rsd_layout' => 'Layout:', |
| 337 | | - 'rsd_resource_edit' => 'Edit resource: $1', |
| 338 | | - 'mwe-resource_description_page' => 'Resource description page', |
| 339 | | - 'mwe-link' => 'link', |
| 340 | | - 'rsd_do_insert' => 'Do insert', |
| 341 | | - 'mwe-cc_title' => 'Creative Commons', |
| 342 | | - 'mwe-cc_by_title' => 'Attribution', |
| 343 | | - 'mwe-cc_nc_title' => 'Noncommercial', |
| 344 | | - 'mwe-cc_nd_title' => 'No Derivative Works', |
| 345 | | - 'mwe-cc_sa_title' => 'Share Alike', |
| 346 | | - 'mwe-cc_pd_title' => 'Public Domain', |
| 347 | | - 'mwe-unknown_license' => 'Unknown license', |
| 348 | | - 'mwe-no_import_by_url' => 'This user or wiki <b>cannot</b> import assets from remote URLs.<p>Do you need to login?</p><p>Is upload_by_url permission set for you?<br />Does the wiki have <a href="http://www.mediawiki.org/wiki/Manual:$wgAllowCopyUploads">$wgAllowCopyUploads</a> enabled?</p>', |
| 349 | | - 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| 350 | | - 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| 351 | | - 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| 352 | | - 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| 353 | | - 'mwe-no_recent_uploads' => 'No recent uploads', |
| 354 | | - 'mwe-upload_a_file' => 'Upload a new file to $1', |
| 355 | | - 'mwe-resource_page_desc' => 'Resource page description:', |
| 356 | | - 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| 357 | | - 'mwe-local_resource_title' => 'Local resource title:', |
| 358 | | - 'mwe-watch_this_page' => 'Watch this page', |
| 359 | | - 'mwe-do_import_resource' => 'Import resource', |
| 360 | | - 'mwe-update_preview' => 'Update resource page preview', |
| 361 | | - 'mwe-return-search-results' => 'Return to search results', |
| 362 | | - 'mwe-importing_asset' => 'Importing asset', |
| 363 | | - 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| 364 | | - 'mwe-do-more-modification' => 'Do More Modification', |
| 365 | | - 'mwe-checking-resource' => 'Checking for resource', |
| 366 | | - 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| 367 | | - 'mwe-ftype-svg' => 'SVG vector file', |
| 368 | | - 'mwe-ftype-jpg' => 'JPEG image file', |
| 369 | | - 'mwe-ftype-png' => 'PNG image file', |
| 370 | | - 'mwe-ftype-oga' => 'Ogg audio file', |
| 371 | | - 'mwe-ftype-ogg' => 'Ogg video file', |
| 372 | | - 'mwe-ftype-unk' => 'Unknown file format', |
| 373 | | - 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| 374 | | - 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| 375 | | - 'rsd-kaltura-title' => 'All Sources', |
| 376 | | - 'rsd-kaltura' => 'Kaltura agragated search for free-licenced media across multiple search providers', |
| 377 | | - 'rsd-this_wiki-title' => 'This wiki', |
| 378 | | - 'rsd-this_wiki-desc' => 'The local wiki install', |
| 379 | | - 'rsd-archive_org-title' => 'Archive.org', |
| 380 | | - 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| 381 | | - 'rsd-flickr-title' => 'Flickr.com', |
| 382 | | - 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| 383 | | - 'rsd-metavid-title' => 'Metavid.org', |
| 384 | | - 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| 385 | | - 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| 386 | | - |
| 387 | | - /* |
| 388 | | - * js file: /modules/AddMedia/mw.Firefogg.js |
| 389 | | - */ |
| 390 | | - 'fogg-select_file' => 'Select file', |
| 391 | | - 'fogg-select_new_file' => 'Select new file', |
| 392 | | - 'fogg-select_url' => 'Select URL', |
| 393 | | - 'fogg-save_local_file' => 'Save Ogg', |
| 394 | | - 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| 395 | | - 'fogg-installed' => 'Firefogg is installed', |
| 396 | | - 'fogg-for_improved_uploads' => 'For improved uploads:', |
| 397 | | - 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about Firefogg</a>.', |
| 398 | | - 'fogg-use_latest_firefox' => '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> extension.</i>', |
| 399 | | - 'fogg-passthrough_mode' => 'Your selected file is already Ogg or not a video file', |
| 400 | | - 'fogg-transcoding' => 'Encoding video to Ogg...', |
| 401 | | - 'fogg-encoding-done' => 'Encoding complete', |
| 402 | | - 'fogg-badtoken' => 'Token is not valid', |
| 403 | | - 'fogg-preview' => 'Preview video', |
| 404 | | - 'fogg-hidepreview' => 'Hide preview', |
| 405 | | - |
| 406 | | - /* |
| 407 | | - * js file: /modules/AddMedia/jquery.dragDropFile.js |
| 408 | | - */ |
| 409 | | - 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| 410 | | - 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| 411 | | - |
| 412 | | - /* |
| 413 | | - * js file: /modules/ClipEdit/mw.ClipEdit.js |
| 414 | | - */ |
| 415 | | - 'mwe-crop' => 'Crop image', |
| 416 | | - 'mwe-apply_crop' => 'Apply crop to image', |
| 417 | | - 'mwe-reset_crop' => 'Reset crop', |
| 418 | | - 'mwe-insert_image_page' => 'Insert into page', |
| 419 | | - 'mwe-insert_into_sequence' => 'Insert into sequence', |
| 420 | | - 'mwe-preview_insert' => 'Preview insert', |
| 421 | | - 'mwe-cancel_image_insert' => 'Cancel insert', |
| 422 | | - 'mwe-sc_attributes' => 'Clip detail edit', |
| 423 | | - 'mwe-sc_inoutpoints' => 'Set in-out points', |
| 424 | | - 'mwe-sc_overlays' => 'Overlays', |
| 425 | | - 'mwe-sc_audio' => 'Audio control', |
| 426 | | - 'mwe-sc_duration' => 'Duration', |
| 427 | | - 'mwe-template_properties' => 'Template properties', |
| 428 | | - 'mwe-custom_title' => 'Custom title', |
| 429 | | - 'mwe-edit_properties' => 'Edit properties', |
| 430 | | - 'mwe-other_properties' => 'Other properties', |
| 431 | | - 'mwe-resource_page' => 'Resource page:', |
| 432 | | - 'mwe-set_in_out_points' => 'Set in-out points', |
| 433 | | - 'mwe-start_time' => 'Start time', |
| 434 | | - 'mwe-end_time' => 'End time', |
| 435 | | - 'mwe-preview_inout' => 'Preview in-out points', |
| 436 | | - 'mwe-edit-tools' => 'Edit tools', |
| 437 | | - 'mwe-inline-description' => 'Caption', |
| 438 | | - 'mwe-edit-video-tools' => 'Edit video tools:', |
| 439 | | - 'mwe-duration' => 'Duration:', |
| 440 | | - 'mwe-layout' => 'Layout', |
| 441 | | - |
| 442 | | - /* |
| 443 | | - * js file: /modules/ApiProxy/mw.proxy.js |
| 444 | | - */ |
| 445 | | - 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| 446 | | - 'mwe-re-try' => 'Retry API request', |
| 447 | | - 'mwe-re-trying' => 'Retrying API request...', |
| 448 | | - 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| 449 | | - 'mwe-please-login' => 'You are not <a target="_new" href="$1">logged in</a> on $2 or mwEmbed has not been enabled. Resolve the issue, and then retry the request.', |
| 450 | | - 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| 451 | | - |
| 452 | | - /* |
| 453 | 449 | * js file: /mwEmbed.js |
| 454 | 450 | */ |
| 455 | 451 | 'mwe-loading_txt' => 'Loading ...', |
| — | — | @@ -466,6 +462,12 @@ |
| 467 | 463 | 'mwe-must-login-gadget' => 'To enable gadget you must <a target="_new" href="$1">login</a>', |
| 468 | 464 | |
| 469 | 465 | /* |
| | 466 | + * js file: /skins/kskin/kskinConfig.js |
| | 467 | + */ |
| | 468 | + 'mwe-credit-title' => 'Title: $1', |
| | 469 | + 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| | 470 | + |
| | 471 | + /* |
| 470 | 472 | * js file: /tests/testLang.js |
| 471 | 473 | */ |
| 472 | 474 | 'undelete_short' => 'Undelete {{PLURAL:$1|one edit|$1 edits}}', |
| Index: branches/js2-work/phase3/js/mwEmbed/skins/common/common.css |
| — | — | @@ -249,34 +249,34 @@ |
| 250 | 250 | |
| 251 | 251 | |
| 252 | 252 | /* edit buttons: */ |
| 253 | | -.mv_edit_button{ |
| | 253 | +.mw_edit_button{ |
| 254 | 254 | width:22px; |
| 255 | 255 | height:22px; |
| 256 | 256 | float:left; |
| 257 | 257 | } |
| 258 | | -#mv_layout_left_img{ |
| | 258 | +#mw_layout_left_img{ |
| 259 | 259 | width:50px; |
| 260 | 260 | height:33px; |
| 261 | 261 | background-image: url('images/image_layout_left.png'); |
| 262 | 262 | float:left; |
| 263 | 263 | } |
| 264 | | -#mv_layout_right_img{ |
| | 264 | +#mw_layout_right_img{ |
| 265 | 265 | width:50px; |
| 266 | 266 | height:33px; |
| 267 | 267 | background-image: url('images/image_layout_right.png'); |
| 268 | 268 | float:left; |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | | -.mv_crop_button_base{ |
| | 271 | +.mw_crop_button_base{ |
| 272 | 272 | background-image: url('images/stock-tool-button-crop.png'); |
| 273 | 273 | } |
| 274 | | -.mv_crop_button_selected{ |
| | 274 | +.mw_crop_button_selected{ |
| 275 | 275 | background-image: url('images/stock-tool-button-crop_over.png'); |
| 276 | 276 | } |
| 277 | | -.mv_scale_button_base{ |
| | 277 | +.mw_scale_button_base{ |
| 278 | 278 | background-image: url('images/stock-tool-button-scale.png'); |
| 279 | 279 | } |
| 280 | | -.mv_scale_button_selected{ |
| | 280 | +.mw_scale_button_selected{ |
| 281 | 281 | background-image: url('images/stock-tool-button-scale_over.png'); |
| 282 | 282 | } |
| 283 | 283 | .loading_spinner{ |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/searchLibs/baseRemoteSearch.js |
| — | — | @@ -214,7 +214,7 @@ |
| 215 | 215 | getEmbedHTML: function( resource , options ) { |
| 216 | 216 | if ( !options ) |
| 217 | 217 | options = { }; |
| 218 | | - |
| | 218 | + |
| 219 | 219 | // Set up the output var with the default values: |
| 220 | 220 | if(! options.width ) |
| 221 | 221 | options.width = resource.width; |
| — | — | @@ -234,8 +234,10 @@ |
| 235 | 235 | if( options.width ){ |
| 236 | 236 | options.style += 'width:' + parseInt( options.width ) + 'px;'; |
| 237 | 237 | } |
| 238 | | - if ( resource.mime.indexOf( 'image' ) != -1 ) |
| | 238 | + |
| | 239 | + if ( resource.mime.indexOf( 'image/' ) != -1 ){ |
| 239 | 240 | outHtml = this.getImageEmbedHTML( resource, options ); |
| | 241 | + } |
| 240 | 242 | |
| 241 | 243 | if ( resource.mime == 'application/ogg' || resource.mime == 'video/ogg' || resource.mime == 'audio/ogg' ) { |
| 242 | 244 | // Setup the attribute html |
| — | — | @@ -264,10 +266,11 @@ |
| 265 | 267 | } |
| 266 | 268 | |
| 267 | 269 | // Return the output. Wrap with a description div if insert_description is on. |
| 268 | | - if( outHtml != '') |
| | 270 | + if( outHtml != ''){ |
| 269 | 271 | return ( options['insert_description'] ) ? |
| 270 | 272 | this.wrapHtmlDesc(resource, options, outHtml) : |
| 271 | 273 | outHtml; |
| | 274 | + } |
| 272 | 275 | |
| 273 | 276 | // No output give error: |
| 274 | 277 | mw.log( "ERROR:: no embed code for mime type: " + resource.mime ); |
| — | — | @@ -330,7 +333,7 @@ |
| 331 | 334 | $img.attr( 'id', options['id'] ); |
| 332 | 335 | } |
| 333 | 336 | if ( resource.crop == null ){ |
| 334 | | - return $img.html(); |
| | 337 | + return $j('<div />').append( $img ).html(); |
| 335 | 338 | } |
| 336 | 339 | // Else do crop output: |
| 337 | 340 | $cropHtml = $j('<div />') |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.RemoteSearchDriver.js |
| — | — | @@ -1614,7 +1614,9 @@ |
| 1615 | 1615 | var resource = _this.getResourceFromId( $j( this ).attr( "id" ) ); |
| 1616 | 1616 | _this.showResourceEditor( resource ); |
| 1617 | 1617 | return false; |
| 1618 | | - } ); |
| | 1618 | + } ) |
| | 1619 | + // Add a "bind" class |
| | 1620 | + .addClass( 'rsd_res_item_bind' ) ; |
| 1619 | 1621 | }, |
| 1620 | 1622 | |
| 1621 | 1623 | /** |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/ClipEdit/mw.ClipEdit.js |
| — | — | @@ -29,7 +29,9 @@ |
| 30 | 30 | "mwe-inline-description" : "Caption", |
| 31 | 31 | "mwe-edit-video-tools" : "Edit video tools:", |
| 32 | 32 | "mwe-duration" : "Duration:", |
| 33 | | - "mwe-layout" : "Layout" |
| | 33 | + "mwe-layout" : "Layout", |
| | 34 | + "mwe-layout_right" : "Right side image layout", |
| | 35 | + "mwe-layout_left" : "Left side image layout" |
| 34 | 36 | } ); |
| 35 | 37 | |
| 36 | 38 | /** |
| — | — | @@ -552,8 +554,7 @@ |
| 553 | 555 | var values = $target.find( '.inOutSlider' ).slider( 'option', 'values' ); |
| 554 | 556 | mw.log( 'in slider len: ' + $target.find( '.inOutSlider' ).length ); |
| 555 | 557 | |
| 556 | | - $target.find( '.inOutSlider' ).slider( 'value', 10 ); |
| 557 | | - debugger; |
| | 558 | + $target.find( '.inOutSlider' ).slider( 'value', 10 ); |
| 558 | 559 | $target.find( '.inOutSlider' ).slider( 'option', 'values', [s_sec, e_sec] ); |
| 559 | 560 | var values = $target.find( '.inOutSlider' ).slider( 'option', 'values' ); |
| 560 | 561 | mw.log( 'values (after update):' + values ); |
| — | — | @@ -714,71 +715,152 @@ |
| 715 | 716 | switch( tool_type ) { |
| 716 | 717 | case 'layout': |
| 717 | 718 | |
| 718 | | - $target.append( '' + |
| 719 | | - '<span style="float:left;">' + gM( 'mwe-layout' ) +'</span>' + |
| 720 | | - '<input type="radio" name="mv_layout" id="mv_layout_left" style="float:left"></input>'+ |
| 721 | | - '<div id="mv_layout_left_img" title="' + gM( 'mwe-layout_left' ) + '"></div>' + |
| 722 | | - '<input type="radio" name="mv_layout" id="mv_layout_right" style="float:left"></input>'+ |
| 723 | | - '<div id="mv_layout_right_img" title="' + gM( 'mwe-layout_left' ) + '"></div>' + |
| 724 | | - '<hr style="clear:both" /><br/>' |
| | 719 | + $target.append( |
| | 720 | + $j( '<span />' ) |
| | 721 | + .css({ |
| | 722 | + "float" : "left" |
| | 723 | + }) |
| | 724 | + .text( gM( 'mwe-layout' ) ), |
| | 725 | + |
| | 726 | + // Left layout |
| | 727 | + $j('<input />') |
| | 728 | + .attr({ |
| | 729 | + "type" : "radio", |
| | 730 | + "name" : "mw_layout", |
| | 731 | + "id" : "mw_layout_left" |
| | 732 | + }) |
| | 733 | + .css({ |
| | 734 | + 'float' : 'left' |
| | 735 | + }), |
| | 736 | + $j( '<div /> ') |
| | 737 | + .attr({ |
| | 738 | + 'id' : 'mw_layout_left_img', |
| | 739 | + 'title': gM( 'mwe-layout_left' ) |
| | 740 | + }), |
| | 741 | + |
| | 742 | + // Right Layout |
| | 743 | + $j('<input />') |
| | 744 | + .attr({ |
| | 745 | + "type" : "radio", |
| | 746 | + "name" : "mw_layout", |
| | 747 | + "id" : "mw_layout_right" |
| | 748 | + }) |
| | 749 | + .css({ |
| | 750 | + 'float' : 'left' |
| | 751 | + }), |
| | 752 | + $j( '<div /> ') |
| | 753 | + .attr({ |
| | 754 | + 'id' : 'mw_layout_right_img', |
| | 755 | + 'title': gM( 'mwe-layout_right' ) |
| | 756 | + }), |
| | 757 | + |
| | 758 | + $j('<hr />') |
| | 759 | + .css({ |
| | 760 | + "clear" : "both" |
| | 761 | + }) |
| 725 | 762 | ); |
| 726 | 763 | |
| 727 | 764 | // Make sure the default is reflected: |
| 728 | | - if ( ! _this.resource.layout ) |
| | 765 | + if ( ! _this.resource.layout ){ |
| 729 | 766 | _this.resource.layout = 'right'; |
| 730 | | - $j( '#mv_layout_' + _this.resource.layout )[0].checked = true; |
| | 767 | + } |
| | 768 | + |
| | 769 | + $j( '#mw_layout_' + _this.resource.layout )[0].checked = true; |
| 731 | 770 | |
| 732 | 771 | // Left radio click |
| 733 | | - $j( '#mv_layout_left,#mv_layout_left_img' ).click( function() { |
| 734 | | - $j( '#mv_layout_right' )[0].checked = false; |
| 735 | | - $j( '#mv_layout_left' )[0].checked = true; |
| | 772 | + $j( '#mw_layout_left,#mw_layout_left_img' ).click( function() { |
| | 773 | + $j( '#mw_layout_right' )[0].checked = false; |
| | 774 | + $j( '#mw_layout_left' )[0].checked = true; |
| 736 | 775 | _this.resource.layout = 'left'; |
| 737 | 776 | } ); |
| 738 | 777 | |
| 739 | 778 | // Right radio click |
| 740 | | - $j( '#mv_layout_right,#mv_layout_right_img' ).click( function() { |
| 741 | | - $j( '#mv_layout_left' )[0].checked = false; |
| 742 | | - $j( '#mv_layout_right' )[0].checked = true; |
| | 779 | + $j( '#mw_layout_right,#mw_layout_right_img' ).click( function() { |
| | 780 | + $j( '#mw_layout_left' )[0].checked = false; |
| | 781 | + $j( '#mw_layout_right' )[0].checked = true; |
| 743 | 782 | _this.resource.layout = 'right'; |
| 744 | 783 | } ); |
| 745 | 784 | break; |
| 746 | 785 | case 'crop': |
| 747 | | - $target.append( '' + |
| 748 | | - '<div class="mv_edit_button mv_crop_button_base" id="mv_crop_button" alt="crop" title="' + gM( 'mwe-crop' ) + '"/>' + |
| 749 | | - '<a href="#" class="mv_crop_msg">' + gM( 'mwe-crop' ) + '</a> ' + |
| 750 | | - '<span style="display:none" class="mv_crop_msg_load">' + gM( 'mwe-loading_txt' ) + '</span> ' + |
| 751 | | - '<a href="#" style="display:none" class="mv_apply_crop">' + gM( 'mwe-apply_crop' ) + '</a> ' + |
| 752 | | - '<a href="#" style="display:none" class="mv_reset_crop">' + gM( 'mwe-reset_crop' ) + '</a> ' + |
| 753 | | - '<hr style="clear:both"/><br>' |
| | 786 | + $target.append( |
| | 787 | + $j( '<div /> ') |
| | 788 | + .addClass( 'mw_edit_button mw_crop_button_base' ) |
| | 789 | + .attr({ |
| | 790 | + 'id' : 'mw_crop_button', |
| | 791 | + 'alt' : 'crop', |
| | 792 | + 'title' : gM( 'mwe-crop' ) |
| | 793 | + }), |
| | 794 | + |
| | 795 | + $j( '<a />') |
| | 796 | + .attr({ |
| | 797 | + 'href': '#', |
| | 798 | + }) |
| | 799 | + .addClass( 'mw_crop_msg' ) |
| | 800 | + .text( gM( 'mwe-crop' ) ), |
| | 801 | + |
| | 802 | + $j( '<span />' ) |
| | 803 | + .addClass( 'mw_crop_msg_load') |
| | 804 | + .text( gM( 'mwe-loading_txt' ) ) |
| | 805 | + .hide(), |
| | 806 | + |
| | 807 | + $j( '<a />' ) |
| | 808 | + .attr({ |
| | 809 | + 'href': '#' |
| | 810 | + }) |
| | 811 | + .css({ |
| | 812 | + 'display': 'inline' |
| | 813 | + }) |
| | 814 | + .addClass( 'mw_apply_crop' ) |
| | 815 | + .text( gM( 'mwe-apply_crop' ) ) |
| | 816 | + .hide(), |
| | 817 | + |
| | 818 | + // some space between apply and rest |
| | 819 | + $j('<span />') |
| | 820 | + .css('display','inline') |
| | 821 | + .text(' '), |
| | 822 | + |
| | 823 | + $j( '<a />' ) |
| | 824 | + .attr( 'href','#' ) |
| | 825 | + .css({ |
| | 826 | + 'display': 'inline' |
| | 827 | + }) |
| | 828 | + .addClass( 'mw_reset_crop' ) |
| | 829 | + .text( gM( 'mwe-reset_crop' ) ) |
| | 830 | + .hide(), |
| | 831 | + |
| | 832 | + $j( '<hr />' ) |
| | 833 | + .css('clear', 'both'), |
| | 834 | + |
| | 835 | + $j( '<br />' ) |
| | 836 | + |
| 754 | 837 | ); |
| 755 | 838 | // Add binding: |
| 756 | | - $j( '#mv_crop_button,.mv_crop_msg,.mv_apply_crop' ).click( function() { |
| | 839 | + $j( '#mw_crop_button,.mw_crop_msg,.mw_apply_crop' ).click( function() { |
| 757 | 840 | mw.log( 'click:mv_crop_button: base width: ' + _this.resource.width + ' bh: ' + _this.resource.height ); |
| 758 | | - if ( $j( '#mv_crop_button' ).hasClass( 'mv_crop_button_selected' ) ) { |
| | 841 | + if ( $j( '#mw_crop_button' ).hasClass( 'mw_crop_button_selected' ) ) { |
| 759 | 842 | _this.applyCrop(); |
| 760 | 843 | } else { |
| 761 | 844 | mw.log( 'click:turn on' ); |
| 762 | 845 | _this.doCropInterface(); |
| 763 | 846 | } |
| 764 | 847 | } ); |
| 765 | | - $j( '.mv_reset_crop' ).click( function() { |
| 766 | | - $j( '.mv_apply_crop,.mv_reset_crop' ).hide(); |
| 767 | | - $j( '.mv_crop_msg' ).show(); |
| 768 | | - $j( '#mv_crop_button' ).removeClass( 'mv_crop_button_selected' ).addClass( 'mv_crop_button_base' ).attr( 'title', gM( 'mwe-crop' ) ); |
| | 848 | + $j( '.mw_reset_crop' ).click( function() { |
| | 849 | + $j( '.mw_apply_crop,.mw_reset_crop' ).hide(); |
| | 850 | + $j( '.mw_crop_msg' ).show(); |
| | 851 | + $j( '#mw_crop_button' ).removeClass( 'mw_crop_button_selected' ).addClass( 'mw_crop_button_base' ).attr( 'title', gM( 'mwe-crop' ) ); |
| 769 | 852 | _this.resource.crop = null; |
| 770 | 853 | $j( '#' + _this.target_clip_display ).empty().html( |
| 771 | | - '<img src="' + _this.resource.edit_url + '" id="rsd_edit_img">' |
| | 854 | + $j('<img />') |
| | 855 | + .attr({ |
| | 856 | + 'src' : _this.resource.edit_url, |
| | 857 | + 'id' : 'rsd_edit_img' |
| | 858 | + }) |
| 772 | 859 | ); |
| 773 | 860 | } ); |
| 774 | 861 | break; |
| 775 | | - /* Stubs for scale: |
| | 862 | + /* TODO support setting the image "scale": |
| 776 | 863 | case 'scale': |
| 777 | 864 | |
| 778 | | - '<div class="mv_edit_button mv_scale_button_base" id="mv_scale_button" alt="crop" title="'+gM('mwe-scale')+'"></div>'+ |
| 779 | | - '<a href="#" class="mv_scale_msg">' + gM('mwe-scale') + '</a><br>'+ |
| 780 | | - '<a href="#" style="display:none" class="mv_apply_scale">' + gM('mwe-apply_scale') + '</a> '+ |
| 781 | | - '<a href="#" style="display:none" class="mv_reset_scale">' + gM('mwe-reset_scale') + '</a><br> '+ |
| 782 | | - |
| 783 | 865 | break; |
| 784 | 866 | */ |
| 785 | 867 | } |
| — | — | @@ -793,7 +875,10 @@ |
| 794 | 876 | mw.log( 'tool target len: ' + $tool_target.length ); |
| 795 | 877 | // By default apply Crop tool |
| 796 | 878 | if ( _this.enabled_tools == 'all' || _this.enabled_tools.length > 0 ) { |
| 797 | | - $tool_target.html( '<h3>' + gM( 'mwe-edit-tools' ) + '</h3>' ); |
| | 879 | + $tool_target.html( |
| | 880 | + $j( '<h3 />' ) |
| | 881 | + .text( gM( 'mwe-edit-tools' ) ) |
| | 882 | + ); |
| 798 | 883 | for ( var i in _this.toolset ) { |
| 799 | 884 | var toolid = _this.toolset[i]; |
| 800 | 885 | if ( $j.inArray( toolid, _this.enabled_tools ) != -1 || _this.enabled_tools == 'all' ) |
| — | — | @@ -813,30 +898,40 @@ |
| 814 | 899 | */ |
| 815 | 900 | applyCrop:function() { |
| 816 | 901 | var _this = this; |
| 817 | | - $j( '.mv_apply_crop' ).hide(); |
| 818 | | - $j( '.mv_crop_msg' ).show(); |
| | 902 | + $j( '.mw_apply_crop' ).hide(); |
| | 903 | + $j( '.mw_crop_msg' ).show(); |
| 819 | 904 | |
| 820 | 905 | // Update the crop button: |
| 821 | | - $j( '#mv_crop_button' ) |
| 822 | | - .removeClass( 'mv_crop_button_selected' ) |
| 823 | | - .addClass( 'mv_crop_button_base' ) |
| | 906 | + $j( '#mw_crop_button' ) |
| | 907 | + .removeClass( 'mw_crop_button_selected' ) |
| | 908 | + .addClass( 'mw_crop_button_base' ) |
| 824 | 909 | .attr( 'title', gM( 'mwe-crop' ) ); |
| 825 | 910 | |
| 826 | 911 | if ( _this.resource.crop ) { |
| 827 | 912 | // Empty out and display cropped: |
| 828 | 913 | $j( '#' + _this.target_clip_display ) |
| 829 | 914 | .empty() |
| 830 | | - .html( |
| 831 | | - '<div id="mv_cropcotainer" style="overflow:hidden;position:absolute;' + |
| 832 | | - 'width:' + _this.resource.crop.w + 'px;' + |
| 833 | | - 'height:' + _this.resource.crop.h + 'px;">' + |
| 834 | | - '<div id="mv_crop_img" style="position:absolute;' + |
| 835 | | - 'top:-' + _this.resource.crop.y + 'px;' + |
| 836 | | - 'left:-' + _this.resource.crop.x + 'px;">' + |
| 837 | | - '<img src="' + _this.resource.edit_url + '">' + |
| 838 | | - '</div>' + |
| 839 | | - '</div>' |
| 840 | | - ); |
| | 915 | + .append( |
| | 916 | + $j('<div />') |
| | 917 | + .css({ |
| | 918 | + 'overflow' : 'hidden', |
| | 919 | + 'position' : 'absolute', |
| | 920 | + 'width' : parseInt( _this.resource.crop.w ) + 'px', |
| | 921 | + 'height' : parseInt( _this.resource.crop.h ) + 'px' |
| | 922 | + }) |
| | 923 | + .append( |
| | 924 | + $j( '<div />' ) |
| | 925 | + .css({ |
| | 926 | + 'position' : 'absolute', |
| | 927 | + 'top' : '-' + parseInt( _this.resource.crop.y ) + 'px', |
| | 928 | + 'left' : '-' + parseInt( _this.resource.crop.x ) + 'px' |
| | 929 | + }) |
| | 930 | + .append( |
| | 931 | + $j('<img />') |
| | 932 | + .attr( 'src', _this.resource.edit_url ) |
| | 933 | + ) |
| | 934 | + ) |
| | 935 | + ) |
| 841 | 936 | } |
| 842 | 937 | return true; |
| 843 | 938 | }, |
| — | — | @@ -866,8 +961,8 @@ |
| 867 | 962 | */ |
| 868 | 963 | doCropInterface:function() { |
| 869 | 964 | var _this = this; |
| 870 | | - $j( '.mv_crop_msg' ).hide(); |
| 871 | | - $j( '.mv_crop_msg_load' ).show(); |
| | 965 | + $j( '.mw_crop_msg' ).hide(); |
| | 966 | + $j( '.mw_crop_msg_load' ).show(); |
| 872 | 967 | // load the jcrop library if needed: |
| 873 | 968 | mw.load( [ |
| 874 | 969 | '$j.Jcrop' |
| — | — | @@ -881,9 +976,9 @@ |
| 882 | 977 | */ |
| 883 | 978 | bindCrop: function(){ |
| 884 | 979 | var _this = this; |
| 885 | | - $j( '.mv_crop_msg_load' ).hide(); |
| 886 | | - $j( '.mv_reset_crop,.mv_apply_crop' ).show(); |
| 887 | | - $j( '#mv_crop_button' ).removeClass( 'mv_crop_button_base' ).addClass( 'mv_crop_button_selected' ).attr( 'title', gM( 'mwe-crop_done' ) ); |
| | 980 | + $j( '.mw_crop_msg_load' ).hide(); |
| | 981 | + $j( '.mw_reset_crop,.mw_apply_crop' ).show(); |
| | 982 | + $j( '#mw_crop_button' ).removeClass( 'mw_crop_button_base' ).addClass( 'mw_crop_button_selected' ).attr( 'title', gM( 'mwe-crop_done' ) ); |
| 888 | 983 | $j( '#' + _this.target_clip_display + ' img' ).Jcrop( { |
| 889 | 984 | onSelect: function( c ) { |
| 890 | 985 | mw.log( 'on select:' + c.x + ',' + c.y + ',' + c.x2 + ',' + c.y2 + ',' + c.w + ',' + c.h ); |
| Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | /* |
| 3 | 3 | * This file exposes some of the functionality of mwEmbed to wikis |
| 4 | | - * that do not yet have js2 enabled |
| | 4 | + * that do not yet have mwEmbed enabled |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| — | — | @@ -342,7 +342,7 @@ |
| 343 | 343 | // Add Core mwEmbed lib: |
| 344 | 344 | rurl += coma + 'mwEmbed'; |
| 345 | 345 | |
| 346 | | - // Add scriptLoader requested classSet |
| | 346 | + // Add requested classSet to scriptLoader request |
| 347 | 347 | for( var i=0; i < classSet.length; i++ ){ |
| 348 | 348 | var cName = classSet[i]; |
| 349 | 349 | if( !mwCheckObjectPath( cName ) ){ |