Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173274
Change subject: Integrate more-lang label and trigger
......................................................................
Integrate more-lang label and trigger
Change-Id: Ie4d1cb5bf89ac47bac141b0f5a83452cfa9a0783
---
M i18n/en.json
M resources/css/ext.uls.compactlinks.css
A resources/images/compact-links-trigger.svg
M resources/js/ext.uls.compactlinks.js
4 files changed, 25 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/74/173274/1
diff --git a/i18n/en.json b/i18n/en.json
index b88f8a1..dc6ed70 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -60,5 +60,5 @@
"ext-uls-input-disable-notification-info-personal": "You can enable the input
tools at any time from the language settings.",
"ext-uls-input-disable-notification-info-interlanguage": "You can enable the
input tools at any time from the language settings next to the language list.",
"ext-uls-language-settings-applying": "Applying...",
-"ext-uls-compact-link-count": "{{PLURAL:$1|One more language|$1 more
languages}}"
+"ext-uls-compact-link-count": "{{PLURAL:$1|One more|$1 more}}"
}
diff --git a/resources/css/ext.uls.compactlinks.css
b/resources/css/ext.uls.compactlinks.css
index 5676097..c05a2be 100644
--- a/resources/css/ext.uls.compactlinks.css
+++ b/resources/css/ext.uls.compactlinks.css
@@ -1,11 +1,3 @@
-#more-lang-label {
- color: #8b8989;
- display: block;
- font-size: 12px;
- line-height: 1.2;
- margin: 5px 0;
-}
-
#p-lang .body ul .uls-trigger,
#p-lang .pBody ul .uls-trigger {
background-image: none;
@@ -14,8 +6,13 @@
.mw-interlanguage-selector {
cursor: pointer;
- margin: 2px 0;
- padding: 0 8px;
+ padding: 4px 6px 4px 24px;
+ font-size: 12px;
+ font-weight: 400;
+ text-align: center;
+ background-image: url( ../images/compact-links-trigger.svg );
+ background-repeat: no-repeat;
+ background-position: 8% 8%;
}
.interlanguage-uls-menu:after,
diff --git a/resources/images/compact-links-trigger.svg
b/resources/images/compact-links-trigger.svg
new file mode 100644
index 0000000..87a67e3
--- /dev/null
+++ b/resources/images/compact-links-trigger.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
+ viewBox="0 0 612 792" enable-background="new 0 0 612 792"
xml:space="preserve">
+<g>
+ <path fill="#777777"
d="M291.3,439.4c-39.5-38.9-73.9-72.7-93.7-150.5H336v-58.6H197.6v-77.1h-59.3V231H0v58.7h138.3
+
c0,19.8,1.9,11.5,0,19.8C118.6,386.4,95,435.5,0,483.3L19.8,542c89.9-48.4,137.1-107.7,158.1-175.3c19.8,51,53.5,91.8,91.8,130
+ L291.3,439.4z"/>
+ <path fill="#777777"
d="M473.7,250h-79L256.3,638.9h59.3l39.5-116.7h158.1l39.5,116.7H612L473.7,250z
M374.9,464.2l59.3-155.5
+ l59.3,155.6L374.9,464.2L374.9,464.2z"/>
+</g>
+</svg>
diff --git a/resources/js/ext.uls.compactlinks.js
b/resources/js/ext.uls.compactlinks.js
index 20c44e9..201452f 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -287,20 +287,16 @@
* Add the trigger at the bottom of the language list
*/
addTrigger: function () {
- var $trigger, $triggerLabel;
+ var $trigger;
$trigger = $( '<button>' )
.addClass( 'mw-interlanguage-selector
mw-ui-button active' )
- .html( '…' ); // '…'
-
- $triggerLabel = $( '<label>' )
- .attr( 'id', 'more-lang-label' )
- .text( $.i18n(
+ .html( $.i18n(
'ext-uls-compact-link-count',
mw.language.convertNumber(
this.listSize - this.compactSize )
- ) );
+ ) );
- this.$interlanguageList.append( $trigger, $triggerLabel
);
+ this.$interlanguageList.append( $trigger );
this.$trigger = $trigger;
},
--
To view, visit https://gerrit.wikimedia.org/r/173274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4d1cb5bf89ac47bac141b0f5a83452cfa9a0783
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
