Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338510 )
Change subject: CreateHubFeature layout improvements
......................................................................
CreateHubFeature layout improvements
Bug: T158279
Change-Id: I8ba6fa82858be97feea2496e50aa30111bde5021
---
M extension.json
M includes/SpecialCreateHubFeature.php
A modules/ext.CollaborationKit.createhubfeature.styles.less
M modules/ext.CollaborationKit.edit.styles.less
M modules/ext.CollaborationKit.iconbrowser.js
5 files changed, 54 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/10/338510/1
diff --git a/extension.json b/extension.json
index 338b1b0..8ecab6f 100644
--- a/extension.json
+++ b/extension.json
@@ -95,6 +95,9 @@
"ext.CollaborationKit.edit.styles": {
"styles": "ext.CollaborationKit.edit.styles.less"
},
+ "ext.CollaborationKit.createhubfeature.styles": {
+ "styles":
"ext.CollaborationKit.createhubfeature.styles.less"
+ },
"ext.CollaborationKit.iconbrowser": {
"scripts": "ext.CollaborationKit.iconbrowser.js",
"dependencies": [
diff --git a/includes/SpecialCreateHubFeature.php
b/includes/SpecialCreateHubFeature.php
index 6350327..8fb1071 100644
--- a/includes/SpecialCreateHubFeature.php
+++ b/includes/SpecialCreateHubFeature.php
@@ -19,7 +19,10 @@
public function execute( $par ) {
$output = $this->getContext()->getOutput();
$output->addModules( 'ext.CollaborationKit.iconbrowser' );
- $output->addModuleStyles( 'ext.CollaborationKit.edit.styles' );
+ $output->addModuleStyles( [
+ 'ext.CollaborationKit.edit.styles',
+ 'ext.CollaborationKit.createhubfeature.styles'
+ ] );
$output->addJsConfigVars( 'wgCollaborationKitIconList',
CollaborationKitImage::getCannedIcons() );
parent::execute( $par );
}
@@ -48,7 +51,7 @@
$fields = [
'collaborationhub' => [
'type' => 'title',
- 'cssclass' => 'mw-ck-title-input',
+ 'cssclass' => 'mw-ck-fulltitle-input',
'label-message' =>
'collaborationkit-createhubfeature-collaborationhub',
'default' => $defaultCollabHub
],
diff --git a/modules/ext.CollaborationKit.createhubfeature.styles.less
b/modules/ext.CollaborationKit.createhubfeature.styles.less
new file mode 100644
index 0000000..1167622
--- /dev/null
+++ b/modules/ext.CollaborationKit.createhubfeature.styles.less
@@ -0,0 +1,26 @@
+@import "ext.CollaborationKit.mixins.less";
+
+fieldset {
+ max-width: 50em;
+}
+
+.oo-ui-fieldsetLayout-group {
+ display: inline-table;
+ width: 75%;
+}
+
+.mw-htmlform-field-HTMLComboboxField.mw-ck-icon-input {
+ float:right;
+ display: inline-table;
+ width: 15%;
+ margin-top: 0 !important;
+}
+
+.iconPreview {
+ margin:0 auto;
+ display: block;
+}
+
+.mw-ck-icon-input .oo-ui-buttonElement {
+ margin-top: 0.85em;
+}
diff --git a/modules/ext.CollaborationKit.edit.styles.less
b/modules/ext.CollaborationKit.edit.styles.less
index c38e522..9ca5cff 100644
--- a/modules/ext.CollaborationKit.edit.styles.less
+++ b/modules/ext.CollaborationKit.edit.styles.less
@@ -13,6 +13,7 @@
label .oo-ui-labelElement-label {
font-weight: bold;
}
+ .mw-ck-fulltitle-input,
.mw-ck-title-input,
.mw-ck-display-input,
.mw-ck-icon-input,
diff --git a/modules/ext.CollaborationKit.iconbrowser.js
b/modules/ext.CollaborationKit.iconbrowser.js
index 779b7eb..b8fb8c3 100644
--- a/modules/ext.CollaborationKit.iconbrowser.js
+++ b/modules/ext.CollaborationKit.iconbrowser.js
@@ -1,11 +1,12 @@
( function ( $, mw, OO ) {
+ var ProcessDialog, openItUp, setupPage;
/**
* Subclass ProcessDialog.
*
* @param {Object} config
*/
- function ProcessDialog( config ) {
+ ProcessDialog = function ( config ) {
ProcessDialog.super.call( this, config );
}
OO.inheritClass( ProcessDialog, OO.ui.ProcessDialog );
@@ -64,7 +65,7 @@
*
*/
ProcessDialog.prototype.getActionProcess = function ( action ) {
- var dialog, toAppend, openItUp, windowManager, processDialog,
iconBrowserButton;
+ var dialog, toAppend;
dialog = this;
if ( action ) {
@@ -99,6 +100,7 @@
* Create and append the window manager
*/
openItUp = function () {
+ var processDialog;
windowManager = new OO.ui.WindowManager();
$( 'body' ).append( windowManager.$element );
@@ -114,13 +116,21 @@
windowManager.openWindow( processDialog );
};
- iconBrowserButton = new OO.ui.ButtonWidget();
- iconBrowserButton.setLabel( mw.msg(
'collaborationkit-icon-launchbutton' ) );
- iconBrowserButton.on( 'click', openItUp );
+ setupPage = function() {
+ var iconBrowserButton, windowManager;
+ iconBrowserButton = new OO.ui.ButtonWidget();
+ iconBrowserButton.setLabel( mw.msg(
'collaborationkit-icon-launchbutton' ) );
+ iconBrowserButton.on( 'click', openItUp );
- $( 'div.mw-ck-icon-input .oo-ui-comboBoxInputWidget' ).css( 'display',
'none' );
- $( 'div.mw-ck-icon-input' )
- .append( '<div class="iconPreview
mw-ck-icon-circlestar"></div>' )
- .append( iconBrowserButton.$element );
+ $( '.mw-ck-icon-input.oo-ui-comboBoxInputWidget' ).css(
'display', 'none' );
+ $( 'div.mw-ck-icon-input' )
+ .append( '<div class="iconPreview
mw-ck-icon-circlestar"></div>' )
+ .append( iconBrowserButton.$element );
+
+ $( 'fieldset' )
+ .append( $(
'.mw-htmlform-field-HTMLComboboxField.mw-ck-icon-input' ) );
+ }
+
+ $( setupPage );
} )( jQuery, mediaWiki, OO );
--
To view, visit https://gerrit.wikimedia.org/r/338510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ba6fa82858be97feea2496e50aa30111bde5021
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
