From 67ccc1b86952b3eec2b66226cac8b3a8b9cf39ca Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 27 May 2014 15:41:46 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (7b283a9dcc) New changes: 71d9671 Add more Agora dialogs styling 457a0ef Localisation updates from https://translatewiki.net. c92ba96 Compute directionality for frame correctly f3414b8 Localisation updates from https://translatewiki.net. 90fbb6f Localisation updates from https://translatewiki.net. 1d4d52a Localisation updates from https://translatewiki.net. 08d1c7b Add ability to put a header at the top of a toolGroup pop-up Change-Id: I6f4adbca80abeec0931380233e0e45a9f45af330 --- resources/lib/oojs-ui/i18n/bn.json | 5 ++- resources/lib/oojs-ui/i18n/ce.json | 6 ++- resources/lib/oojs-ui/i18n/ilo.json | 6 ++- resources/lib/oojs-ui/i18n/lzh.json | 8 ++++ resources/lib/oojs-ui/i18n/ro.json | 6 +-- resources/lib/oojs-ui/i18n/sq.json | 9 ++++- resources/lib/oojs-ui/i18n/tl.json | 7 +++- resources/lib/oojs-ui/oojs-ui-agora.css | 38 ++++++++++++++++++- resources/lib/oojs-ui/oojs-ui-apex.css | 26 +++++++++++++ resources/lib/oojs-ui/oojs-ui.js | 17 +++++++-- resources/lib/oojs-ui/oojs-ui.svg.css | 31 +++++---------- .../themes/agora/images/icons/check.svg | 8 ++++ 12 files changed, 132 insertions(+), 35 deletions(-) create mode 100644 resources/lib/oojs-ui/i18n/lzh.json create mode 100644 resources/lib/oojs-ui/themes/agora/images/icons/check.svg diff --git a/resources/lib/oojs-ui/i18n/bn.json b/resources/lib/oojs-ui/i18n/bn.json index a7b9d9d1b0..f7105ce7e5 100644 --- a/resources/lib/oojs-ui/i18n/bn.json +++ b/resources/lib/oojs-ui/i18n/bn.json @@ -13,5 +13,8 @@ "ooui-outline-control-move-down": "আইটেম নিচে স্থানান্তর", "ooui-outline-control-move-up": "আইটেম উপরে স্থানান্তর", "ooui-outline-control-remove": "আইটেম সরান", - "ooui-toolbar-more": "আরও" + "ooui-toolbar-more": "আরও", + "ooui-dialog-confirm-title": "নিশ্চিত করুন", + "ooui-dialog-confirm-default-ok": "ঠিক আছে", + "ooui-dialog-confirm-default-cancel": "বাতিল" } diff --git a/resources/lib/oojs-ui/i18n/ce.json b/resources/lib/oojs-ui/i18n/ce.json index 1ef273188a..122be19819 100644 --- a/resources/lib/oojs-ui/i18n/ce.json +++ b/resources/lib/oojs-ui/i18n/ce.json @@ -9,5 +9,9 @@ "ooui-outline-control-move-down": "Лаха яккха элемент", "ooui-outline-control-move-up": "Лаккха яккха элемент", "ooui-outline-control-remove": "ДӀадаха меттиг", - "ooui-toolbar-more": "Кхин тӀе" + "ooui-toolbar-more": "Кхин тӀе", + "ooui-dialog-confirm-title": "Бакъдан", + "ooui-dialog-confirm-default-prompt": "Бакъалла лаьий хӀуна?", + "ooui-dialog-confirm-default-ok": "ХӀаъ", + "ooui-dialog-confirm-default-cancel": "Цаоьшу" } diff --git a/resources/lib/oojs-ui/i18n/ilo.json b/resources/lib/oojs-ui/i18n/ilo.json index b0a717ac19..5d9e3bb8b8 100644 --- a/resources/lib/oojs-ui/i18n/ilo.json +++ b/resources/lib/oojs-ui/i18n/ilo.json @@ -8,5 +8,9 @@ "ooui-outline-control-move-down": "Ipababa ti banag", "ooui-outline-control-move-up": "Ipangato ti banag", "ooui-outline-control-remove": "Ikkaten ti banag", - "ooui-toolbar-more": "Adu pay" + "ooui-toolbar-more": "Adu pay", + "ooui-dialog-confirm-title": "Pasingkedan", + "ooui-dialog-confirm-default-prompt": "Siguradoka kadi?", + "ooui-dialog-confirm-default-ok": "Sige", + "ooui-dialog-confirm-default-cancel": "Ukasen" } diff --git a/resources/lib/oojs-ui/i18n/lzh.json b/resources/lib/oojs-ui/i18n/lzh.json new file mode 100644 index 0000000000..f296c3a499 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/lzh.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Joe young yu" + ] + }, + "ooui-dialog-confirm-default-ok": "可" +} diff --git a/resources/lib/oojs-ui/i18n/ro.json b/resources/lib/oojs-ui/i18n/ro.json index 4f379e4d6e..01815148f3 100644 --- a/resources/lib/oojs-ui/i18n/ro.json +++ b/resources/lib/oojs-ui/i18n/ro.json @@ -13,8 +13,8 @@ "ooui-outline-control-move-up": "Mută elementul mai sus", "ooui-outline-control-remove": "Elimină elementul", "ooui-toolbar-more": "Mai mult", - "ooui-dialog-confirm-title": "Confirmă", - "ooui-dialog-confirm-default-prompt": "Ești sigur?", + "ooui-dialog-confirm-title": "Confirmare", + "ooui-dialog-confirm-default-prompt": "Sunteți sigur(ă)?", "ooui-dialog-confirm-default-ok": "OK", - "ooui-dialog-confirm-default-cancel": "Renunță" + "ooui-dialog-confirm-default-cancel": "Revocare" } diff --git a/resources/lib/oojs-ui/i18n/sq.json b/resources/lib/oojs-ui/i18n/sq.json index 5e46ab69a7..44dfd60928 100644 --- a/resources/lib/oojs-ui/i18n/sq.json +++ b/resources/lib/oojs-ui/i18n/sq.json @@ -3,12 +3,17 @@ "authors": [ "Euriditi", "Kushtrim", - "Elioqoshi" + "Elioqoshi", + "GretaDoci" ] }, "ooui-dialog-action-close": "Mbylle", "ooui-outline-control-move-down": "Zhvendose artikullin më poshtë", "ooui-outline-control-move-up": "Zhvendose artikullin më lart", "ooui-outline-control-remove": "Hiq artikullin", - "ooui-toolbar-more": "Më tepër..." + "ooui-toolbar-more": "Më tepër...", + "ooui-dialog-confirm-title": "Konfirmo", + "ooui-dialog-confirm-default-prompt": "A jeni i sigurt?", + "ooui-dialog-confirm-default-ok": "Në rregull", + "ooui-dialog-confirm-default-cancel": "Anullo" } diff --git a/resources/lib/oojs-ui/i18n/tl.json b/resources/lib/oojs-ui/i18n/tl.json index 8a295f469f..178384cd3c 100644 --- a/resources/lib/oojs-ui/i18n/tl.json +++ b/resources/lib/oojs-ui/i18n/tl.json @@ -8,5 +8,10 @@ "ooui-dialog-action-close": "Isara", "ooui-outline-control-move-down": "Ilipat ang aytem pababa", "ooui-outline-control-move-up": "Ilipat ang aytem pataas", - "ooui-toolbar-more": "Marami pa" + "ooui-outline-control-remove": "Tanggalin ang aytem", + "ooui-toolbar-more": "Marami pa", + "ooui-dialog-confirm-title": "Tiyakin", + "ooui-dialog-confirm-default-prompt": "Nakatitiyak ka ba?", + "ooui-dialog-confirm-default-ok": "Sige", + "ooui-dialog-confirm-default-cancel": "Huwag ituloy" } diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css b/resources/lib/oojs-ui/oojs-ui-agora.css index 5a69a2c75b..47fce7ac8b 100644 --- a/resources/lib/oojs-ui/oojs-ui-agora.css +++ b/resources/lib/oojs-ui/oojs-ui-agora.css @@ -9,7 +9,29 @@ } .oo-ui-dialog-content .oo-ui-window-body { - position: relative; + position: absolute; + top: 3.35em; + right: 0; + bottom: 0; + left: 0; + overflow-y: auto; +} + +.oo-ui-dialog-content .oo-ui-window-foot { + position: absolute; + top: 0; + right: 0; + height: 3.35em; +} + +.oo-ui-dialog-content .oo-ui-window-foot .oo-ui-buttonedElement-button { + height: 100%; +} + +.oo-ui-dialog-content .oo-ui-window-foot .oo-ui-buttonedElement-button .oo-ui-labeledElement-label { + display: inline-block; + width: 0; + text-indent: -9999px; } .oo-ui-dialog-medium .oo-ui-window-frame { @@ -21,6 +43,9 @@ .oo-ui-window-head { height: 3.35em; border-bottom: 1px solid #dddddd; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .oo-ui-window-body { @@ -45,6 +70,10 @@ background-size: 2em auto; } +.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { + padding: 0 0 1em; +} + .oo-ui-optionWidget { padding: 0.8em 1em 0.8em 3.35em; font-weight: bold; @@ -97,4 +126,11 @@ .oo-ui-textInputWidget input, .oo-ui-textInputWidget textarea { padding: .8em 1em; +} + +/* Icons */ + +.oo-ui-icon-check { + background: #347bff; + background-image: /* @embed */ url(themes/agora/images/icons/check.svg); } \ No newline at end of file diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 63a66fb86c..e915ee8e3f 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -107,6 +107,16 @@ box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); } +.oo-ui-dialog-content .oo-ui-window-foot { + bottom: 0; + height: 4.8em; + padding: 1em; +} + +.oo-ui-dialog-content .oo-ui-window-foot .oo-ui-buttonedElement-framed { + margin: 0.125em 0.25em; +} + .oo-ui-dialog-content .oo-ui-window-overlay { z-index: 3; } @@ -226,6 +236,8 @@ } .oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + padding: 0.2em 0.8em; + margin: 0.1em 0; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); background: #eeeeee; background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #ffffff), color-stop(100%, #dddddd)); @@ -264,6 +276,16 @@ box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.07); } +.oo-ui-buttonedElement-framed.oo-ui-iconedElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { + margin-right: -0.5em; + margin-left: -0.5em; +} + +.oo-ui-buttonedElement-framed.oo-ui-iconedElement.oo-ui-labeledElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { + margin-right: 0.3em; + margin-left: -0.5em; +} + .oo-ui-buttonedElement-framed.oo-ui-flaggableElement-primary .oo-ui-buttonedElement-button { background: #cde7f4; background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #eaf4fa), color-stop(100%, #b0d9ee)); @@ -348,6 +370,10 @@ box-shadow: none; } +.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { + padding: 1.5em; +} + .oo-ui-bookletLayout-outlinePanel { border-right: solid 1px #ddd; } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 2edd3899bd..0dcadd45c2 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (0436296667) + * OOjs UI v0.1.0-pre (7b283a9dcc) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: Wed May 21 2014 13:17:11 GMT-0700 (PDT) + * Date: Tue May 27 2014 15:41:42 GMT-0700 (PDT) */ ( function ( OO ) { @@ -905,7 +905,7 @@ OO.ui.Frame.prototype.load = function () { this.loading = true; // Figure out directionality: - this.dir = this.$element.closest( '[dir]' ).prop( 'dir' ) || 'ltr'; + this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr'; // Initialize contents doc.open(); @@ -4928,6 +4928,7 @@ OO.ui.BarToolGroup.static.name = 'bar'; * @constructor * @param {OO.ui.Toolbar} toolbar * @param {Object} [config] Configuration options + * @cfg {string} [header] Text to display at the top of the pop-up */ OO.ui.PopupToolGroup = function OoUiPopupToolGroup( toolbar, config ) { // Configuration initialization @@ -4959,6 +4960,16 @@ OO.ui.PopupToolGroup = function OoUiPopupToolGroup( toolbar, config ) { this.$handle .addClass( 'oo-ui-popupToolGroup-handle' ) .append( this.$icon, this.$label, this.$indicator ); + // If the pop-up should have a header, add it to the top of the toolGroup. + // Note: If this feature is useful for other widgets, we could abstract it into an + // OO.ui.HeaderedElement mixin constructor. + if ( config.header !== undefined ) { + this.$group + .prepend( this.$( '' ) + .addClass( 'oo-ui-popupToolGroup-header' ) + .text( config.header ) + ); + } this.$element .addClass( 'oo-ui-popupToolGroup' ) .prepend( this.$handle ); diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 7de5a84dc3..34547cfd1e 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (0436296667) + * OOjs UI v0.1.0-pre (7b283a9dcc) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: Wed May 21 2014 13:17:11 GMT-0700 (PDT) + * Date: Tue May 27 2014 15:41:42 GMT-0700 (PDT) */ /* Textures */ @@ -67,15 +67,8 @@ height: 100%; } -.oo-ui-dialog-content .oo-ui-window-foot { - bottom: 0; - height: 4.8em; - padding: 1em; -} - .oo-ui-dialog-content .oo-ui-window-foot .oo-ui-buttonedElement-framed { float: left; - margin: 0.125em 0.25em; } .oo-ui-dialog-content .oo-ui-window-foot .oo-ui-flaggableElement-primary, @@ -236,8 +229,6 @@ .oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { display: inline-block; - padding: 0.2em 0.8em; - margin: 0.1em 0; text-align: center; vertical-align: top; } @@ -248,16 +239,6 @@ vertical-align: middle; } -.oo-ui-buttonedElement-framed.oo-ui-iconedElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { - margin-right: -0.5em; - margin-left: -0.5em; -} - -.oo-ui-buttonedElement-framed.oo-ui-iconedElement.oo-ui-labeledElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { - margin-right: 0.3em; - margin-left: -0.5em; -} - .oo-ui-buttonedElement-framed.oo-ui-widget-disabled .oo-ui-buttonedElement-button, .oo-ui-buttonedElement-framed.oo-ui-widget-disabled .oo-ui-buttonedElement-button.oo-ui-buttonedElement-active, .oo-ui-buttonedElement-framed.oo-ui-widget-disabled .oo-ui-buttonedElement-button.oo-ui-buttonedElement-pressed { @@ -276,7 +257,6 @@ .oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { width: 100%; - padding: 1.5em; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -549,6 +529,13 @@ line-height: 2.6em; } +.oo-ui-popupToolGroup-header { + margin: 0 0.6em; + font-size: 0.8em; + font-weight: bold; + line-height: 2.6em; +} + .oo-ui-popupToolGroup.oo-ui-widget-disabled .oo-ui-popupToolGroup-handle { cursor: default; } diff --git a/resources/lib/oojs-ui/themes/agora/images/icons/check.svg b/resources/lib/oojs-ui/themes/agora/images/icons/check.svg new file mode 100644 index 0000000000..6a91939f3a --- /dev/null +++ b/resources/lib/oojs-ui/themes/agora/images/icons/check.svg @@ -0,0 +1,8 @@ + + + + + + -- 2.20.1