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

@@ -7,16 +7,6 @@
  */
 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
 	 */
@@ -61,12 +51,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
 		switch($this->currentTest['status']) {
@@ -79,13 +63,7 @@ class CliTestReporter extends SapphireTestReporter {
 		
 		static $colCount = 0;
 		$colCount++;
-		
+		if($colCount % 80 == 0) echo " - $colCount\n";
-		// 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";
-		}
 
 		parent::endTest($test, $time);
 		$this->writeTest($this->currentTest);

dev/TestRunner.php

@@ -266,16 +266,8 @@ class TestRunner extends Controller {
 		restore_error_handler();
 
 		/*, array("reportDirectory" => "/Users/sminnee/phpunit-report")*/
-		if(Director::is_cli()) {
+		if(Director::is_cli()) $reporter = new CliTestReporter();
-			$reporter = new CliTestReporter();
+		else $reporter = new SapphireTestReporter();
-			// 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();
-		}
 
 		self::$default_reporter->writeHeader("Sapphire Test Runner");
 		if (count($classList) > 1) { 

dev/install/config-form.html

@@ -25,7 +25,7 @@
 				<div id="Layout">
 					<div class="typography">
 						<p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
-							If you get stuck, head over to the <a href="http://www.silverstripe.org/installing-silverstripe" target="_blank">installation forum</a>, or check out our <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">list of suggested web hosts</a> known to work with SilverStripe.
+							If you get stuck, head over to the <a href="http://silverstripe.org/installing-silverstripe" target="_blank">installation forum</a>, or check out our <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">list of suggested web hosts</a> known to work with SilverStripe.
 						</p>
 			
 						<form action="install.php" method="post">
@@ -282,7 +282,7 @@
 			
 			<div id="Footer">
 				<div class="footerTop"><!-- --></div>
-				<p><a href="http://www.silverstripe.org">SilverStripe Open Source CMS / Framework</a> | Copyright &copy; 2010 SilverStripe Limited</p>
+				<p><a href="http://silverstripe.org">SilverStripe Open Source CMS / Framework</a> | Copyright &copy; 2010 SilverStripe Limited</p>
 			</div>
 		</div>
 	</body>

dev/install/php5-required.html

@@ -33,7 +33,7 @@
 			
 			<div id="Footer">
 				<div class="footerTop"><!-- --></div>
-				<p><a href="http://www.silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008 SilverStripe Limited</p>
+				<p><a href="http://silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008 SilverStripe Limited</p>
 			</div>
 		</div>
 	</body>

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)

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

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