wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-11-24 07:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add close button to settings dialog" into mpga

Browse source
This commit is contained in:
jenkins-bot 2017-02-02 14:21:54 +00:00 committed by Gerrit Code Review
parent ba99b1f535 6fab3c9ca4
commit 8c96564915
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extension.json
View file

@ -133,6 +133,7 @@
"popups-preview-footer-read"
],
"dependencies": [
"ext.popups.images",
"mediawiki.storage",
"mediawiki.Title",
"mediawiki.jqueryMsg",

13
resources/ext.popups/settingsDialog.js
View file

@ -177,15 +177,16 @@
* @param {Boolean} visible if the help should be visible, or the form
*/
function toggleHelp( $el, visible ) {
var formSelectors = '#mwe-popups-settings-form, #mwe-popups-settings .save',
helpSelectors = '#mwe-popups-settings-help, #mwe-popups-settings .okay';
var $dialog = $( '#mwe-popups-settings' ),
formSelectors = 'main, .save, .close',
helpSelectors = '.mwe-popups-settings-help, .okay';
if ( visible ) {
$( formSelectors ).hide();
$( helpSelectors ).show();
$dialog.find( formSelectors ).hide();
$dialog.find( helpSelectors ).show();
} else {
$( formSelectors ).show();
$( helpSelectors ).hide();
$dialog.find( formSelectors ).show();
$dialog.find( helpSelectors ).hide();
}
}

7
resources/ext.popups/styles/ext.popups.settings.less
View file

@ -1,4 +1,5 @@
@import 'mediawiki.mixins.less';
@import 'mediawiki.ui/variables';
@dialog-margin: 50px;
@ -21,7 +22,7 @@
> div {
display: table-cell;
width: 3.35em;
width: @iconSize + ( 2 * @iconGutterWidth );
vertical-align: middle;
cursor: pointer;
}
@ -83,7 +84,7 @@
}
}
#mwe-popups-settings-help {
.mwe-popups-settings-help {
font-size: 18px;
font-weight: 800;
margin: @dialog-margin;
@ -107,7 +108,7 @@
}
}
.rtl #mwe-popups-settings-help div.mwe-popups-settings-help-image {
.rtl .mwe-popups-settings-help div.mwe-popups-settings-help-image {
.background-image-svg( '../images/footer-rtl.svg', '../images/footer-rtl.png' );
}

2
resources/ext.popups/templates/settings.mustache
View file

@ -22,7 +22,7 @@
{{/choices}}
</form>
</main>
<div id="mwe-popups-settings-help" style="display:none;">
<div class="mwe-popups-settings-help" style="display:none;">
<p>{{helpText}}</p>
<div class="mwe-popups-settings-help-image"></div>
</div>