| Index: branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js |
| — | — | @@ -10,6 +10,7 @@ |
| 11 | 11 | "mwe-upwiz-transported": "OK", |
| 12 | 12 | "mwe-upwiz-click-here": "Click here to select a file", |
| 13 | 13 | "mwe-upwiz-uploading": "uploading...", |
| | 14 | + "mwe-upwiz-editing": "editing...", |
| 14 | 15 | "mwe-upwiz-remove-upload": "Remove this file from the list of files to upload", |
| 15 | 16 | "mwe-upwiz-remove-description": "Remove this description", |
| 16 | 17 | "mwe-upwiz-upload": "Upload", |
| — | — | @@ -73,8 +74,10 @@ |
| 74 | 75 | |
| 75 | 76 | |
| 76 | 77 | |
| 77 | | -mw.ProgressBar = function( selector ) { |
| | 78 | +mw.ProgressBar = function( selector, text ) { |
| 78 | 79 | var _this = this; |
| | 80 | + // XXX need to figure out a way to put something inside text. |
| | 81 | + |
| 79 | 82 | _this.progressBarDiv = $j('<div></div>') |
| 80 | 83 | .addClass("mwe-upwiz-progress-bar") |
| 81 | 84 | .progressbar( { value: 0 } ); |
| — | — | @@ -88,6 +91,7 @@ |
| 89 | 92 | $j( selector ).html( |
| 90 | 93 | $j('<div />').addClass( 'mwe-upwiz-progress' ) |
| 91 | 94 | .append( $j( '<div></div>' ) |
| | 95 | + .addClass( 'mwe-upwiz-progress-bar-etr' ) |
| 92 | 96 | .append( _this.progressBarDiv ) |
| 93 | 97 | .append( _this.timeRemainingDiv ) ) |
| 94 | 98 | .append( $j( _this.countDiv ) ) |
| — | — | @@ -128,9 +132,6 @@ |
| 129 | 133 | var _this = this; |
| 130 | 134 | |
| 131 | 135 | _this.progressBarDiv.progressbar( 'value', parseInt( fraction * 100 ) ); |
| 132 | | - if (fraction > 0.5) { |
| 133 | | - debugger; |
| 134 | | - } |
| 135 | 136 | |
| 136 | 137 | var remainingTime; |
| 137 | 138 | if (_this.beginTime == null) { |
| — | — | @@ -1768,9 +1769,9 @@ |
| 1769 | 1770 | + '<button id="mwe-upwiz-upload-ctrl" disabled="disabled">' + gM("mwe-upwiz-upload") + '</button>' |
| 1770 | 1771 | + '</div>' |
| 1771 | 1772 | + '</div>' |
| | 1773 | + + '<div id="mwe-upwiz-progress"></div>' |
| 1772 | 1774 | + '<div class="clearShim"></div>' |
| 1773 | 1775 | + '</div>' |
| 1774 | | - + '<div id="mwe-upwiz-progress"></div>' |
| 1775 | 1776 | + '<div style="clear: left;"></div>' |
| 1776 | 1777 | + '</div>' |
| 1777 | 1778 | + '<div id="mwe-upwiz-tabdiv-details">' |
| — | — | @@ -1972,6 +1973,7 @@ |
| 1973 | 1974 | progressProperty, |
| 1974 | 1975 | weightProperty, |
| 1975 | 1976 | progressBarSelector, |
| | 1977 | + progressBarText, |
| 1976 | 1978 | starter, |
| 1977 | 1979 | endCallback ) { |
| 1978 | 1980 | |
| — | — | @@ -1983,7 +1985,7 @@ |
| 1984 | 1986 | } ); |
| 1985 | 1987 | var totalCount = wizard.uploads.length; |
| 1986 | 1988 | |
| 1987 | | - var progressBar = new mw.ProgressBar( progressBarSelector ); |
| | 1989 | + var progressBar = new mw.ProgressBar( progressBarSelector, progressBarText ); |
| 1988 | 1990 | progressBar.setTotal( totalCount ); |
| 1989 | 1991 | |
| 1990 | 1992 | transitioner = function() { |
| — | — | @@ -2046,6 +2048,7 @@ |
| 2047 | 2049 | 'transportProgress', |
| 2048 | 2050 | 'transportWeight', |
| 2049 | 2051 | '#mwe-upwiz-progress', |
| | 2052 | + gM( 'mwe-upwiz-uploading' ), |
| 2050 | 2053 | function( upload ) { |
| 2051 | 2054 | upload.start(); |
| 2052 | 2055 | }, |
| — | — | @@ -2121,6 +2124,7 @@ |
| 2122 | 2125 | 'detailsProgress', |
| 2123 | 2126 | 'detailsWeight', |
| 2124 | 2127 | '#mwe-upwiz-macro-progress', |
| | 2128 | + gM( 'mwe-upwiz-editing' ), |
| 2125 | 2129 | function( upload ) { |
| 2126 | 2130 | upload.details.submit(); |
| 2127 | 2131 | }, |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | border-bottom: 1px solid #e0e0e0; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | | -.mwe-upwiz-file-indicator { |
| | 134 | +.mwe-upwiz-file-indicator, .mwe-upwiz-count { |
| 135 | 135 | float: left; |
| 136 | 136 | width: 92px; |
| 137 | 137 | margin-left: 8px; |
| — | — | @@ -143,10 +143,13 @@ |
| 144 | 144 | margin-left: 4px; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | | -#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file { |
| | 147 | +#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file, .mwe-upwiz-progress-bar-etr { |
| 148 | 148 | width: 300px; |
| 149 | 149 | height: 18px; |
| 150 | 150 | padding-left: 5px; |
| | 151 | +} |
| | 152 | + |
| | 153 | +#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file { |
| 151 | 154 | float: left; |
| 152 | 155 | } |
| 153 | 156 | |
| — | — | @@ -179,11 +182,11 @@ |
| 180 | 183 | |
| 181 | 184 | |
| 182 | 185 | #mwe-upwiz-files { |
| | 186 | + margin-left: 50px; |
| 183 | 187 | margin-top: 20px; |
| 184 | 188 | } |
| 185 | 189 | |
| 186 | 190 | .mwe-upwiz-file { |
| 187 | | - margin-left: 50px; |
| 188 | 191 | width: 410px; |
| 189 | 192 | } |
| 190 | 193 | |
| — | — | @@ -240,11 +243,15 @@ |
| 241 | 244 | color: #009900; |
| 242 | 245 | } |
| 243 | 246 | |
| 244 | | -.mwe-upwiz-progress-bar { |
| 245 | | - margin-left: 50px; |
| | 247 | +.mwe-upwiz-progress-bar-etr { |
| | 248 | + float: left; |
| 246 | 249 | } |
| 247 | 250 | |
| | 251 | +.mwe-upwiz-etr { |
| | 252 | + text-align: center; |
| | 253 | +} |
| 248 | 254 | |
| | 255 | + |
| 249 | 256 | .mwe-upwiz-upload-warning { |
| 250 | 257 | background: #ffffe0; |
| 251 | 258 | } |