From 96294391e02e7d25b08bd24be19a878d6148ed9a Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 10 Aug 2010 00:14:21 +0000 Subject: [PATCH] MINOR: Fix links etc, and remove www. from SS urls git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109105 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- dev/CliTestReporter.php | 24 +----------------------- dev/TestRunner.php | 12 ++---------- dev/install/config-form.html | 4 ++-- dev/install/php5-required.html | 2 +- javascript/prototype_improvements.js | 2 +- parsers/HTML/HTMLBBCodeParser.php | 2 +- thirdparty/greybox/greybox.js | 2 +- 7 files changed, 9 insertions(+), 39 deletions(-) diff --git a/dev/CliTestReporter.php b/dev/CliTestReporter.php index f6b3f4120..bd8b502db 100644 --- a/dev/CliTestReporter.php +++ b/dev/CliTestReporter.php @@ -6,16 +6,6 @@ * @subpackage testing */ class CliTestReporter extends SapphireTestReporter { - - protected $verboseOutput = false; - - /** - * If you set this to true, then the output for the test runner will be more verbose, listing - * every single test name. - */ - public function setVerboseOutput($verboseOutput) { - $this->verboseOutput = $verboseOutput; - } /** * Display error bar if it exists @@ -60,12 +50,6 @@ class CliTestReporter extends SapphireTestReporter { } echo "\n"; } - - - public function startTest(PHPUnit_Framework_Test $test) { - parent::startTest($test); - if($this->verboseOutput) echo " - {$this->currentTest['name']}: "; - } public function endTest( PHPUnit_Framework_Test $test, $time) { // Status indicator, a la PHPUnit @@ -79,13 +63,7 @@ class CliTestReporter extends SapphireTestReporter { static $colCount = 0; $colCount++; - - // We don't need row breaking for verbose output; each test is on its own line - if($this->verboseOutput) { - echo "\n"; - } else { - if($colCount % 80 == 0) echo " - $colCount\n"; - } + if($colCount % 80 == 0) echo " - $colCount\n"; parent::endTest($test, $time); $this->writeTest($this->currentTest); diff --git a/dev/TestRunner.php b/dev/TestRunner.php index 65fb308b4..8ccd88e0f 100644 --- a/dev/TestRunner.php +++ b/dev/TestRunner.php @@ -266,16 +266,8 @@ class TestRunner extends Controller { restore_error_handler(); /*, array("reportDirectory" => "/Users/sminnee/phpunit-report")*/ - if(Director::is_cli()) { - $reporter = new CliTestReporter(); - // sake dev/tests/all --verbose will give you better output - if(isset($_GET['args']) && (in_array('-v', $_GET['args']) || in_array('--verbose', $_GET['args']))) { - $reporter->setVerboseOutput(true); - } - - } else { - $reporter = new SapphireTestReporter(); - } + if(Director::is_cli()) $reporter = new CliTestReporter(); + else $reporter = new SapphireTestReporter(); self::$default_reporter->writeHeader("Sapphire Test Runner"); if (count($classList) > 1) { diff --git a/dev/install/config-form.html b/dev/install/config-form.html index e0720a127..e8a8ac7be 100644 --- a/dev/install/config-form.html +++ b/dev/install/config-form.html @@ -25,7 +25,7 @@

Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.
- If you get stuck, head over to the installation forum, or check out our list of suggested web hosts known to work with SilverStripe. + If you get stuck, head over to the installation forum, or check out our list of suggested web hosts known to work with SilverStripe.

@@ -282,7 +282,7 @@
diff --git a/dev/install/php5-required.html b/dev/install/php5-required.html index 044b87302..88aaeb410 100644 --- a/dev/install/php5-required.html +++ b/dev/install/php5-required.html @@ -33,7 +33,7 @@
diff --git a/javascript/prototype_improvements.js b/javascript/prototype_improvements.js index 37d08fe00..fa8c35d9b 100755 --- a/javascript/prototype_improvements.js +++ b/javascript/prototype_improvements.js @@ -3,7 +3,7 @@ * Some if this is legacy code which is now present in Prototype as well, * but has to be kept for older scripts. * - * @author Silverstripe Ltd., http://www.silverstripe.com + * @author Silverstripe Ltd., http://silverstripe.com */ // Shortcut-function (until we update to Prototye v1.5) diff --git a/parsers/HTML/HTMLBBCodeParser.php b/parsers/HTML/HTMLBBCodeParser.php index 28610492d..03f5e77e5 100644 --- a/parsers/HTML/HTMLBBCodeParser.php +++ b/parsers/HTML/HTMLBBCodeParser.php @@ -18,7 +18,7 @@ // // $Id: BBCodeParser.php,v 1.17 2007/07/02 18:46:30 cweiske Exp $ // -// Modified by SilverStripe www.silverstripe.com +// Modified by SilverStripe silverstripe.com /** * @package sapphire diff --git a/thirdparty/greybox/greybox.js b/thirdparty/greybox/greybox.js index 268851c8c..80342d984 100755 --- a/thirdparty/greybox/greybox.js +++ b/thirdparty/greybox/greybox.js @@ -1,7 +1,7 @@ /**** Last Modified: 25/08/06 20:52:59 - CAUTION: Modified Version to suit Silverstripe CMS (www.silverstripe.com). + CAUTION: Modified Version to suit Silverstripe CMS (silverstripe.com). Original at http://orangoo.com/labs/uploads/GreyBox_v3_46.zip GreyBox - Smart pop-up window