tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR: Fix links etc, and remove www. from SS urls (from r109105) 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112783 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-19 00:56:25 +00:00
parent cda6638281
commit f20e83eeaf
7 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dev/CliTestReporter.php
View File

@ -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);

12
dev/TestRunner.php
View File

@ -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) {

4
dev/install/config-form.html
View File

@ -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>

2
dev/install/php5-required.html
View File

@ -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>

2
javascript/prototype_improvements.js vendored
View File

@ -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)

2
parsers/HTML/HTMLBBCodeParser.php
View File

@ -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

2
thirdparty/greybox/greybox.js vendored
View File

@ -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