| Index: trunk/extensions/LiquidThreads/pages/TalkpageView.php |
| — | — | @@ -152,14 +152,9 @@ |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | if ( $article->exists() ) { |
| 156 | | - $newest_changes = wfMsg( 'lqt_sort_newest_changes' ); |
| 157 | | - $newest_threads = wfMsg( 'lqt_sort_newest_threads' ); |
| 158 | | - $oldest_threads = wfMsg( 'lqt_sort_oldest_threads' ); |
| 159 | 156 | $lqt_remember_sort = wfMsg( 'lqt_remember_sort' ) ; |
| | 157 | + |
| 160 | 158 | $form_action_url = $this->talkpageUrl( $this->title, 'talkpage_sort_order' ); |
| 161 | | - $lqt_sort_newest_changes = wfMsg( 'lqt_sort_newest_changes' ); |
| 162 | | - $lqt_sort_newest_threads = wfMsg( 'lqt_sort_newest_threads' ); |
| 163 | | - $lqt_sort_oldest_threads = wfMsg( 'lqt_sort_oldest_threads' ); |
| 164 | 159 | $go = wfMsg( 'go' ); |
| 165 | 160 | |
| 166 | 161 | $html = ''; |
| — | — | @@ -172,9 +167,9 @@ |
| 173 | 168 | $sortOrderSelect->setAttribute( 'class', 'lqt_sort_select' ); |
| 174 | 169 | $sortOrderSelect->addOption( wfMsg( 'lqt_sort_newest_changes' ), |
| 175 | 170 | LQT_NEWEST_CHANGES ); |
| 176 | | - $sortOrderSelect->addOption( wfMsg( 'lqt_sort_newest_changes' ), |
| | 171 | + $sortOrderSelect->addOption( wfMsg( 'lqt_sort_newest_threads' ), |
| 177 | 172 | LQT_NEWEST_THREADS ); |
| 178 | | - $sortOrderSelect->addOption( wfMsg( 'lqt_sort_newest_changes' ), |
| | 173 | + $sortOrderSelect->addOption( wfMsg( 'lqt_sort_oldest_threads' ), |
| 179 | 174 | LQT_OLDEST_THREADS ); |
| 180 | 175 | $html .= $sortOrderSelect->getHTML(); |
| 181 | 176 | |
| Index: trunk/extensions/LiquidThreads/LiquidThreads.php |
| — | — | @@ -6,9 +6,9 @@ |
| 7 | 7 | $wgExtensionCredits['other'][] = array( |
| 8 | 8 | 'path' => __FILE__, |
| 9 | 9 | 'name' => 'Liquid Threads', |
| 10 | | - 'version' => '1.2', |
| | 10 | + 'version' => '2.0-alpha', |
| 11 | 11 | 'url' => 'http://www.mediawiki.org/wiki/Extension:LiquidThreads', |
| 12 | | - 'author' => 'David McCabe', |
| | 12 | + 'author' => array( 'David McCabe', 'Andrew Garrett' ), |
| 13 | 13 | 'description' => 'Add threading discussions to talk pages', |
| 14 | 14 | 'descriptionmsg' => 'lqt-desc', |
| 15 | 15 | ); |
| Index: trunk/extensions/LiquidThreads/classes/LqtView.php |
| — | — | @@ -676,6 +676,33 @@ |
| 677 | 677 | $sk = $this->user->getSkin(); |
| 678 | 678 | $html = ''; |
| 679 | 679 | |
| | 680 | + /// RHS, actions. Show as a drop-down, goes first in the HTML so it floats correctly. |
| | 681 | + $commands = $this->threadCommands( $thread ); |
| | 682 | + $commandHTML = Xml::tags( 'ul', array( 'class' => 'lqt-thread-header-command-list' ), |
| | 683 | + $this->listItemsForCommands( $commands ) ); |
| | 684 | + |
| | 685 | + $headerParts = array(); |
| | 686 | + |
| | 687 | + $permalink = $this->permalink( $thread, wfMsgExt( 'lqt_permalink', 'parseinline' ) ); |
| | 688 | + $permalink = Xml::tags( 'span', array( 'class' => 'lqt-thread-permalink' ), $permalink ); |
| | 689 | + $headerParts[] = $permalink; |
| | 690 | + |
| | 691 | + // Drop-down menu |
| | 692 | + $triggerText = wfMsgExt( 'lqt-header-actions', 'parseinline' ) . |
| | 693 | + Xml::tags( 'span', array('class' => 'lqt-thread-actions-icon'), |
| | 694 | + ' '); |
| | 695 | + $dropDownTrigger = Xml::tags( 'span', |
| | 696 | + array( 'class' => 'lqt-thread-actions-trigger' ), |
| | 697 | + $triggerText ); |
| | 698 | + $headerParts[] = Xml::tags( 'div', |
| | 699 | + array( 'class' => 'lqt-thread-header-commands' ), |
| | 700 | + $dropDownTrigger . $commandHTML ); |
| | 701 | + |
| | 702 | + $dropDown = Xml::tags( 'div', |
| | 703 | + array( 'class' => 'lqt-thread-header-rhs' ), |
| | 704 | + $wgLang->pipeList( $headerParts ) ); |
| | 705 | + $html .= $dropDown; |
| | 706 | + |
| 680 | 707 | $infoElements = array(); |
| 681 | 708 | |
| 682 | 709 | // Author name. |
| — | — | @@ -707,33 +734,6 @@ |
| 708 | 735 | $html .= Xml::tags( 'span', array( 'class' => 'lqt-thread-header-info' ), |
| 709 | 736 | $wgLang->pipeList( $infoElements ) ); |
| 710 | 737 | |
| 711 | | - /// RHS � actions. Show as a drop-down |
| 712 | | - $commands = $this->threadCommands( $thread ); |
| 713 | | - $commandHTML = Xml::tags( 'ul', array( 'class' => 'lqt-thread-header-command-list' ), |
| 714 | | - $this->listItemsForCommands( $commands ) ); |
| 715 | | - |
| 716 | | - $headerParts = array(); |
| 717 | | - |
| 718 | | - $permalink = $this->permalink( $thread, wfMsgExt( 'lqt_permalink', 'parseinline' ) ); |
| 719 | | - $permalink = Xml::tags( 'span', array( 'class' => 'lqt-thread-permalink' ), $permalink ); |
| 720 | | - $headerParts[] = $permalink; |
| 721 | | - |
| 722 | | - // Drop-down menu |
| 723 | | - $triggerText = wfMsgExt( 'lqt-header-actions', 'parseinline' ) . |
| 724 | | - Xml::tags( 'span', array('class' => 'lqt-thread-actions-icon'), |
| 725 | | - ' '); |
| 726 | | - $dropDownTrigger = Xml::tags( 'span', |
| 727 | | - array( 'class' => 'lqt-thread-actions-trigger' ), |
| 728 | | - $triggerText ); |
| 729 | | - $headerParts[] = Xml::tags( 'div', |
| 730 | | - array( 'class' => 'lqt-thread-header-commands' ), |
| 731 | | - $dropDownTrigger . $commandHTML ); |
| 732 | | - |
| 733 | | - $dropDown = Xml::tags( 'div', |
| 734 | | - array( 'class' => 'lqt-thread-header-rhs' ), |
| 735 | | - $wgLang->pipeList( $headerParts ) ); |
| 736 | | - $html .= $dropDown; |
| 737 | | - |
| 738 | 738 | $html = Xml::tags( 'div', array( 'class' => 'lqt-thread-header' ), $html ); |
| 739 | 739 | |
| 740 | 740 | $this->output->addHTML( $html ); |