[MediaWiki-CVS] SVN: [94152] trunk/extensions/SemanticMediaWiki/specials/AskSpecial/ SMW_QueryUIHelper.php

[devayon]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94152

Revision: 94152
Author:   devayon
Date:     2011-08-10 13:14:31 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
partial revert of r94147

Modified Paths:
--------------
    trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php

Modified: 
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===================================================================
--- 
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php    
    2011-08-10 12:34:19 UTC (rev 94151)
+++ 
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php    
    2011-08-10 13:14:31 UTC (rev 94152)
@@ -260,7 +260,7 @@
                $url_tail = $this->getUrlTail();
                // Prepare navigation bar.
                if ( $offset > 0 ) {
-                       $previous = Html::element(
+                       $navigation = Html::element(
                                'a',
                                array(
                                        'href' => 
$this->getTitle()->getLocalURL(
@@ -273,14 +273,18 @@
                        );
 
                } else {
-                       $previous = wfMsg( 'smw_result_prev' );
+                       $navigation = wfMsg( 'smw_result_prev' );
                }
-               $space = '    ';
-               $first_digit = $wgLang->formatNum( $offset + 1 );
-               $last_digit = $wgLang->formatNum( $offset + 
$this->uiCore->getResultCount() );
 
+               $navigation .=
+                       '&#160;&#160;&#160;&#160; <b>' .
+                               wfMsg( 'smw_result_results' ) . ' ' . 
$wgLang->formatNum( $offset + 1 ) .
+                       ' - ' .
+                               $wgLang->formatNum( $offset + 
$this->uiCore->getResultCount() ) .
+                       '</b>&#160;&#160;&#160;&#160;';
+
                if ( $hasFurtherResults ) {
-                       $next = Html::element(
+                       $navigation .= Html::element(
                                'a',
                                array(
                                        'href' => 
$this->getTitle()->getLocalURL(
@@ -292,7 +296,7 @@
                                wfMsg( 'smw_result_next' )
                        );
                } else {
-                       $next = wfMsg( 'smw_result_next' );
+                       $navigation .= wfMsg( 'smw_result_next' );
                }
 
                $first = true;
@@ -301,14 +305,14 @@
                        if ( $l > $smwgQMaxInlineLimit ) break;
 
                        if ( $first ) {
-                               $limit_choices = '(';
+                               $navigation .= 
'&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;(';
                                $first = false;
                        } else {
-                               $limit_choices .= ' | ';
+                               $navigation .= ' | ';
                        }
 
                        if ( $limit != $l ) {
-                               $limit_choices .= Html::element(
+                               $navigation .= Html::element(
                                        'a',
                                        array(
                                                'href' => 
$this->getTitle()->getLocalURL(
@@ -320,28 +324,12 @@
                                        $wgLang->formatNum( $l, false )
                                );
                        } else {
-                               $limit_choices .= '<b>' . $wgLang->formatNum( 
$l ) . '</b>';
+                               $navigation .= '<b>' . $wgLang->formatNum( $l ) 
. '</b>';
                        }
                }
-               $limit_choices .= ')';
 
-               if ( $wgLang->isRTL() ) { // right to left
-                       $navigation =   $limit_choices .
-                                                       "$space $next $space" .
-                                                       Html::rawElement( 
'strong', array(),
-                                                               " $last_digit - 
$first_digit " .
-                                                               wfMsg( 
'smw_result_results' )
-                                                       ) .
-                                                       "$space $previous 
$space";
-               } else { // left to right
-                       $navigation =   "$space $previous $space" .
-                                                       Html::rawElement( 
'strong', array(),
-                                                               wfMsg( 
'smw_result_results' ) .
-                                                               " $first_digit 
- $last_digit "
-                                                       ) .
-                                                       "$space $next $space" .
-                                                       $limit_choices;
-               }
+               $navigation .= ')';
+
                return $navigation;
        }
 
@@ -1697,4 +1685,4 @@
                }
        }
 
-                       }
+}


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs