http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96815
Revision: 96815
Author: jeroendedauw
Date: 2011-09-11 22:10:45 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
navigation++
Modified Paths:
--------------
trunk/extensions/Survey/Survey.i18n.php
trunk/extensions/Survey/specials/SpecialSurvey.php
trunk/extensions/Survey/specials/SpecialSurveyPage.php
trunk/extensions/Survey/specials/SpecialSurveyStats.php
trunk/extensions/Survey/specials/SpecialTakeSurvey.php
Modified: trunk/extensions/Survey/Survey.i18n.php
===================================================================
--- trunk/extensions/Survey/Survey.i18n.php 2011-09-11 21:50:05 UTC (rev
96814)
+++ trunk/extensions/Survey/Survey.i18n.php 2011-09-11 22:10:45 UTC (rev
96815)
@@ -47,6 +47,7 @@
'survey-navigation-edit' => '[[Special:Survey/$1|Edit this survey]]',
'survey-navigation-take' => '[[Special:TakeSurvey/$1|Take this
survey]]',
'survey-navigation-list' => '[[Special:Surveys|Surveys list]]',
+ 'survey-navigation-stats' => '[[Special:SurveyStats/$1|View
statistics]]',
// Special:Surveys
'surveys-special-addnew' => 'Add a new survey',
Modified: trunk/extensions/Survey/specials/SpecialSurvey.php
===================================================================
--- trunk/extensions/Survey/specials/SpecialSurvey.php 2011-09-11 21:50:05 UTC
(rev 96814)
+++ trunk/extensions/Survey/specials/SpecialSurvey.php 2011-09-11 22:10:45 UTC
(rev 96815)
@@ -47,6 +47,13 @@
if ( $survey === false ) {
$survey = new Survey( array( 'name' =>
$subPage ), true );
}
+ else {
+ $this->displayNavigation( array(
+ wfMsgExt(
'survey-navigation-take', 'parseinline', $subPage ),
+ wfMsgExt(
'survey-navigation-stats', 'parseinline', $subPage ),
+ wfMsgExt(
'survey-navigation-list', 'parseinline' )
+ ) );
+ }
$this->showSurvey( $survey );
$this->addModules( 'ext.survey.special.survey'
);
Modified: trunk/extensions/Survey/specials/SpecialSurveyPage.php
===================================================================
--- trunk/extensions/Survey/specials/SpecialSurveyPage.php 2011-09-11
21:50:05 UTC (rev 96814)
+++ trunk/extensions/Survey/specials/SpecialSurveyPage.php 2011-09-11
22:10:45 UTC (rev 96815)
@@ -106,4 +106,15 @@
);
}
+ /**
+ * Display navigation links.
+ *
+ * @since 0.1
+ *
+ * @param array $links
+ */
+ protected function displayNavigation( array $links ) {
+ $this->getOutput()->addHTML( Html::rawElement( 'p', array(),
implode( ' - ', $links ) ) );
+ }
+
}
Modified: trunk/extensions/Survey/specials/SpecialSurveyStats.php
===================================================================
--- trunk/extensions/Survey/specials/SpecialSurveyStats.php 2011-09-11
21:50:05 UTC (rev 96814)
+++ trunk/extensions/Survey/specials/SpecialSurveyStats.php 2011-09-11
22:10:45 UTC (rev 96815)
@@ -39,7 +39,13 @@
if ( Survey::has( array( 'name' => $subPage ) ) ) {
$survey = Survey::newFromName( $subPage );
- $this->displayNavigation( $survey );
+
+ $this->displayNavigation( array(
+ wfMsgExt( 'survey-navigation-edit',
'parseinline', $survey->getField( 'name' ) ),
+ wfMsgExt( 'survey-navigation-take',
'parseinline', $survey->getField( 'name' ) ),
+ wfMsgExt( 'survey-navigation-list',
'parseinline' )
+ ) );
+
$this->displayStats( $survey );
}
else {
@@ -49,23 +55,6 @@
}
/**
- * Display links to edit and take the survey.
- *
- * @since 0.1
- *
- * @param Survey $survey
- */
- protected function displayNavigation( Survey $survey ) {
- $links = array(
- wfMsgExt( 'survey-navigation-edit', 'parseinline',
$survey->getField( 'name' ) ),
- wfMsgExt( 'survey-navigation-take', 'parseinline',
$survey->getField( 'name' ) ),
- wfMsgExt( 'survey-navigation-list', 'parseinline' )
- );
-
- $this->getOutput()->addHTML( Html::rawElement( 'p', array(),
implode( ' - ', $links ) ) );
- }
-
- /**
* Display the statistics that go with the survey.
*
* @since 0.1
Modified: trunk/extensions/Survey/specials/SpecialTakeSurvey.php
===================================================================
--- trunk/extensions/Survey/specials/SpecialTakeSurvey.php 2011-09-11
21:50:05 UTC (rev 96814)
+++ trunk/extensions/Survey/specials/SpecialTakeSurvey.php 2011-09-11
22:10:45 UTC (rev 96815)
@@ -62,6 +62,12 @@
* @param string $subPage
*/
protected function displaySurvey( $subPage ) {
+ $this->displayNavigation( array(
+ wfMsgExt( 'survey-navigation-edit', 'parseinline',
$subPage ),
+ wfMsgExt( 'survey-navigation-stats', 'parseinline',
$subPage ),
+ wfMsgExt( 'survey-navigation-list', 'parseinline' )
+ ) );
+
$this->getOutput()->addWikiText( Xml::element(
'survey',
array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
