-
-
Notifications
You must be signed in to change notification settings - Fork 219
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add HtmlTable, refs 2387 #2409
Merged
Add HtmlTable, refs 2387 #2409
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| <?php | ||
|
|
||
| namespace SMW\Utils; | ||
|
|
||
| use Html; | ||
|
|
||
| /** | ||
| * @license GNU GPL v2+ | ||
| * @since 3.0 | ||
| * | ||
| * @author mwjames | ||
| */ | ||
| class HtmlTable { | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param string $html | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function table( $html = '', array $attributes = array() ) { | ||
| return self::open( $attributes ) . $html . self::close(); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function open( array $attributes = array() ) { | ||
| return Html::openElement( | ||
| 'div', | ||
| self::mergeAttributes( 'smw-table', $attributes ), | ||
| '' | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param string $html | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function header( $html = '', array $attributes = array() ) { | ||
| return Html::rawElement( | ||
| 'div', | ||
| self::mergeAttributes( 'smw-table-header', $attributes ), | ||
| $html | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param string $html | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function body( $html = '', array $attributes = array() ) { | ||
| return Html::rawElement( | ||
| 'div', | ||
| self::mergeAttributes( 'smw-table-body', $attributes ), | ||
| $html | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param string $html | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function footer( $html = '', array $attributes = array() ) { | ||
| return Html::rawElement( | ||
| 'div', | ||
| self::mergeAttributes( 'smw-table-footer', $attributes ), | ||
| $html | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param string $html | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function row( $html = '', array $attributes = array() ) { | ||
| return Html::rawElement( | ||
| 'div', | ||
| self::mergeAttributes( 'smw-table-row', $attributes ), | ||
| $html | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @param string $html | ||
| * @param array $attributes | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function cell( $html = '', array $attributes = array() ) { | ||
| return Html::rawElement( | ||
| 'div', | ||
| self::mergeAttributes( 'smw-table-cell', $attributes ), | ||
| $html | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @since 3.0 | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function close() { | ||
| return Html::closeElement( | ||
| 'div' | ||
| ); | ||
| } | ||
|
|
||
| private static function mergeAttributes( $class, $attributes ) { | ||
|
|
||
| if ( isset( $attributes['class'] ) ) { | ||
| $class .= ' ' . $attributes['class']; | ||
| unset( $attributes['class'] ); | ||
| } | ||
|
|
||
| $attributes['class'] = $class; | ||
|
|
||
| return $attributes; | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
such static
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, its better than having
spananddiv's being sprinkled all over the code. Nothing wrong on using statics where an instance isn't required.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Like this you cannot provide an alternative implementation though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clearly one of those cases where using static is not a total disaster, but still. Esp since you delegate to MediaWiki's Html... I'd be using an instance