Revision: 48464
Author: dale
Date: 2009-03-16 22:24:45 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
minor wording fixes for better user interface flow
Modified Paths:
--------------
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
2009-03-16 22:13:37 UTC (rev 48463)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
2009-03-16 22:24:45 UTC (rev 48464)
@@ -108,7 +108,7 @@
_this.editForm.onsubmit = function(){ return true; };
}
},
- fogg_update_progress:function(progress){
+ fogg_update_progress:function(progress){
$j( '#fogg-progressbar' ).css( 'width', parseInt(progress*100)
+'%');
$j( '#fogg-pstatus' ).html( parseInt(progress*100) + '% - ');
},
@@ -265,7 +265,7 @@
var status = _this.fogg.status();
//update progress bar
- _this.fogg_update_progress( _this.fogg.progress() );
+ _this.fogg_update_progress( _this.fogg.progress() );
//loop to get new status if still encoding
if( _this.fogg.state == 'encoding' ) {
@@ -310,10 +310,10 @@
//update progress bar
_this.fogg_update_progress( _this.fogg.progress() );
-
+
//loop to get new status if still uploading (could also be
encoding if we are in chunk upload mode)
if( _this.fogg.state == 'encoding' || _this.fogg.state ==
'uploading') {
- setTimeout(uploadStatus, 500);
+ setTimeout(uploadStatus, 100);
}
//check upload state
else if( _this.fogg.state == 'upload done' ||
_this.fogg.state == 'done' ) {
@@ -343,7 +343,7 @@
procPageResponse:function( result_page ){
js_log('f:procPageResponse');
var sstring = 'var wgTitle = "' +
this.formData['wpDestFile'].replace('_',' ');
- error_txt = 'Your upload <i>could be</i> accessible <a href="'
+
+ var error_txt = 'Your upload <i>should be</i> accessible <a
href="' +
wgArticlePath.replace(/\$1/,
'File:' + this.formData['wpDestFile'] ) + '">'+
'here</a> \n';
//set the error text in case we dont' get far along in
proccessing the response
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
2009-03-16 22:13:37 UTC (rev 48463)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
2009-03-16 22:24:45 UTC (rev 48464)
@@ -107,12 +107,12 @@
"<span
id='wgfogg_not_installed'>" +
gM('upload-fogg_not_installed') +
'</span>' +
- "<span class='error'
id='wgfogg_wrong_version' style='display:none'>" +
+ "<span class='error'
id='wgfogg_wrong_version' style='display:none'><br>" +
gM('wgfogg_wrong_version') +
'</span>' +
- "<span class='error'
id='wgfogg_waring_ogg_upload' style='display:none' >"+
+ "<span class='error'
id='wgfogg_waring_ogg_upload' style='display:none' ><br>"+
gM('wgfogg_waring_ogg_upload') +
- '</span>'+
+ '</span>' +
"<span id='wgfogg_installed'
style='display:none' >"+
'<input
id="wgEnableFirefogg" type="checkbox" name="wgEnableFirefogg" >' +
gM('upload-enable-converter') +
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
