Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/200842
Change subject: Quick popover menu when hovering the contributions link ...................................................................... Quick popover menu when hovering the contributions link Communicate that users can create new contributions (especially translations) in a quick way. When users hover the contributions link, show a popover with access to different contribution areas: - "User contributions" links to the contributions page - "Uploaded media" links to "My Uploads" from Commons. - "Translations" links to the Content Translation Dashboard The popover menu will be shown open initially right after the user enabled the content translation beta feature (to help announce where to translate from). Bug: T92938 Change-Id: I47ec9d602c1af918b26522f35d716f98ea3fe432 --- M ContentTranslation.hooks.php M ContentTranslation.php M Resources.php M i18n/en.json M i18n/qqq.json A modules/campaigns/styles/images/blue-beta.png A modules/campaigns/styles/images/blue-beta.svg A modules/campaigns/styles/images/translation.png A modules/campaigns/styles/images/translation.svg A modules/campaigns/styles/images/userAvatar.png A modules/campaigns/styles/images/userAvatar.svg A modules/campaigns/styles/images/wikimediaCommons.png A modules/campaigns/styles/images/wikimediaCommons.svg 13 files changed, 63 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/42/200842/1 diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php index 991bd46..ccb756f 100644 --- a/ContentTranslation.hooks.php +++ b/ContentTranslation.hooks.php @@ -63,6 +63,9 @@ $out->addModules( 'ext.cx.redlink' ); } + // Add a hover menu for contributions link in personal tool bar + $out->addModules( 'ext.cx.campaigns.contributionsmenu' ); + // The current guided tours are only for the user namespace, // so load the module only there. // In the future there may be guided tours in other namespaces, @@ -184,6 +187,19 @@ } /** + * Hook: User::UserSaveOptions + */ + public static function onSaveOptions( $user, &$saveOptions ) { + if ( $saveOptions['cx'] ) { + RequestContext::getMain()->getOutput()->addModules( + array( 'ext.cx.betafeature.init', 'ext.cx.campaigns.contributionsmenu' ) + ); + } + + return true; + } + + /** * Hook: ResourceLoaderTestModules */ public static function onResourceLoaderTestModules( array &$modules ) { diff --git a/ContentTranslation.php b/ContentTranslation.php index 72644ae..c39e77d 100644 --- a/ContentTranslation.php +++ b/ContentTranslation.php @@ -71,6 +71,7 @@ 'ContentTranslationHooks::addNewContributionButton'; $GLOBALS['wgHooks']['ListDefinedTags'][] = 'ContentTranslationHooks::registerTags'; $GLOBALS['wgHooks']['ChangeTagsListActive'][] = 'ContentTranslationHooks::registerTags'; +$GLOBALS['wgHooks']['UserSaveOptions'][] = 'ContentTranslationHooks::onSaveOptions'; $GLOBALS['wgHooks']['EditPage::showEditForm:initial'][] = 'ContentTranslationHooks::newArticleCampign'; $GLOBALS['wgHooks']['ResourceLoaderTestModules'][] = diff --git a/Resources.php b/Resources.php index 73df65c..cddb627 100644 --- a/Resources.php +++ b/Resources.php @@ -725,6 +725,32 @@ ) ) + $resourcePaths; +$wgResourceModules['ext.cx.betafeature.init'] = array( + 'scripts' => array( + 'campaigns/ext.cx.betafeature.init.js', + ), +) + $resourcePaths; + +$wgResourceModules['ext.cx.campaigns.contributionsmenu'] = array( + 'scripts' => array( + 'campaigns/ext.cx.campaigns.contributionsmenu.js', + ), + 'styles' => array( + 'campaigns/styles/ext.cx.campaigns.contributionsmenu.less', + ), + 'dependencies' => array( + 'mediawiki.ui.button', + 'jquery.client', + 'mediawiki.util', + 'ext.cx.widgets.callout', + ), + 'messages' => array( + 'cx-campaign-contributionsmenu-mycontributions', + 'cx-campaign-contributionsmenu-mytranslations', + 'cx-campaign-contributionsmenu-myuploads', + ) +) + $resourcePaths; + $wgResourceModules['ext.cx.widgets.overlay'] = array( 'scripts' => array( 'widgets/overlay/ext.cx.overlay.js', diff --git a/i18n/en.json b/i18n/en.json index aba65c9..e8923a6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -165,6 +165,9 @@ "cx-campaign-newarticle-notice": "Now you can also create new content by <b>translating</b>! Do you want to try the Content Translation beta tool?", "cx-campaign-no-thanks": "No, thanks", "cx-campaign-try": "Try Content Translation", + "cx-campaign-contributionsmenu-mycontributions": "Contributions", + "cx-campaign-contributionsmenu-mytranslations": "Translations", + "cx-campaign-contributionsmenu-myuploads": "Uploaded media", "cx-trend-all-translations": "All translations", "cx-trend-translations-to": "Translations to $1 language" } diff --git a/i18n/qqq.json b/i18n/qqq.json index a546ece..98d375c 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -172,6 +172,9 @@ "cx-campaign-newarticle-notice": "Text shown in the dialog inviting editors to try the Content Translation beta feature", "cx-campaign-no-thanks": "Button label to cancel Content Translation invite\n{{Identical|No thanks}}", "cx-campaign-try": "Button label to try Content Translation beta feature", + "cx-campaign-contributionsmenu-myuploads": "Menu item for menu shown while hovering the contributions link in personal toolbar. Points to the Special:MyUploads in commons", + "cx-campaign-contributionsmenu-mycontributions": "Menu item for menu shown while hovering the contributions link in personal toolbar. Points to [[Special:MyContributions]]", + "cx-campaign-contributionsmenu-mytranslations": "Menu item for menu shown while hovering the contributions link in personal toolbar. Points to the Content Translation dashboard", "cx-trend-all-translations": "Label shown in the legend section Content translation trends(graph visualization)", "cx-trend-translations-to": "Label shown in the legend section Content translation trends(graph visualization)\n$1 - language name" } diff --git a/modules/campaigns/styles/images/blue-beta.png b/modules/campaigns/styles/images/blue-beta.png new file mode 100644 index 0000000..9754a8c --- /dev/null +++ b/modules/campaigns/styles/images/blue-beta.png Binary files differ diff --git a/modules/campaigns/styles/images/blue-beta.svg b/modules/campaigns/styles/images/blue-beta.svg new file mode 100644 index 0000000..86a5790 --- /dev/null +++ b/modules/campaigns/styles/images/blue-beta.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 792" enable-background="new 0 0 612 792"> + <path fill="#3F9EFF" d="M306 192c-112.2 0-204 91.8-204 204s91.8 204 204 204 204-91.8 204-204-91.8-204-204-204zm102 306l-76.5-51-25.5 102-25.5-102-76.5 51 51-76.5-102-25.5 102-25.5-51-76.5 76.5 51 25.5-102 25.5 102 76.5-51-51 76.5 102 25.5-102 25.5 51 76.5z" /> +</svg> diff --git a/modules/campaigns/styles/images/translation.png b/modules/campaigns/styles/images/translation.png new file mode 100644 index 0000000..c6a7642 --- /dev/null +++ b/modules/campaigns/styles/images/translation.png Binary files differ diff --git a/modules/campaigns/styles/images/translation.svg b/modules/campaigns/styles/images/translation.svg new file mode 100644 index 0000000..fc4384e --- /dev/null +++ b/modules/campaigns/styles/images/translation.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" enable-background="new 0 0 24 24"><path d="M11.1 13.1c-1.8-2.1-2.7-4.3-3-5.1h4.7l.7-2h-5.5v-3h-2v3h-5v2h5c-.2.9-1.3 4.8-5.1 7.6l1.2 1.6c2.7-2 4.3-4.5 5.1-6.4.7 1.3 1.7 3 3.2 4.5l.7-2.2zM12.5 20l1.3-4h5.3l1.3 4h2.2l-4.6-14h-3l-4.7 14h2.2zm4-12l2 6h-4l2-6z"/></svg> \ No newline at end of file diff --git a/modules/campaigns/styles/images/userAvatar.png b/modules/campaigns/styles/images/userAvatar.png new file mode 100644 index 0000000..bcbdd2c --- /dev/null +++ b/modules/campaigns/styles/images/userAvatar.png Binary files differ diff --git a/modules/campaigns/styles/images/userAvatar.svg b/modules/campaigns/styles/images/userAvatar.svg new file mode 100644 index 0000000..123601e --- /dev/null +++ b/modules/campaigns/styles/images/userAvatar.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" enable-background="new 0 0 24 24"> + <path d="M19.5 18.5c-1.2-.4-4-1.5-4-1.5-.9-.3-.9-1.1-1-2v-.1c1.4-1.2 2.5-3.2 2.5-5.4 0-4.7-2-6.5-5-6.5-2.1 0-5 1.2-5 6.5 0 2.1 1.1 4.1 2.5 5.4v.1c0 .9-.1 1.7-1 2 0 0-2.9 1.1-4 1.5-1.3.4-2.5 1-2.5 2.5v1h20v-1c0-1.2-.8-2-2.5-2.5z" /> +</svg> diff --git a/modules/campaigns/styles/images/wikimediaCommons.png b/modules/campaigns/styles/images/wikimediaCommons.png new file mode 100644 index 0000000..edbe04a --- /dev/null +++ b/modules/campaigns/styles/images/wikimediaCommons.png Binary files differ diff --git a/modules/campaigns/styles/images/wikimediaCommons.svg b/modules/campaigns/styles/images/wikimediaCommons.svg new file mode 100644 index 0000000..fd50836 --- /dev/null +++ b/modules/campaigns/styles/images/wikimediaCommons.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" ?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" enable-background="new 0 0 24 24"> + <path d="M15.4 7.8c-2-.9-2.3-2.5-2.4-2.8.1.1 2 1 2 1l-3-5-3 5 2-1s0 .8.6 2.1c.8 1.5 2.2 2.2 2.2 2.2s1.6.7 2.2 1.3l-.7.7-.5-.5-.4 1.8 1.8-.4-.5-.5.7-.7c.9 1 1.5 2.3 1.6 3.8h-1v-.8l-1.5 1 1.5 1v-.8h1c-.1 1.5-.6 2.8-1.6 3.8l-.7-.7.5-.5-1.8-.4.4 1.8.5-.5.7.7c-1 .9-2.3 1.5-3.8 1.6v-1h.8l-1-1.5-1 1.5h.8v1c-1.5-.1-2.8-.6-3.8-1.6l.7-.7.5.5.4-1.8-1.8.4.5.5-.7.7c-.9-1-1.5-2.3-1.6-3.8h1v.8l1.5-1-1.5-1v.8h-1c.1-1.5.6-2.8 1.6-3.8l.7.7-.5.5 1.8.4-.4-1.8-.5.5-.7-.7-1.5-1.4c-1.5 1.4-2.5 3.5-2.5 5.8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-3.2-1.9-5.9-4.6-7.2z" /> + <circle cx="12" cy="15" r="3" /> +</svg> -- To view, visit https://gerrit.wikimedia.org/r/200842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47ec9d602c1af918b26522f35d716f98ea3fe432 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits