[MediaWiki-commits] [Gerrit] Make legend easier to read - change (mediawiki...Interwiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Make legend easier to read
..
Make legend easier to read
Moves the legend table into a system message for easier editing, and reformats
the overall layout as well as changing some of the individual explanations.
Change-Id: I744dce4bbfb9d8623fc4df83def3860626482330
---
M Interwiki.css
M Interwiki_body.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 10 insertions(+), 43 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Interwiki.css b/Interwiki.css
index e4f9299..065a6dc 100755
--- a/Interwiki.css
+++ b/Interwiki.css
@@ -41,7 +41,7 @@
}
.mw-special-Interwiki .mw-collapsible-toggle {
- float: left;
+ float: none;
}
.mw-collapsible-content {
diff --git a/Interwiki_body.php b/Interwiki_body.php
index 75dcf6d..555cec3 100755
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -306,24 +306,11 @@
'data-collapsetext' = $this-msg(
'interwiki-legend-hide' )-escaped(),
'data-expandtext' =
$this-msg('interwiki-legend-show' )-escaped()
) ) );
- $this-getOutput()-addHTML(
- Html::rawElement(
- 'table', array( 'class' = 'mw-interwikitable
wikitable intro' ),
- $this-addInfoRow( 'start', 'interwiki_prefix',
'interwiki_prefix_intro' ) . \n .
- $this-addInfoRow( 'start', 'interwiki_url',
'interwiki_url_intro' ) . \n .
- $this-addInfoRow( 'start', 'interwiki_local',
'interwiki_local_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_0',
'interwiki_local_0_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_1',
'interwiki_local_1_intro' ) . \n .
- $this-addInfoRow( 'start', 'interwiki_trans',
'interwiki_trans_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_0',
'interwiki_trans_0_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_1',
'interwiki_trans_1_intro' ) . \n
- )
- );
-
+ $this-getOutput()-addWikiMsg( 'interwiki_legend' );
$this-getOutput()-addHTML( Html::closeElement( 'div' ) ); //
end collapsible.
if ( $canModify ) {
- $this-getOutput()-addHTML( br / . $this-msg(
'interwiki_intro_footer' )-parse() );
+ $this-getOutput()-addWikiMsg(
'interwiki_intro_footer' );
$addtext = $this-msg( 'interwiki_addtext' )-escaped();
$addlink = Linker::linkKnown( $this-getPageTitle(
'add' ), $addtext );
$this-getOutput()-addHTML( 'p
class=mw-interwiki-addlink' . $addlink . '/p' );
@@ -411,26 +398,6 @@
$out .= Html::closeElement( 'table' );
$this-getOutput()-addHTML( $out );
- }
-
- /**
-* Adds a row to the documentation table on the top of
Special:Interwiki.
-* @param $align string
-* @param $title string
-* @param $text string
-* @return string
-*/
- private function addInfoRow( $align = 'start', $title, $text ) {
- return Html::rawElement( 'tr', null,
- // The classes mw-align-start and mw-align-end are used
here.
- Html::rawElement(
- 'th',
- array( 'class' = 'mw-align-' . $align ),
- $this-msg( $title )-escaped()
- ) .
- // This message is expected to have wiki syntax
- Html::rawElement( 'td', null, $this-msg( $text
)-parse() )
- );
}
function error() {
diff --git a/i18n/en.json b/i18n/en.json
old mode 100644
new mode 100755
index d9d9cb8..7ef1225
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,22 +12,21 @@
interwiki_intro: This is an overview of the interwiki table.,
interwiki-legend-show: Show legend,
interwiki-legend-hide: Hide legend,
+interwiki_legend: {|
class=\wikitable\\n|-\n!{{int:interwiki_prefix}}\n|colspan=2|{{int:interwiki_prefix_intro}}\n|-\n!{{int:interwiki_url}}\n|colspan=2|{{int:interwiki_url_intro}}\n|-\n!rowspan=2|{{int:interwiki_local}}\n!{{int:interwiki_1}}\n|{{int:interwiki_local_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_local_0_intro}}\n|-\n!rowspan=2|Transclude\n!{{int:interwiki_1}}\n|{{int:interwiki_trans_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_trans_0_intro}}\n|-\n|},
interwiki_prefix: Prefix,
[MediaWiki-commits] [Gerrit] Make legend easier to read - change (mediawiki...Interwiki)
Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155696
Change subject: Make legend easier to read
..
Make legend easier to read
Moves the legend table into a system message for easier editing, and reformats
the overall layout as well as changing some of the individual explanations.
Change-Id: I744dce4bbfb9d8623fc4df83def3860626482330
---
M Interwiki.css
M Interwiki_body.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 10 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Interwiki
refs/changes/96/155696/1
diff --git a/Interwiki.css b/Interwiki.css
index e4f9299..065a6dc 100755
--- a/Interwiki.css
+++ b/Interwiki.css
@@ -41,7 +41,7 @@
}
.mw-special-Interwiki .mw-collapsible-toggle {
- float: left;
+ float: none;
}
.mw-collapsible-content {
diff --git a/Interwiki_body.php b/Interwiki_body.php
index 75dcf6d..1a98635 100755
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -306,24 +306,11 @@
'data-collapsetext' = $this-msg(
'interwiki-legend-hide' )-escaped(),
'data-expandtext' =
$this-msg('interwiki-legend-show' )-escaped()
) ) );
- $this-getOutput()-addHTML(
- Html::rawElement(
- 'table', array( 'class' = 'mw-interwikitable
wikitable intro' ),
- $this-addInfoRow( 'start', 'interwiki_prefix',
'interwiki_prefix_intro' ) . \n .
- $this-addInfoRow( 'start', 'interwiki_url',
'interwiki_url_intro' ) . \n .
- $this-addInfoRow( 'start', 'interwiki_local',
'interwiki_local_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_0',
'interwiki_local_0_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_1',
'interwiki_local_1_intro' ) . \n .
- $this-addInfoRow( 'start', 'interwiki_trans',
'interwiki_trans_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_0',
'interwiki_trans_0_intro' ) . \n .
- $this-addInfoRow( 'end', 'interwiki_1',
'interwiki_trans_1_intro' ) . \n
- )
- );
-
+ $this-getOutput()-addWikiMsg( 'interwiki_legend' );
$this-getOutput()-addHTML( Html::closeElement( 'div' ) ); //
end collapsible.
if ( $canModify ) {
- $this-getOutput()-addHTML( br / . $this-msg(
'interwiki_intro_footer' )-parse() );
+ $this-getOutput()-addWikiMsg(
'interwiki_intro_footer' );
$addtext = $this-msg( 'interwiki_addtext' )-escaped();
$addlink = Linker::linkKnown( $this-getPageTitle(
'add' ), $addtext );
$this-getOutput()-addHTML( 'p
class=mw-interwiki-addlink' . $addlink . '/p' );
diff --git a/i18n/en.json b/i18n/en.json
old mode 100644
new mode 100755
index d9d9cb8..7ef1225
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,22 +12,21 @@
interwiki_intro: This is an overview of the interwiki table.,
interwiki-legend-show: Show legend,
interwiki-legend-hide: Hide legend,
+interwiki_legend: {|
class=\wikitable\\n|-\n!{{int:interwiki_prefix}}\n|colspan=2|{{int:interwiki_prefix_intro}}\n|-\n!{{int:interwiki_url}}\n|colspan=2|{{int:interwiki_url_intro}}\n|-\n!rowspan=2|{{int:interwiki_local}}\n!{{int:interwiki_1}}\n|{{int:interwiki_local_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_local_0_intro}}\n|-\n!rowspan=2|Transclude\n!{{int:interwiki_1}}\n|{{int:interwiki_trans_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_trans_0_intro}}\n|-\n|},
interwiki_prefix: Prefix,
interwiki-prefix-label: Prefix:,
interwiki_prefix_intro: Interwiki prefix to be used in code[nowiki
/[prefix:empagename/em]]/code wikitext syntax.,
interwiki_url: URL,
interwiki-url-label: URL:,
-interwiki_url_intro: Template for URLs. The placeholder $1 will be
replaced by the empagename/em of the wikitext, when the abovementioned
wikitext syntax is used.,
+interwiki_url_intro: Template for URLs. The placeholder $1 will be
replaced by the empagename/em in code[nowiki
/[prefix:empagename/em]]/code.,
interwiki_local: Forward,
interwiki-local-label: Forward:,
-interwiki_local_intro: An HTTP request to the local wiki with this
interwiki prefix in the URL is:,
-interwiki_local_0_intro: not honored, a \{{int:badtitle}}\ error page
will be displayed instead.,
-interwiki_local_1_intro: redirected to the target URL given in the
interwiki link definitions (i.e. treated like links to local pages).,
+interwiki_local_0_intro: External HTTP requests to the local wiki using
this interwiki prefix in the URL
