[MediaWiki-commits] [Gerrit] User education popup for citations - change (mediawiki...Citoid)

2015-10-18 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: User education popup for citations
..


User education popup for citations

Bug: T108620
Change-Id: I68b077528b36c25b7ebf59bbdae21a8a8c1bc42a
---
M extension.json
A modules/ve.ui.CiteFromIdInspectorTool.css
M modules/ve.ui.CiteFromIdInspectorTool.js
3 files changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 86c6de7..f6789df 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,7 @@
],
"styles": [
"modules/ve.ui.CiteSourceSelectWidget.css",
+   "modules/ve.ui.CiteFromIdInspectorTool.css",
"modules/ve.ui.CiteFromIdInspector.css"
],
"dependencies": [
diff --git a/modules/ve.ui.CiteFromIdInspectorTool.css 
b/modules/ve.ui.CiteFromIdInspectorTool.css
new file mode 100644
index 000..b7cc722
--- /dev/null
+++ b/modules/ve.ui.CiteFromIdInspectorTool.css
@@ -0,0 +1,8 @@
+/*!
+ * VisualEditor UserInterface CiteFromIdInspectorTool styles.
+ */
+
+.oo-ui-tool-name-citefromid .oo-ui-popupWidget-body 
.ve-ui-educationPopup-header {
+   background: 
url(../../VisualEditor/modules/ve-mw/ui/styles/tools/images/reference-ltr.png) 
no-repeat center/90%;
+   height: 150px;
+}
diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js 
b/modules/ve.ui.CiteFromIdInspectorTool.js
index 10306f7..c9491e8 100644
--- a/modules/ve.ui.CiteFromIdInspectorTool.js
+++ b/modules/ve.ui.CiteFromIdInspectorTool.js
@@ -57,9 +57,14 @@
 */
ve.ui.CiteFromIdInspectorTool = function VeUiCiteFromIdInspectorTool() {
ve.ui.CiteFromIdInspectorTool.super.apply( this, arguments );
+   ve.ui.MWEducationPopupTool.call( this, {
+   title: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-title' ),
+   text: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-text' )
+   } );
};
 
OO.inheritClass( ve.ui.CiteFromIdInspectorTool, ve.ui.InspectorTool );
+   OO.mixinClass( ve.ui.CiteFromIdInspectorTool, 
ve.ui.MWEducationPopupTool );
 
ve.ui.CiteFromIdInspectorTool.static.name = 'citefromid';
ve.ui.CiteFromIdInspectorTool.static.autoAddToCatchall = false;

-- 
To view, visit https://gerrit.wikimedia.org/r/246428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I68b077528b36c25b7ebf59bbdae21a8a8c1bc42a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] User education popup for citations - change (mediawiki...Citoid)

2015-10-14 Thread Alex Monk (Code Review)
Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/246428

Change subject: User education popup for citations
..

User education popup for citations

Bug: T108620
Change-Id: I68b077528b36c25b7ebf59bbdae21a8a8c1bc42a
---
M extension.json
A modules/ve.ui.CiteFromIdInspectorTool.css
M modules/ve.ui.CiteFromIdInspectorTool.js
3 files changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/28/246428/1

diff --git a/extension.json b/extension.json
index 86c6de7..f6789df 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,7 @@
],
"styles": [
"modules/ve.ui.CiteSourceSelectWidget.css",
+   "modules/ve.ui.CiteFromIdInspectorTool.css",
"modules/ve.ui.CiteFromIdInspector.css"
],
"dependencies": [
diff --git a/modules/ve.ui.CiteFromIdInspectorTool.css 
b/modules/ve.ui.CiteFromIdInspectorTool.css
new file mode 100644
index 000..f3fee17
--- /dev/null
+++ b/modules/ve.ui.CiteFromIdInspectorTool.css
@@ -0,0 +1,8 @@
+/*!
+ * VisualEditor UserInterface CiteFromIdInspectorTool styles.
+ */
+
+.oo-ui-tool-name-citefromid .oo-ui-popupWidget-body 
.ve-ui-educationpopup-header {
+   background: 
url(../../VisualEditor/modules/ve-mw/ui/styles/tools/images/reference-ltr.png) 
no-repeat center/90%;
+   height: 150px;
+}
diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js 
b/modules/ve.ui.CiteFromIdInspectorTool.js
index 15e6ba3..c5bb191 100644
--- a/modules/ve.ui.CiteFromIdInspectorTool.js
+++ b/modules/ve.ui.CiteFromIdInspectorTool.js
@@ -56,9 +56,15 @@
 */
ve.ui.CiteFromIdInspectorTool = function VeUiCiteFromIdInspectorTool( 
toolGroup, config ) {
ve.ui.InspectorTool.call( this, toolGroup, config );
+   ve.ui.MWEducationPopupTool.call( this, {
+   title: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-title' ),
+   text: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-text' )
+   } );
+
};
 
OO.inheritClass( ve.ui.CiteFromIdInspectorTool, ve.ui.InspectorTool );
+   OO.mixinClass( ve.ui.CiteFromIdInspectorTool, 
ve.ui.MWEducationPopupTool );
 
ve.ui.CiteFromIdInspectorTool.static.name = 'citefromid';
ve.ui.CiteFromIdInspectorTool.static.autoAddToCatchall = false;

-- 
To view, visit https://gerrit.wikimedia.org/r/246428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68b077528b36c25b7ebf59bbdae21a8a8c1bc42a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits