tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty.

Browse Source
This commit is contained in:
Normann Lou 2012-10-05 17:00:39 +13:00
parent 1fca4911e1
commit 9aaa6b1a7b
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
<?php if(isset($hasErrorOtherThanDatabase)) { ?> <?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="message error"> <p class="message error">
You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.<br> You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.<br>
If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/sapphire/en/installation/server-requirements">server requirements</a>. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/framework/en/installation/server-requirements">server requirements</a>.
</p> </p>
<?php if (isset($phpIniLocation)) { ?> <?php if (isset($phpIniLocation)) { ?>
<p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p> <p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
@ -46,7 +46,7 @@
<?php } else if($req->hasWarnings()) { ?> <?php } else if($req->hasWarnings()) { ?>
<div class="message warning"> <div class="message warning">
<p>There are some issues that we recommend you look at before installing, however, you are still able to install the software. <p>There are some issues that we recommend you look at before installing, however, you are still able to install the software.
<br>Please see below for details. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/sapphire/en/installation/server-requirements">server requirements</a>.</p> <br>Please see below for details. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/framework/en/installation/server-requirements">server requirements</a>.</p>
</div> </div>
<?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?> <?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
<div class="message goodInstall"><p>You're ready to install! Please confirm the configuration options below. <a href="#install">Install SilverStripe</a></p> <div class="message goodInstall"><p>You're ready to install! Please confirm the configuration options below. <a href="#install">Install SilverStripe</a></p>
@ -71,7 +71,7 @@
<?php $dbReq->showTable(); ?> <?php $dbReq->showTable(); ?>
<p class="helpText requirementsHelpText"> <p class="helpText requirementsHelpText">
Read more about our <a href="http://doc.silverstripe.org/sapphire/en/installation/server-requirements" target="_blank">server requirements</a>. Read more about our <a href="http://doc.silverstripe.org/framework/en/installation/server-requirements" target="_blank">server requirements</a>.
</p> </p>
<div class="action"> <div class="action">
@ -178,7 +178,7 @@
<?php if($envFileExists) { ?> <?php if($envFileExists) { ?>
<div id="use_environment_field" class="field"> <div id="use_environment_field" class="field">
<input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>> <input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
<label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/sapphire/en/topics/environment-management" target="_blank">?</a>)</label> <label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/framework/en/topics/environment-management" target="_blank">?</a>)</label>
</div> </div>
<?php } ?> <?php } ?>
@ -244,7 +244,7 @@
<h3 class="sectionHeading">Theme selection <small>Step 4 of 5</small></h3> <h3 class="sectionHeading">Theme selection <small>Step 4 of 5</small></h3>
<p class="helpText">You can change the theme or <a href="http://silverstripe.org/themes">download</a> another from the SilverStripe website after installation.</p> <p class="helpText">You can change the theme or <a href="http://silverstripe.org/themes">download</a> another from the SilverStripe website after installation.</p>
<ul id="Themes"> <ul id="Themes">
<li><input type="radio" name="template" value="simple" id="Simple" <?php if(!isset($_POST['template']) || $_POST['template'] == 'simple') {?>checked="checked"<?php }?>><label for="Simple"><a href="https://github.com/silverstripe-themes/silverstripe-simple">Simple</a> - our default theme ready to use, or begin the <a href="http://doc.silverstripe.org/sapphire/en/tutorials" target="_blank">tutorial</a>.</label></li> <li><input type="radio" name="template" value="simple" id="Simple" <?php if(!isset($_POST['template']) || $_POST['template'] == 'simple') {?>checked="checked"<?php }?>><label for="Simple"><a href="https://github.com/silverstripe-themes/silverstripe-simple">Simple</a> - our default theme ready to use, or begin the <a href="http://doc.silverstripe.org/framework/en/tutorials" target="_blank">tutorial</a>.</label></li>
<li><input type="radio" name="template" value="tutorial" id="EmptyTemplate" <?php if(isset($_POST['template']) && $_POST['template'] == 'tutorial') {?>checked="checked"<?php }?>><label for="EmptyTemplate">Empty template</label></li> <li><input type="radio" name="template" value="tutorial" id="EmptyTemplate" <?php if(isset($_POST['template']) && $_POST['template'] == 'tutorial') {?>checked="checked"<?php }?>><label for="EmptyTemplate">Empty template</label></li>
</ul> </ul>
<h3 class="sectionHeading" id="install">Confirm Install <small>Step 5 of 5</small></h3> <h3 class="sectionHeading" id="install">Confirm Install <small>Step 5 of 5</small></h3>

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

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title>PHP 5.3.2 is required</title> <title>PHP 5.3.2 is required</title>
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/css/install.css"> <link rel="stylesheet" type="text/css" href="framework/dev/install/css/install.css">
</head> </head>
<body> <body>
<div id="BgContainer"> <div id="BgContainer">

2
forms/DateField.php
View File

@ -37,7 +37,7 @@ require_once 'Zend/Date.php';
* configuration accordingly. Changing the locale through {@link setLocale()} will not update the * configuration accordingly. Changing the locale through {@link setLocale()} will not update the
* `dateformat` configuration automatically. * `dateformat` configuration automatically.
* *
* See http://doc.silverstripe.org/sapphire/en/topics/i18n for more information about localizing form fields. * See http://doc.silverstripe.org/framework/en/topics/i18n for more information about localizing form fields.
* *
* # Usage * # Usage
* *

2
javascript/i18n.js
View File

@ -4,7 +4,7 @@ if(typeof(ss) == 'undefined') ss = {};
* Lightweight clientside i18n implementation. * Lightweight clientside i18n implementation.
* Caution: Only available after DOM loaded because we need to detect the language * Caution: Only available after DOM loaded because we need to detect the language
* *
* For non-i18n stub implementation, see sapphire/javascript/i18nx.js * For non-i18n stub implementation, see framework/javascript/i18nx.js
* *
* Based on jQuery i18n plugin: 1.0.0 Feb-10-2008 * Based on jQuery i18n plugin: 1.0.0 Feb-10-2008
* *

2
javascript/i18nx.js
View File

@ -2,7 +2,7 @@ if(typeof(ss) == 'undefined') ss = {};
/** /**
* Stub implementation for ss.i18n code. * Stub implementation for ss.i18n code.
* Use instead of sapphire/javascript/i18n.js * Use instead of framework/javascript/i18n.js
* if you want to use any SilverStripe javascript * if you want to use any SilverStripe javascript
* without internationalization support. * without internationalization support.
*/ */

2
tests/core/manifest/ClassLoaderTest.php
View File

@ -2,7 +2,7 @@
/** /**
* Tests for the {@link SS_ClassManifest} class. * Tests for the {@link SS_ClassManifest} class.
* *
* @package sapphire * @package framework
* @subpackage tests * @subpackage tests
*/ */
class ClassLoaderTest extends SapphireTest { class ClassLoaderTest extends SapphireTest {

4
thirdparty/greybox/greybox.js vendored
View File

@ -20,9 +20,9 @@ var GB_ONLY_ONE = null;
// modified 2006-01-06 by Silverstripe Ltd. // modified 2006-01-06 by Silverstripe Ltd.
try { try {
var theBaseHref = document.getElementsByTagName("base")[0].href; var theBaseHref = document.getElementsByTagName("base")[0].href;
var GB_IMG_DIR = theBaseHref + "sapphire/thirdparty/greybox/"; var GB_IMG_DIR = theBaseHref + "framework/thirdparty/greybox/";
} catch(err) { } catch(err) {
var GB_IMG_DIR = "sapphire/thirdparty/greybox/"; var GB_IMG_DIR = "framework/thirdparty/greybox/";
} }
function GreyBox() { function GreyBox() {

2
thirdparty/zend_translate_railsyaml/tests/TestHelper.php vendored
View File

@ -46,7 +46,7 @@ error_reporting(E_ALL | E_STRICT);
* distribution. * distribution.
*/ */
$ds = DIRECTORY_SEPARATOR; $ds = DIRECTORY_SEPARATOR;
$zfRoot = realpath(dirname(dirname(dirname(__FILE__)))) . $ds . 'sapphire' . $ds . 'thirdparty'; $zfRoot = realpath(dirname(dirname(dirname(__FILE__)))) . $ds . 'framework' . $ds . 'thirdparty';
$zfCoreLibrary = "$zfRoot"; $zfCoreLibrary = "$zfRoot";
$zfCoreTests = "$zfRoot/tests"; $zfCoreTests = "$zfRoot/tests";
$zfCustomLibrary = realpath(dirname(dirname(__FILE__))) . $ds . 'library'; $zfCustomLibrary = realpath(dirname(dirname(__FILE__))) . $ds . 'library';