jenkins-bot has submitted this change and it was merged.
Change subject: Flexiskin: Upload file button - solved issue with missing
tooltip and icon
......................................................................
Flexiskin: Upload file button - solved issue with missing tooltip and icon
Change-Id: I4af7e74a4fd95008a2c5596d2e7b85f9648811e1
---
M Flexiskin/extension.json
M Flexiskin/i18n/en.json
M Flexiskin/i18n/qqq.json
M Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
M Flexiskin/resources/bluespice.flexiskin.css
6 files changed, 15 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Mglaser: Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Flexiskin/extension.json b/Flexiskin/extension.json
index 2e747d3..6eb481f 100644
--- a/Flexiskin/extension.json
+++ b/Flexiskin/extension.json
@@ -94,7 +94,8 @@
"bs-flexiskin-error-templatenotexists",
"bs-flexiskin-usebackground",
"bs-flexiskin-labelcurrentbackground",
- "bs-extjs-upload"
+ "bs-extjs-upload",
+ "bs-flexiskin-button-upload-image-tooltip"
]
}
},
diff --git a/Flexiskin/i18n/en.json b/Flexiskin/i18n/en.json
index 2acb4cc..3cb9f31 100644
--- a/Flexiskin/i18n/en.json
+++ b/Flexiskin/i18n/en.json
@@ -66,5 +66,6 @@
"apihelp-bs-flexiskin-upload-description": "Allows to upload files to a
flexiskin",
"apihelp-bs-flexiskin-upload-store-description": "Lists uploaded files
of a flexiskin",
"action-flexiskin-viewspecialpage": "view specialpage \"Flexiskin\"",
- "flexiskin": "Skin preferences"
+ "flexiskin": "Skin preferences",
+ "bs-flexiskin-button-upload-image-tooltip": "Upload new image"
}
diff --git a/Flexiskin/i18n/qqq.json b/Flexiskin/i18n/qqq.json
index 326e2b3..3e837a3 100644
--- a/Flexiskin/i18n/qqq.json
+++ b/Flexiskin/i18n/qqq.json
@@ -69,5 +69,6 @@
"apihelp-bs-flexiskin-upload-description": "Describes an API endpoint
that is used to upload files to a flexiskin",
"apihelp-bs-flexiskin-upload-store-description": "Describes an API
endpoint that lists uploaded files of a flexiskin",
"action-flexiskin-viewspecialpage": "Part of error message when access
denied to view specialpage \"Flexiskin\"",
- "flexiskin": "Title for special page of extension \"Flexiskin\""
+ "flexiskin": "Title for special page of extension \"Flexiskin\"",
+ "bs-flexiskin-button-upload-image-tooltip": "Tooltip: upload button for
logo, background, ..."
}
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
b/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
index b890814..2908670 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
@@ -122,9 +122,9 @@
} );
this.buttonUploadBackground = Ext.create( 'Ext.Button', {
- tooltip: mw.message( 'bs-flexiskin-button-upload-file'
).plain(),
+ tooltip: mw.message(
'bs-flexiskin-button-upload-image-tooltip' ).plain(),
width: '20px',
- iconCls: 'icon-upload3',
+ iconCls: 'bs-icon-upload',
style: {
marginLeft: '10px',
color: 'white'
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
b/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
index 8aa27aa..2a4fa95 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
@@ -40,9 +40,9 @@
});
this.buttonUploadLogo = Ext.create( 'Ext.Button', {
- tooltip: mw.message( 'bs-flexiskin-button-upload-file'
).plain(),
+ tooltip: mw.message(
'bs-flexiskin-button-upload-image-tooltip' ).plain(),
width: '20px',
- iconCls: 'icon-upload3',
+ iconCls: 'bs-icon-upload',
style: {
marginLeft: '10px',
color: 'white'
diff --git a/Flexiskin/resources/bluespice.flexiskin.css
b/Flexiskin/resources/bluespice.flexiskin.css
index 1272cf5..c7303af 100644
--- a/Flexiskin/resources/bluespice.flexiskin.css
+++ b/Flexiskin/resources/bluespice.flexiskin.css
@@ -6,4 +6,9 @@
}
#bs-flexiskin-config-settings{
border-right: 1px solid black;
+}
+
+span.x-btn-icon-el.bs-icon-upload {
+ font-size: 12px;
+ text-align: left;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/319294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4af7e74a4fd95008a2c5596d2e7b85f9648811e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt <daniel.vo...@hallowelt.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
