From af961bd6f39ab9d9ebb1a43f0b7a59163cb57caa Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Fri, 27 Sep 2013 18:13:23 +0200 Subject: [PATCH] Dev Fixed documentation links to new URL --- application/controllers/AdminController.php | 2 +- application/controllers/Statistics_userController.php | 1 - application/controllers/admin/conditionsaction.php | 2 +- application/controllers/survey/index.php | 2 +- application/core/LSYii_Controller.php | 2 +- application/core/Survey_Common_Action.php | 2 +- application/views/admin/conditions/conditionshead_view.php | 2 +- application/views/admin/index.php | 2 +- application/views/admin/super/adminmenu.php | 2 +- application/views/admin/super/footer.php | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php index a7d3f0af122..3326c7b4e7d 100644 --- a/application/controllers/AdminController.php +++ b/application/controllers/AdminController.php @@ -91,7 +91,7 @@ public function error($message, $url = array()) $output .= ''."\n"; echo $output; - $this->_getAdminFooter('http://docs.limesurvey.org', $clang->gT('LimeSurvey online manual')); + $this->_getAdminFooter('http://manual.limesurvey.org', $clang->gT('LimeSurvey online manual')); die; } diff --git a/application/controllers/Statistics_userController.php b/application/controllers/Statistics_userController.php index 54ba8c8c580..6f7ccebb178 100644 --- a/application/controllers/Statistics_userController.php +++ b/application/controllers/Statistics_userController.php @@ -22,7 +22,6 @@ * to determine whether the results of a certain question should be shown to the user * after he/she has submitted the survey. * - * See http://docs.limesurvey.org/tiki-index.php?page=Question+attributes#public_statistics */ class Statistics_userController extends LSYii_Controller { diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php index dcda5744dd5..dc103f56955 100644 --- a/application/controllers/admin/conditionsaction.php +++ b/application/controllers/admin/conditionsaction.php @@ -1906,7 +1906,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null) // Regexp Tab $aViewUrls['output'] .= "\t
\n" ."\t\t\n" - ."\t\t
\n" + ."\t\t
\n" ."\t
\n"; $aViewUrls['output'] .= "\n"; // end conditiontarget div diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php index 83bd03c0d17..38723bb7d4c 100644 --- a/application/controllers/survey/index.php +++ b/application/controllers/survey/index.php @@ -193,7 +193,7 @@ function action() AND ((expires >= '".date("Y-m-d H:i")."') OR (expires is null)) AND ((startdate <= '".date("Y-m-d H:i")."') OR (startdate is null)) ORDER BY surveyls_title"; - $result = dbExecuteAssoc($query,false,true) or safeDie("Could not connect to database. If you try to install LimeSurvey please refer to the installation docs and/or contact the system administrator of this webpage."); //Checked + $result = dbExecuteAssoc($query,false,true) or safeDie("Could not connect to database. If you try to install LimeSurvey please refer to the installation docs and/or contact the system administrator of this webpage."); //Checked $list=array(); foreach($result->readAll() as $rows) diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php index 53bfbc81829..da05dc52eed 100644 --- a/application/core/LSYii_Controller.php +++ b/application/core/LSYii_Controller.php @@ -92,7 +92,7 @@ protected function _init() $dieoutput .= 'This script can only be run on PHP version 5.1.6 or later! Your version: '.PHP_VERSION.'
'; if (!function_exists('mb_convert_encoding')) - $dieoutput .= "This script needs the PHP Multibyte String Functions library installed: See FAQ and PHP documentation
"; + $dieoutput .= "This script needs the PHP Multibyte String Functions library installed: See FAQ and PHP documentation
"; if ($dieoutput != '') throw new CException($dieoutput); diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index 4ceea565b81..9373085a8c6 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -343,7 +343,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $ Yii::app()->getController()->_loadEndScripts(); if(!isset($aData['display']['footer']) || $aData['display']['footer'] !== false) - Yii::app()->getController()->_getAdminFooter('http://docs.limesurvey.org', $clang->gT('LimeSurvey online manual')); + Yii::app()->getController()->_getAdminFooter('http://manual.limesurvey.org', $clang->gT('LimeSurvey online manual')); $out = ob_get_contents(); ob_clean(); diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php index 8a893159c7b..db932b0958d 100644 --- a/application/views/admin/conditions/conditionshead_view.php +++ b/application/views/admin/conditions/conditionshead_view.php @@ -21,7 +21,7 @@ - + <?php $clang->eT("LimeSurvey online manual");?>

diff --git a/application/views/admin/index.php b/application/views/admin/index.php index b188723b818..2becfa7d94a 100644 --- a/application/views/admin/index.php +++ b/application/views/admin/index.php @@ -1,5 +1,5 @@ _getAdminHeader(Yii::app()->session['metaHeader']); $this->_showadminmenu(); -$this->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); +$this->_getAdminFooter("http://manual.limesurvey.org", $clang->gT("LimeSurvey online manual")); ?> \ No newline at end of file diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php index b07868b2114..ad0635af512 100644 --- a/application/views/admin/super/adminmenu.php +++ b/application/views/admin/super/adminmenu.php @@ -114,7 +114,7 @@ " > <?php $clang->eT("Logout");?> - + <?php $clang->eT("LimeSurvey online manual");?> diff --git a/application/views/admin/super/footer.php b/application/views/admin/super/footer.php index c5ee7d7b89d..403b3bef431 100644 --- a/application/views/admin/super/footer.php +++ b/application/views/admin/super/footer.php @@ -2,7 +2,7 @@

- LimeSurvey - <?php $clang->eT("Online Manual");?>docs.png' /> + LimeSurvey - <?php $clang->eT("Online Manual");?>docs.png' />
<?php $clang->eT("Support this project - Donate to "); ?>LimeSurveydonate.png'/>