| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | /* Configuration */ |
| 23 | 23 | |
| 24 | 24 | // Set this to false to include all plugins individually |
| 25 | | -$wgUsabilityInitiativeResourceMode = 'minified'; |
| | 25 | +$wgUsabilityInitiativeResourceMode = 'raw'; |
| 26 | 26 | |
| 27 | 27 | /* Setup */ |
| 28 | 28 | |
| Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css |
| — | — | @@ -280,3 +280,8 @@ |
| 281 | 281 | .wikiEditor-toolbar-dialog .ui-dialog-content { |
| 282 | 282 | padding-bottom: 1em !important; |
| 283 | 283 | } |
| | 284 | + |
| | 285 | +/* Edit dialog */ |
| | 286 | +.wikiEditor-dialog-editoptions { |
| | 287 | + margin-top: 15px; |
| | 288 | +} |
| \ No newline at end of file |
| Index: trunk/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -527,7 +527,11 @@ |
| 528 | 528 | .wikiEditor-toolbar-dialog .ui-dialog-content { |
| 529 | 529 | padding-bottom: 1em !important; |
| 530 | 530 | } |
| 531 | | -/* wikiEditor toc module */ |
| | 531 | + |
| | 532 | +/* Edit dialog */ |
| | 533 | +.wikiEditor-dialog-editoptions { |
| | 534 | + margin-top: 15px; |
| | 535 | +}/* wikiEditor toc module */ |
| 532 | 536 | .wikiEditor-ui-toc { |
| 533 | 537 | /* height and width are set dynamically */ |
| 534 | 538 | /*float: right;*/ |
| Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -499,6 +499,9 @@ |
| 500 | 500 | .wikiEditor-toolbar-dialog .ui-dialog-content{ |
| 501 | 501 | padding-bottom:1em !important; |
| 502 | 502 | } |
| | 503 | +.wikiEditor-dialog-editoptions{ |
| | 504 | +margin-top:15px; |
| | 505 | +} |
| 503 | 506 | .wikiEditor-ui-toc{ |
| 504 | 507 | padding:0; |
| 505 | 508 | overflow:auto; |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.publish.js |
| — | — | @@ -63,9 +63,24 @@ |
| 64 | 64 | $(this).find( '[rel]' ).each( function() { |
| 65 | 65 | $(this).text( mw.usability.getMsg( $(this).attr( 'rel' ) ) ); |
| 66 | 66 | }); |
| 67 | | - $(this).find( '.wikiEditor-dialog-copywarn' ) |
| 68 | | - .html( $( '#editpage-copywarn' ).html() ); |
| 69 | 67 | |
| | 68 | + //reformat the copyright warning stuff |
| | 69 | + var copywarnHTML = $( '#editpage-copywarn' ).html(); |
| | 70 | + |
| | 71 | + //TODO: internationalize by splitting on other characters that end statements |
| | 72 | + var copywarnStatements = copywarnHTML.split(". "); |
| | 73 | + var newcopywarnHTML = "<ul>"; |
| | 74 | + for(var i = 0; i < copywarnStatements.length; i++){ |
| | 75 | + if(copywarnStatements[i] != ""){ |
| | 76 | + newcopywarnHTML += "<li>" + copywarnStatements[i] + ". </li>" ; |
| | 77 | + } |
| | 78 | + } |
| | 79 | + newcopywarnHTML += "</ul>"; |
| | 80 | + |
| | 81 | + //no list if there's only one element |
| | 82 | + $(this).find( '.wikiEditor-dialog-copywarn' ).html( |
| | 83 | + copywarnStatements.length > 1 ? newcopywarnHTML : copywarnHTML ); |
| | 84 | + |
| 70 | 85 | if ( $( '#wpMinoredit' ).size() == 0 ) |
| 71 | 86 | $( '#wikiEditor-' + context.instance + '-dialog-minor' ).hide(); |
| 72 | 87 | else if ( $( '#wpMinoredit' ).is( ':checked' ) ) |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -9130,9 +9130,24 @@ |
| 9131 | 9131 | $(this).find( '[rel]' ).each( function() { |
| 9132 | 9132 | $(this).text( mw.usability.getMsg( $(this).attr( 'rel' ) ) ); |
| 9133 | 9133 | }); |
| 9134 | | - $(this).find( '.wikiEditor-dialog-copywarn' ) |
| 9135 | | - .html( $( '#editpage-copywarn' ).html() ); |
| 9136 | 9134 | |
| | 9135 | + //reformat the copyright warning stuff |
| | 9136 | + var copywarnHTML = $( '#editpage-copywarn' ).html(); |
| | 9137 | + |
| | 9138 | + //TODO: internationalize by splitting on other characters that end statements |
| | 9139 | + var copywarnStatements = copywarnHTML.split(". "); |
| | 9140 | + var newcopywarnHTML = "<ul>"; |
| | 9141 | + for(var i = 0; i < copywarnStatements.length; i++){ |
| | 9142 | + if(copywarnStatements[i] != ""){ |
| | 9143 | + newcopywarnHTML += "<li>" + copywarnStatements[i] + ". </li>" ; |
| | 9144 | + } |
| | 9145 | + } |
| | 9146 | + newcopywarnHTML += "</ul>"; |
| | 9147 | + |
| | 9148 | + //no list if there's only one element |
| | 9149 | + $(this).find( '.wikiEditor-dialog-copywarn' ).html( |
| | 9150 | + copywarnStatements.length > 1 ? newcopywarnHTML : copywarnHTML ); |
| | 9151 | + |
| 9137 | 9152 | if ( $( '#wpMinoredit' ).size() == 0 ) |
| 9138 | 9153 | $( '#wikiEditor-' + context.instance + '-dialog-minor' ).hide(); |
| 9139 | 9154 | else if ( $( '#wpMinoredit' ).is( ':checked' ) ) |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -636,7 +636,8 @@ |
| 637 | 637 | <label for="wikiEditor-'+context.instance+'-dialog-watch"\ |
| 638 | 638 | rel="wikieditor-publish-dialog-watch"></label>\ |
| 639 | 639 | </form>\ |
| 640 | | - </div>',init:function(){$(this).find('[rel]').each(function(){$(this).text(mw.usability.getMsg($(this).attr('rel')));});$(this).find('.wikiEditor-dialog-copywarn').html($('#editpage-copywarn').html());if($('#wpMinoredit').size()==0) |
| | 640 | + </div>',init:function(){$(this).find('[rel]').each(function(){$(this).text(mw.usability.getMsg($(this).attr('rel')));});var copywarnHTML=$('#editpage-copywarn').html();var copywarnStatements=copywarnHTML.split(". ");var newcopywarnHTML="<ul>";for(var i=0;i<copywarnStatements.length;i++){if(copywarnStatements[i]!=""){newcopywarnHTML+="<li>"+copywarnStatements[i]+". </li>";}} |
| | 641 | +newcopywarnHTML+="</ul>";$(this).find('.wikiEditor-dialog-copywarn').html(copywarnStatements.length>1?newcopywarnHTML:copywarnHTML);if($('#wpMinoredit').size()==0) |
| 641 | 642 | $('#wikiEditor-'+context.instance+'-dialog-minor').hide();else if($('#wpMinoredit').is(':checked')) |
| 642 | 643 | $('#wikiEditor-'+context.instance+'-dialog-minor').attr('checked','checked');if($('#wpWatchthis').size()==0) |
| 643 | 644 | $('#wikiEditor-'+context.instance+'-dialog-watch').hide();else if($('#wpWatchthis').is(':checked')) |