Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158998
Change subject: SpecialGlobalGroupPermissions: Use css columns instead of tables
......................................................................
SpecialGlobalGroupPermissions: Use css columns instead of tables
* Simplifies HTML a lot.
* Will automatically use one, two or three columns based on
available window space.
On narrow windows this will use one column instead of two very
tiny columns. On a full-width desktop window this will now
render three columns (e.g. 15" / 1440px display).
Change-Id: I57009bc9338351754008fed4c3d7635e5630bc04
---
M modules/ext.centralauth.globalgrouppermissions.css
M specials/SpecialGlobalGroupPermissions.php
2 files changed, 17 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/98/158998/1
diff --git a/modules/ext.centralauth.globalgrouppermissions.css
b/modules/ext.centralauth.globalgrouppermissions.css
index 1b21f5c..647e69d 100644
--- a/modules/ext.centralauth.globalgrouppermissions.css
+++ b/modules/ext.centralauth.globalgrouppermissions.css
@@ -1,3 +1,9 @@
-.mw-centralauth-editgroup-readonly .mw-centralauth-editgroup-unchecked {
- color: grey;
+.mw-centralauth-editgroup-readonly .mw-centralauth-editgroup-unchecked {
+ color: grey;
+}
+
+.mw-centralauth-rights {
+ -webkit-columns: 23em 3;
+ -moz-columns: 23em 3;
+ columns: 23em 3;
}
diff --git a/specials/SpecialGlobalGroupPermissions.php
b/specials/SpecialGlobalGroupPermissions.php
index d0825f3..f0dedcb 100644
--- a/specials/SpecialGlobalGroupPermissions.php
+++ b/specials/SpecialGlobalGroupPermissions.php
@@ -212,10 +212,8 @@
function buildCheckboxes( $group ) {
$editable = $this->userCanEdit( $this->getUser() );
- $rights = User::getAllRights();
$assignedRights = $this->getAssignedRights( $group );
- sort( $rights );
$checkboxes = array();
$attribs = array();
@@ -228,8 +226,11 @@
}
}
+ $rights = User::getAllRights();
+ sort( $rights );
+
foreach ( $rights as $right ) {
- # Build a checkbox.
+ // Build a checkbox
$checked = in_array( $right, $assignedRights );
$desc = $this->getOutput()->parseInline(
User::getRightDescription( $right ) ) . ' ' .
@@ -246,28 +247,15 @@
$count = count( $checkboxes );
- $firstCol = round( $count / 2 );
+ $html = Html::openElement( 'div', array( 'class' =>
'mw-centralauth-rights' ) )
+ . '<ul>';
- $checkboxes1 = array_slice( $checkboxes, 0, $firstCol );
- $checkboxes2 = array_slice( $checkboxes, $firstCol );
-
- $html = Xml::openElement( 'table' ) . Xml::openElement( 'tbody'
) .
- Xml::openElement( 'tr' ) . Xml::openElement( 'td' ) .
Xml::openElement( 'ul' );
-
- foreach ( $checkboxes1 as $cb ) {
+ foreach ( $checkboxes as $cb ) {
$html .= $cb;
}
- $html .= Xml::closeElement( 'ul' ) . Xml::closeElement( 'td' ) .
- Xml::openElement( 'td' ) . Xml::openElement( 'ul' );
-
- foreach ( $checkboxes2 as $cb ) {
- $html .= $cb;
- }
-
- $html .= Xml::closeElement( 'ul' ) . Xml::closeElement( 'td' ) .
- Xml::closeElement( 'tr' ) . Xml::closeElement( 'tbody'
) .
- Xml::closeElement( 'table' );
+ $html .= '</ul>'
+ . Html::closeElement( 'div' );
return $html;
}
--
To view, visit https://gerrit.wikimedia.org/r/158998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57009bc9338351754008fed4c3d7635e5630bc04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
