https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109648
Revision: 109648
Author: gregchiasson
Date: 2012-01-20 21:23:25 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
AFT5 feedback page - bugfix for where I had an inconsistent (ie, broken) filter
name (including fixing the translations), and re-work the header HTML per
designers.
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-01-20 21:05:46 UTC (rev 109647)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-01-20 21:23:25 UTC (rev 109648)
@@ -60,7 +60,7 @@
'articlefeedbackv5-special-sort-asc' => '^',
'articlefeedbackv5-special-sort-desc' => 'v',
'articlefeedbackv5-special-sort-age' => 'Date',
- 'articlefeedbackv5-special-sort-helpfulness' => 'Helpful',
+ 'articlefeedbackv5-special-sort-helpful' => 'Helpful',
'articlefeedbackv5-special-sort-rating' => 'Rating',
'articlefeedbackv5-special-sort-label-before' => 'Sort by:',
'articlefeedbackv5-special-sort-label-after' => '',
@@ -2118,7 +2118,7 @@
'articlefeedbackv5-special-filter-visible' => 'Sichtbar ($1)',
'articlefeedbackv5-special-filter-invisible' => 'Versteckt ($1)',
'articlefeedbackv5-special-sort-age' => 'Datum',
- 'articlefeedbackv5-special-sort-helpfulness' => 'Hilfreich',
+ 'articlefeedbackv5-special-sort-helpful' => 'Hilfreich',
'articlefeedbackv5-special-sort-rating' => 'Bewertung',
'articlefeedbackv5-special-sort-label-before' => 'Sortieren nach:',
'articlefeedbackv5-special-filter-label-before' => 'Nur anzeigen:',
@@ -4277,7 +4277,7 @@
'articlefeedbackv5-special-filter-visible' => 'Visible ($1)',
'articlefeedbackv5-special-filter-invisible' => 'Agochado ($1)',
'articlefeedbackv5-special-sort-age' => 'Data',
- 'articlefeedbackv5-special-sort-helpfulness' => 'Útil',
+ 'articlefeedbackv5-special-sort-helpful' => 'Útil',
'articlefeedbackv5-special-sort-rating' => 'Valoración',
'articlefeedbackv5-special-sort-label-before' => 'Ordenar por:',
'articlefeedbackv5-special-filter-label-before' => 'Mostrar só:',
Modified: trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
2012-01-20 21:05:46 UTC (rev 109647)
+++ trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
2012-01-20 21:23:25 UTC (rev 109648)
@@ -23,7 +23,7 @@
);
private $sorts = array(
'age',
- 'helpfulness',
+ 'helpful',
'rating'
);
@@ -68,34 +68,36 @@
if ( !$pageId ) {
$out->addWikiMsg( 'articlefeedbackv5-invalid-page-id' );
- } else {
- # TODO: Fix links.
- $out->addHTML(
- Html::openElement(
- 'div',
- array( 'id' =>
'articleFeedbackv5-header-links' )
- )
- . Linker::link(
- Title::newFromText( $param ),
- $this->msg(
'articlefeedbackv5-go-to-article' )->escaped()
- )
- . ' | ' .
- Linker::link(
- Title::newFromText( $param ),
- $this->msg(
'articlefeedbackv5-discussion-page' )->escaped()
- )
- . ' | ' .
- Linker::link(
- Title::newFromText( $param ),
- $this->msg(
'articlefeedbackv5-whats-this' )->escaped()
- )
- . Html::closeElement( 'div' )
- );
+ return;
}
+ # TODO: Fix links.
$out->addHTML(
Html::openElement(
'div',
+ array( 'id' => 'articleFeedbackv5-header-wrap' )
+ )
+ . Html::openElement(
+ 'div',
+ array( 'id' => 'articleFeedbackv5-header-links'
)
+ )
+ . Linker::link(
+ Title::newFromText( $param ),
+ $this->msg( 'articlefeedbackv5-go-to-article'
)->escaped()
+ )
+ . ' | ' .
+ Linker::link(
+ Title::newFromText( $param ),
+ $this->msg( 'articlefeedbackv5-discussion-page'
)->escaped()
+ )
+ . ' | ' .
+ Linker::link(
+ Title::newFromText( $param ),
+ $this->msg( 'articlefeedbackv5-whats-this'
)->escaped()
+ )
+ . Html::closeElement( 'div' )
+ . Html::openElement(
+ 'div',
array( 'id' =>
'articleFeedbackv5-showing-count-wrap' )
)
. $this->msg(
@@ -113,16 +115,20 @@
)
. $this->msg(
'articlefeedbackv5-percent-found', $found ) # Can't escape this, need the
<span> tag to parse.
. Html::closeElement( 'div' )
- . Html::element(
- 'a',
- array(
- 'href' => '#',
- 'id' =>
'articleFeedbackv5-special-add-feedback',
- ),
- $this->msg(
'articlefeedbackv5-special-add-feedback' )->text()
- )
);
}
+
+ $out->addHtml(
+ Html::element(
+ 'a',
+ array(
+ 'href' => '#',
+ 'id' =>
'articleFeedbackv5-special-add-feedback',
+ ),
+ $this->msg(
'articlefeedbackv5-special-add-feedback' )->text()
+ )
+ . Html::closeElement( 'div' )
+ );
# if ( $rating ) {
# $out->addWikiMsg( 'articlefeedbackv5-overall-rating',
$rating );
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-01-20 21:05:46 UTC (rev 109647)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-01-20 21:23:25 UTC (rev 109648)
@@ -470,7 +470,7 @@
ApiBase::PARAM_REQUIRED => false,
ApiBase::PARAM_ISMULTI => false,
ApiBase::PARAM_TYPE => array(
- 'age', 'helpfulness', 'rating' )
+ 'age', 'helpful', 'rating' )
),
'sortdirection' => array(
ApiBase::PARAM_REQUIRED => false,
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
2012-01-20 21:05:46 UTC (rev 109647)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
2012-01-20 21:23:25 UTC (rev 109648)
@@ -231,4 +231,4 @@
/* @embed */
/*background: url(images/bg-button.png) repeat-x;
color: #fff;
-}*/
\ No newline at end of file
+}*/
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
