[MediaWiki-commits] [Gerrit] Add block/inline icons - change (mediawiki...TemplateData)

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

Change subject: Add block/inline icons
..


Add block/inline icons

Change-Id: I7d07af249318e4f39d8e4a29d1fa3ccdd216e63b
---
M modules/ext.templateDataGenerator.ui.css
M modules/ext.templateDataGenerator.ui.tdDialog.js
A modules/images/block-ltr.svg
A modules/images/block-rtl.svg
A modules/images/inline.svg
5 files changed, 30 insertions(+), 1 deletion(-)

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



diff --git a/modules/ext.templateDataGenerator.ui.css 
b/modules/ext.templateDataGenerator.ui.css
index 32128c5..e54c842 100644
--- a/modules/ext.templateDataGenerator.ui.css
+++ b/modules/ext.templateDataGenerator.ui.css
@@ -79,3 +79,13 @@
/* @embed */
background-image: url(images/parameter-set-ltr.svg);
 }
+
+.oo-ui-icon-template-format-block {
+   /* @embed */
+   background-image: url(images/block-ltr.svg);
+}
+
+.oo-ui-icon-template-format-inline {
+   /* @embed */
+   background-image: url(images/inline.svg);
+}
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index ea24769..3833cbb 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -157,13 +157,14 @@
 
this.templateFormatSelectWidget = new OO.ui.ButtonSelectWidget();
this.templateFormatSelectWidget.addItems( [
-   // TODO: add nice icons?
new OO.ui.ButtonOptionWidget( {
data: 'inline',
+   icon: 'template-format-inline',
label: mw.msg( 'templatedata-modal-format-inline' )
} ),
new OO.ui.ButtonOptionWidget( {
data: 'block',
+   icon: 'template-format-block',
label: mw.msg( 'templatedata-modal-format-block' )
} )
] );
diff --git a/modules/images/block-ltr.svg b/modules/images/block-ltr.svg
new file mode 100644
index 000..ef37684
--- /dev/null
+++ b/modules/images/block-ltr.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git a/modules/images/block-rtl.svg b/modules/images/block-rtl.svg
new file mode 100644
index 000..ce7908c
--- /dev/null
+++ b/modules/images/block-rtl.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git a/modules/images/inline.svg b/modules/images/inline.svg
new file mode 100644
index 000..e6a59ec
--- /dev/null
+++ b/modules/images/inline.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d07af249318e4f39d8e4a29d1fa3ccdd216e63b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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] Add block/inline icons - change (mediawiki...TemplateData)

2015-10-02 Thread Esanders (Code Review)
Esanders has uploaded a new change for review.

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

Change subject: Add block/inline icons
..

Add block/inline icons

Change-Id: I7d07af249318e4f39d8e4a29d1fa3ccdd216e63b
---
M modules/ext.templateDataGenerator.ui.css
M modules/ext.templateDataGenerator.ui.tdDialog.js
A modules/images/block-ltr.svg
A modules/images/block-rtl.svg
A modules/images/inline.svg
5 files changed, 30 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/55/243155/1

diff --git a/modules/ext.templateDataGenerator.ui.css 
b/modules/ext.templateDataGenerator.ui.css
index 32128c5..e54c842 100644
--- a/modules/ext.templateDataGenerator.ui.css
+++ b/modules/ext.templateDataGenerator.ui.css
@@ -79,3 +79,13 @@
/* @embed */
background-image: url(images/parameter-set-ltr.svg);
 }
+
+.oo-ui-icon-template-format-block {
+   /* @embed */
+   background-image: url(images/block-ltr.svg);
+}
+
+.oo-ui-icon-template-format-inline {
+   /* @embed */
+   background-image: url(images/inline.svg);
+}
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index c66ecd0..dc8bf97 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -157,13 +157,14 @@
 
this.templateFormatSelectWidget = new OO.ui.ButtonSelectWidget();
this.templateFormatSelectWidget.addItems( [
-   // TODO: add nice icons?
new OO.ui.ButtonOptionWidget( {
data: 'inline',
+   icon: 'template-format-inline',
label: mw.msg( 'templatedata-modal-format-inline' )
} ),
new OO.ui.ButtonOptionWidget( {
data: 'block',
+   icon: 'template-format-block',
label: mw.msg( 'templatedata-modal-format-block' )
} )
] );
diff --git a/modules/images/block-ltr.svg b/modules/images/block-ltr.svg
new file mode 100644
index 000..ef37684
--- /dev/null
+++ b/modules/images/block-ltr.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git a/modules/images/block-rtl.svg b/modules/images/block-rtl.svg
new file mode 100644
index 000..ce7908c
--- /dev/null
+++ b/modules/images/block-rtl.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git a/modules/images/inline.svg b/modules/images/inline.svg
new file mode 100644
index 000..e6a59ec
--- /dev/null
+++ b/modules/images/inline.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d07af249318e4f39d8e4a29d1fa3ccdd216e63b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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