Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197007
Change subject: Use the callout widget for 'new article from translation'
campaign
......................................................................
Use the callout widget for 'new article from translation' campaign
Change-Id: Id659fe186cf26ae95c9366da4a87287b2a78837c
---
M Resources.php
M modules/campaigns/ext.cx.campaigns.newarticle.js
M modules/campaigns/styles/ext.cx.campaigns.newarticle.less
3 files changed, 13 insertions(+), 59 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/07/197007/1
diff --git a/Resources.php b/Resources.php
index 278c562..6101509 100644
--- a/Resources.php
+++ b/Resources.php
@@ -690,6 +690,7 @@
'jquery.client',
'mediawiki.util',
'jquery.throttle-debounce',
+ 'ext.cx.widgets.callout',
),
'messages' => array(
'cx-campaign-newarticle-notice',
diff --git a/modules/campaigns/ext.cx.campaigns.newarticle.js
b/modules/campaigns/ext.cx.campaigns.newarticle.js
index 78c1862..af94ac3 100644
--- a/modules/campaigns/ext.cx.campaigns.newarticle.js
+++ b/modules/campaigns/ext.cx.campaigns.newarticle.js
@@ -8,11 +8,12 @@
( function ( $, mw ) {
'use strict';
- function showInvitation() {
- var $base, $banner, campaign, cxLink, $cancel, $tryCX;
+ var campaign = 'newarticle';
- campaign = 'newarticle';
- $base = $( '#pt-betafeatures' );
+ function showInvitation() {
+ var $banner, $trigger, cxLink, $cancel, $tryCX;
+
+ $trigger = $( '#pt-betafeatures' );
cxLink = mw.util.getUrl( 'Special:ContentTranslation', {
campaign: campaign,
targettitle: mw.config.get( 'wgPageName' ),
@@ -26,30 +27,21 @@
$banner = $( '<div>' )
.addClass( 'cx-campaign-newarticle' )
.append(
- $( '<div>' ).addClass(
'cx-campaign-newarticle__caret' ),
$( '<div>' ).addClass(
'cx-campaign-newarticle__logo' ),
$( '<div>' ).addClass(
'cx-campaign-newarticle__message' ).html(
mw.message(
'cx-campaign-newarticle-notice' ).parse()
),
$( '<div>' ).addClass(
'cx-campaign-newarticle__actions' ).append( $cancel, $tryCX )
- )
- .hide();
- $( 'body' ).append( $banner );
+ );
- function position() {
- // Animation complete. Otherwise the position
calculation is wrong
- $banner.css( {
- left: $base.offset().left - 350
- } )
- .find( '.cx-campaign-newarticle__caret' ).css( {
- left: $base.offset().left -
$banner.offset().left
- } );
- }
+ $trigger.callout( {
+ trigger: 'auto',
+ gravity: $.fn.callout.autoNEW,
+ content: $banner
+ } );
- $banner.show( 'fast', position );
- $( window ).resize( $.debounce( 250, position ) );
$cancel.on( 'click', function () {
- $banner.remove();
+ $trigger.callout( 'hide' );
$.cookie(
'cx_campaign_' + campaign + '_hide', 1, {
expires: 30,
diff --git a/modules/campaigns/styles/ext.cx.campaigns.newarticle.less
b/modules/campaigns/styles/ext.cx.campaigns.newarticle.less
index 4b34b73..e559fc1 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.newarticle.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.newarticle.less
@@ -1,47 +1,8 @@
-@import "../../base/styles/grid/agora-grid";
@import "mediawiki.mixins";
.cx-campaign-newarticle {
- .mw-ui-grid;
- .mw-ui-one-third;
color: #333;
- position: absolute;
- overflow: visible;
- top: 50px;
- min-width: 400px;
- padding: 20px;
background: white;
- border: 1px solid #ccc;
- border-bottom-width: 3px;
- border-radius: 3px;
- box-shadow: 0 5px 10px rgba(0,0,0,0.2);
- max-width: 500px;
-
- &__caret {
- position: absolute;
- top: 0;
- }
-
- &__caret::after {
- border-bottom: 12px solid white;
- border-left: 12px solid transparent;
- border-right: 12px solid transparent;
- content: "";
- display: inline-block;
- position: absolute;
- top: -12px;
- margin-left: 1px;
- }
-
- &__caret::before {
- border-bottom: 13px solid #888;
- border-left: 13px solid transparent;
- border-right: 13px solid transparent;
- content: "";
- display: inline-block;
- position: absolute;
- top: -13px;
- }
&__logo {
.background-image('images/cx-announcement-icon.gif');
--
To view, visit https://gerrit.wikimedia.org/r/197007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id659fe186cf26ae95c9366da4a87287b2a78837c
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
