https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105455
Revision: 105455
Author: jeroendedauw
Date: 2011-12-07 19:41:06 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
work on ui
Modified Paths:
--------------
trunk/extensions/Reviews/Reviews.i18n.php
trunk/extensions/Reviews/Reviews.php
trunk/extensions/Reviews/includes/Review.php
trunk/extensions/Reviews/includes/ReviewPager.php
trunk/extensions/Reviews/resources/reviews.pager.js
Added Paths:
-----------
trunk/extensions/Reviews/resources/reviews.list.css
trunk/extensions/Reviews/resources/reviews.list.js
trunk/extensions/Reviews/resources/reviews.pager.css
Removed Paths:
-------------
trunk/extensions/Reviews/resources/reviews.tag.css
trunk/extensions/Reviews/resources/reviews.tag.js
Modified: trunk/extensions/Reviews/Reviews.i18n.php
===================================================================
--- trunk/extensions/Reviews/Reviews.i18n.php 2011-12-07 19:40:34 UTC (rev
105454)
+++ trunk/extensions/Reviews/Reviews.i18n.php 2011-12-07 19:41:06 UTC (rev
105455)
@@ -107,6 +107,10 @@
'reviews-pager-confirm-new' => 'Are you sure you want to unflag this
review?',
'reviews-pager-confirm-reviewed' => 'Are you sure you want to mark this
review as reviewed?',
'reviews-pager-updating' => 'Updating...',
+
+ // Review display
+ 'reviews-posted-by' => 'By $1',
+ 'reviews-posted-on' => 'Added $1',
);
/** Message documentation (Message documentation)
Modified: trunk/extensions/Reviews/Reviews.php
===================================================================
--- trunk/extensions/Reviews/Reviews.php 2011-12-07 19:40:34 UTC (rev
105454)
+++ trunk/extensions/Reviews/Reviews.php 2011-12-07 19:41:06 UTC (rev
105455)
@@ -202,12 +202,12 @@
),
);
-$wgResourceModules['ext.reviews.tag'] = $moduleTemplate + array(
+$wgResourceModules['ext.reviews.list'] = $moduleTemplate + array(
'scripts' => array(
- 'reviews.tag.js',
+ 'reviews.list.js',
),
'styles' => array(
- 'reviews.tag.css',
+ 'reviews.list.css',
),
'dependencies' => array(
'jquery.reviewRating',
@@ -218,8 +218,11 @@
'scripts' => array(
'reviews.pager.js',
),
+ 'styles' => array(
+ 'reviews.pager.css',
+ ),
'dependencies' => array(
- 'jquery.reviewState', 'jquery.reviewRating',
+ 'jquery.reviewState', 'jquery.reviewRating', 'ext.reviews.list',
),
);
Modified: trunk/extensions/Reviews/includes/Review.php
===================================================================
--- trunk/extensions/Reviews/includes/Review.php 2011-12-07 19:40:34 UTC
(rev 105454)
+++ trunk/extensions/Reviews/includes/Review.php 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -354,28 +354,49 @@
* @return string
*/
public function getHTML() {
+ $ratings = $this->getRatings( true );
+
$html = '<table class="review-table">';
$html .= '<tr><th colspan="2" class="review-table-title">' .
htmlspecialchars( $this->getField( 'title' ) ) . '</th></tr>';
$html .= '<tr>';
- $html .= '<td rowspan="2">author stuff be here</td>';
+ // ' . $this->hasRatings() ? '2' : '1' . '
+ $html .= '<td rowspan="2" class="review-author-box">';
- $html .= Html::element( 'td', array(), $this->getField( 'text'
) );
+ $html .= ReviewRating::getDisplayHTMLFor( $this->getRating() );
- $html .= '</tr>';
+ $html .= Html::element( 'p', array( 'class' =>
'reviews-posted-by' ), wfMsgExt(
+ 'reviews-posted-by',
+ 'parsemag',
+ $this->getUser()->getRealName() === '' ?
$this->getUser()->getName() : $this->getUser()->getRealName()
+ ) );
- $html .= '<tr colspan="2">';
+ $html .= Html::element( 'p', array( 'class' =>
'reviews-posted-on' ), wfMsgExt(
+ 'reviews-posted-on',
+ 'parsemag',
+ $this->getField( 'post_time' )
+ ) );
- $html .= Html::rawElement(
- 'td',
- array(),
- implode( array_map( 'ReviewRating::getDisplayHTMLFor',
$this->getRatings() ) )
- );
+ $html .= '</td>';
+ $html .= Html::element( 'td', array(), $this->getField( 'text'
) );
+
$html .= '</tr>';
+ if ( $this->hasRatings() ) {
+ $html .= '<tr>';
+
+ $html .= Html::rawElement(
+ 'td',
+ array(),
+ implode( array_map(
'ReviewRating::getDisplayHTMLFor', $ratings ) )
+ );
+
+ $html .= '</tr>';
+ }
+
$html .= '</table>';
return Html::openElement(
Modified: trunk/extensions/Reviews/includes/ReviewPager.php
===================================================================
--- trunk/extensions/Reviews/includes/ReviewPager.php 2011-12-07 19:40:34 UTC
(rev 105454)
+++ trunk/extensions/Reviews/includes/ReviewPager.php 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -84,6 +84,10 @@
return version_compare( $GLOBALS['wgUser'], '1.18', '>' ) ?
parent::getUser() : $GLOBALS['wgUser'];
}
+ function getStartBody() {
+ return '<table
class="reviews-pager-table"><thead><tr><th>..</th></tr></thead><tbody>';
+ }
+
/**
* @return array
*/
@@ -124,7 +128,7 @@
*/
function formatRow( $row ) {
$this->currentReview = Review::newFromDBResult( $row );
- return parent::formatRow( $row );
+ return '<tr><td>' . $this->currentReview->getHTML() .
'</td></tr>';
}
/**
@@ -168,15 +172,7 @@
function getQueryInfo() {
return array(
'tables' => array( 'reviews' ),
- 'fields' => array(
- 'review_id',
- 'review_post_time',
- 'review_state',
- 'review_title',
- 'review_user_id',
- 'review_page_id',
- 'review_rating',
- ),
+ 'fields' => Review::getPrefixedFields(
Review::getFieldNames() ),
'conds' => $this->conds,
);
}
Copied: trunk/extensions/Reviews/resources/reviews.list.css (from rev 105427,
trunk/extensions/Reviews/resources/reviews.tag.css)
===================================================================
--- trunk/extensions/Reviews/resources/reviews.list.css
(rev 0)
+++ trunk/extensions/Reviews/resources/reviews.list.css 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -0,0 +1,34 @@
+/**
+ * CSS for the Reviews MediaWiki extension.
+ * @see https://www.mediawiki.org/wiki/Extension:Reviews
+ *
+ * @licence GNU GPL v3 or later
+ * @author Jeroen De Dauw <jeroendedauw at gmail dot com>
+ */
+
+.review-table {
+ width: 100%;
+}
+
+table.review-table, table.review-table td, table.review-table th {
+ border: 1px solid gray;
+}
+
+.review-table-title {
+ text-align: left;
+ padding-left: 5px;
+}
+
+.review-author-box{
+ width: 150px;
+}
+
+.reviews-posted-by {
+ clear: both;
+}
+
+.reviews-posted-on {
+ clear: both;
+ color: darkgray;
+ font-size: 80%;
+}
\ No newline at end of file
Copied: trunk/extensions/Reviews/resources/reviews.list.js (from rev 105427,
trunk/extensions/Reviews/resources/reviews.tag.js)
===================================================================
--- trunk/extensions/Reviews/resources/reviews.list.js
(rev 0)
+++ trunk/extensions/Reviews/resources/reviews.list.js 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -0,0 +1,20 @@
+/**
+ * JavasSript for the Reviews MediaWiki extension.
+ * @see https://www.mediawiki.org/wiki/Extension:Reviews
+ *
+ * @licence GNU GPL v3 or later
+ * @author Jeroen De Dauw <jeroendedauw at gmail dot com>
+ */
+
+(function( $, mw ) {
+
+ var _this = this;
+
+ $( document ).ready( function() {
+
+ $( '.review-rating-display' ).reviewRating();
+ $( '.reviews-state-controls' ).reviewState();
+
+ } );
+
+})( window.jQuery, window.mediaWiki );
Added: trunk/extensions/Reviews/resources/reviews.pager.css
===================================================================
--- trunk/extensions/Reviews/resources/reviews.pager.css
(rev 0)
+++ trunk/extensions/Reviews/resources/reviews.pager.css 2011-12-07
19:41:06 UTC (rev 105455)
@@ -0,0 +1,15 @@
+/**
+ * CSS for the Reviews MediaWiki extension.
+ * @see https://www.mediawiki.org/wiki/Extension:Reviews
+ *
+ * @licence GNU GPL v3 or later
+ * @author Jeroen De Dauw <jeroendedauw at gmail dot com>
+ */
+
+.reviews-pager-table {
+ width: 100%;
+}
+
+/*table.reviews-pager-table, table.reviews-pager-table td,
table.reviews-pager-table th {
+ border: 1px solid gray;
+}*/
Property changes on: trunk/extensions/Reviews/resources/reviews.pager.css
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/extensions/Reviews/resources/reviews.pager.js
===================================================================
--- trunk/extensions/Reviews/resources/reviews.pager.js 2011-12-07 19:40:34 UTC
(rev 105454)
+++ trunk/extensions/Reviews/resources/reviews.pager.js 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -10,8 +10,8 @@
$( document ).ready( function() {
- $( '.reviews-state-controls' ).reviewState();
- $( '.review-rating-display' ).reviewRating();
+// $( '.reviews-state-controls' ).reviewState();
+// $( '.review-rating-display' ).reviewRating();
} );
Deleted: trunk/extensions/Reviews/resources/reviews.tag.css
===================================================================
--- trunk/extensions/Reviews/resources/reviews.tag.css 2011-12-07 19:40:34 UTC
(rev 105454)
+++ trunk/extensions/Reviews/resources/reviews.tag.css 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -1,20 +0,0 @@
-/**
- * CSS for the Reviews MediaWiki extension.
- * @see https://www.mediawiki.org/wiki/Extension:Reviews
- *
- * @licence GNU GPL v3 or later
- * @author Jeroen De Dauw <jeroendedauw at gmail dot com>
- */
-
-.review-table {
- width: 100%;
-}
-
-table.review-table, table.review-table td, table.review-table th {
- border: 1px solid gray;
-}
-
-.review-table-title {
- text-align: left;
- padding-left: 5px;
-}
Deleted: trunk/extensions/Reviews/resources/reviews.tag.js
===================================================================
--- trunk/extensions/Reviews/resources/reviews.tag.js 2011-12-07 19:40:34 UTC
(rev 105454)
+++ trunk/extensions/Reviews/resources/reviews.tag.js 2011-12-07 19:41:06 UTC
(rev 105455)
@@ -1,19 +0,0 @@
-/**
- * JavasSript for the Reviews MediaWiki extension.
- * @see https://www.mediawiki.org/wiki/Extension:Reviews
- *
- * @licence GNU GPL v3 or later
- * @author Jeroen De Dauw <jeroendedauw at gmail dot com>
- */
-
-(function( $, mw ) {
-
- var _this = this;
-
- $( document ).ready( function() {
-
- $( '.review-rating-display' ).reviewRating();
-
- } );
-
-})( window.jQuery, window.mediaWiki );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
