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

MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-26 05:08:08 +00:00 committed by Sam Minnee
parent e550de71e3
commit 03c5caea72
24 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.php
View File

@ -54,7 +54,7 @@ Object::useCustomClass('Datetime', 'SS_Datetime', true);
/** /**
* The root directory of TinyMCE * The root directory of TinyMCE
*/ */
define('MCE_ROOT', 'jsparty/tiny_mce/'); define('MCE_ROOT', 'sapphire/thirdparty/tinymce/');
/** /**
* The secret key that needs to be sent along with pings to /Email_BounceHandler * The secret key that needs to be sent along with pings to /Email_BounceHandler

4
core/Core.php
View File

@ -100,14 +100,14 @@ define('BASE_PATH', rtrim(dirname(dirname($_SERVER['SCRIPT_FILENAME'])), DIRECTO
define('BASE_URL', rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), DIRECTORY_SEPARATOR)); define('BASE_URL', rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), DIRECTORY_SEPARATOR));
define('MODULES_DIR', 'modules'); define('MODULES_DIR', 'modules');
define('MODULES_PATH', BASE_PATH . '/' . MODULES_DIR); define('MODULES_PATH', BASE_PATH . '/' . MODULES_DIR);
define('THIRDPARTY_DIR', 'jsparty');
define('THIRDPARTY_PATH', BASE_PATH . '/' . THIRDPARTY_DIR);
define('THEMES_DIR', 'themes'); define('THEMES_DIR', 'themes');
define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR); define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR);
define('SAPPHIRE_DIR', 'sapphire'); define('SAPPHIRE_DIR', 'sapphire');
define('SAPPHIRE_PATH', BASE_PATH . '/' . SAPPHIRE_DIR); define('SAPPHIRE_PATH', BASE_PATH . '/' . SAPPHIRE_DIR);
define('CMS_DIR', 'cms'); define('CMS_DIR', 'cms');
define('CMS_PATH', BASE_PATH . '/' . CMS_DIR); define('CMS_PATH', BASE_PATH . '/' . CMS_DIR);
define('THIRDPARTY_DIR', SAPPHIRE_DIR . '/thirdparty');
define('THIRDPARTY_PATH', BASE_PATH . '/' . THIRDPARTY_DIR);
define('ASSETS_DIR', 'assets'); define('ASSETS_DIR', 'assets');
define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR); define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);

4
core/Requirements.php
View File

@ -137,7 +137,7 @@ class Requirements {
* Register the given stylesheet file as required. * Register the given stylesheet file as required.
* See {@link Requirements_Backend::css()} * See {@link Requirements_Backend::css()}
* *
* @param $file String Filenames should be relative to the base, eg, 'jsparty/tree/tree.css' * @param $file String Filenames should be relative to the base, eg, 'sapphire/javascript/tree/tree.css'
* @param $media String Comma-separated list of media-types (e.g. "screen,projector") * @param $media String Comma-separated list of media-types (e.g. "screen,projector")
* @see http://www.w3.org/TR/REC-CSS2/media.html * @see http://www.w3.org/TR/REC-CSS2/media.html
*/ */
@ -476,7 +476,7 @@ class Requirements_Backend {
/** /**
* Register the given stylesheet file as required. * Register the given stylesheet file as required.
* *
* @param $file String Filenames should be relative to the base, eg, 'jsparty/tree/tree.css' * @param $file String Filenames should be relative to the base, eg, 'sapphire/javascript/tree/tree.css'
* @param $media String Comma-separated list of media-types (e.g. "screen,projector") * @param $media String Comma-separated list of media-types (e.g. "screen,projector")
* @see http://www.w3.org/TR/REC-CSS2/media.html * @see http://www.w3.org/TR/REC-CSS2/media.html
*/ */

4
core/control/ContentController.php
View File

@ -289,8 +289,8 @@ class ContentController extends Controller {
if(Director::isDev() || Permission::check('CMS_ACCESS_CMSMain')) { if(Director::isDev() || Permission::check('CMS_ACCESS_CMSMain')) {
Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css'); Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/behaviour.js');
// Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); // Requirements::javascript(THIRDPARTY_DIR . '/prototype/prototype.js');
Requirements::customScript(<<<JS Requirements::customScript(<<<JS
Behaviour.register({ Behaviour.register({
'#switchView a' : { '#switchView a' : {

9
core/model/SiteTree.php
View File

@ -167,13 +167,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* -openfolder.gif and -closedfolder.gif will be appended to the base name * -openfolder.gif and -closedfolder.gif will be appended to the base name
* that you provide there. * that you provide there.
* If you prefer, you can pass an array: * If you prefer, you can pass an array:
* array("jsparty\tree\images\page", $option). * array("sapphire\thirdparty\tree\images\page", $option).
* $option can be either "file" or "folder" to force the icon to always * $option can be either "file" or "folder" to force the icon to always
* be a file or folder, regardless of whether the page has children or not * be a file or folder, regardless of whether the page has children or not
* *
* @var string|array * @var string|array
*/ */
static $icon = array("jsparty/tree/images/page", "file"); static $icon = array("sapphire/javascript/tree/images/page", "file");
static $extensions = array( static $extensions = array(
@ -1496,9 +1496,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
*/ */
function getCMSFields() { function getCMSFields() {
require_once("forms/Form.php"); require_once("forms/Form.php");
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour_improvements.js");
Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js"); Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js");
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/UpdateURL.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/UpdateURL.js');

4
forms/CalendarDateField.php
View File

@ -16,8 +16,8 @@ HTML;
} }
function Field() { function Field() {
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/calendar/calendar.js"); Requirements::javascript(THIRDPARTY_DIR . "/calendar/calendar.js");
Requirements::javascript(THIRDPARTY_DIR . "/calendar/lang/calendar-en.js"); Requirements::javascript(THIRDPARTY_DIR . "/calendar/lang/calendar-en.js");
Requirements::javascript(THIRDPARTY_DIR . "/calendar/calendar-setup.js"); Requirements::javascript(THIRDPARTY_DIR . "/calendar/calendar-setup.js");

8
forms/ComplexTableField.php
View File

@ -1072,12 +1072,12 @@ class ComplexTableField_Popup extends Form {
Requirements::css(SAPPHIRE_DIR . '/css/ComplexTableField_popup.css'); Requirements::css(SAPPHIRE_DIR . '/css/ComplexTableField_popup.css');
Requirements::css(CMS_DIR . '/css/typography.css'); Requirements::css(CMS_DIR . '/css/typography.css');
Requirements::css(CMS_DIR . '/css/cms_right.css'); Requirements::css(CMS_DIR . '/css/cms_right.css');
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js");
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/layout_helpers.js");
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . "/javascript/ComplexTableField_popup.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/ComplexTableField_popup.js");

6
forms/ConfirmedPasswordField.php
View File

@ -93,9 +93,9 @@ class ConfirmedPasswordField extends FormField {
} }
function Field() { function Field() {
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/ConfirmedPasswordField.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/ConfirmedPasswordField.js');
$content = ''; $content = '';

6
forms/FileIFrameField.php
View File

@ -52,8 +52,8 @@ class FileIFrameField extends FileField {
Requirements::css(THIRDPARTY_DIR . '/jquery/themes/default/ui.all.css'); Requirements::css(THIRDPARTY_DIR . '/jquery/themes/default/ui.all.css');
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/ui.core.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.dialog.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/ui.dialog.js');
if($this->form->getRecord() && $this->form->getRecord()->exists()) { if($this->form->getRecord() && $this->form->getRecord()->exists()) {
return $this->createTag ( return $this->createTag (
@ -97,7 +97,7 @@ class FileIFrameField extends FileField {
// clear the requirements added by any parent controllers // clear the requirements added by any parent controllers
Requirements::clear(); Requirements::clear();
Requirements::add_i18n_javascript('sapphire/javascript/lang'); Requirements::add_i18n_javascript('sapphire/javascript/lang');
Requirements::javascript('jsparty/jquery/jquery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript('sapphire/javascript/FileIFrameField.js'); Requirements::javascript('sapphire/javascript/FileIFrameField.js');
Requirements::css('cms/css/typography.css'); Requirements::css('cms/css/typography.css');

16
forms/HtmlEditorField.php
View File

@ -200,8 +200,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
* @return Form * @return Form
*/ */
function LinkForm() { function LinkForm() {
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js");
$form = new Form( $form = new Form(
$this->controller, $this->controller,
@ -246,9 +246,9 @@ class HtmlEditorField_Toolbar extends RequestHandler {
* @return Form * @return Form
*/ */
function ImageForm() { function ImageForm() {
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . '/SWFUpload/swfupload.js'); Requirements::javascript(CMS_DIR . '/thirdparty/swfupload/swfupload.js');
Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js");
Requirements::javascript(CMS_DIR . '/javascript/Upload.js'); Requirements::javascript(CMS_DIR . '/javascript/Upload.js');
Requirements::css(CMS_DIR .'/css/TinyMCEImageEnhancement.css'); Requirements::css(CMS_DIR .'/css/TinyMCEImageEnhancement.css');
Requirements::javascript(CMS_DIR . '/javascript/TinyMCEImageEnhancement.js'); Requirements::javascript(CMS_DIR . '/javascript/TinyMCEImageEnhancement.js');
@ -309,10 +309,10 @@ class HtmlEditorField_Toolbar extends RequestHandler {
} }
function FlashForm() { function FlashForm() {
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(CMS_DIR . '/javascript/Upload.js'); Requirements::javascript(CMS_DIR . '/javascript/Upload.js');
Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . '/SWFUpload/swfupload.js'); Requirements::javascript(CMS_DIR . '/thirdparty/swfupload/swfupload.js');
$form = new Form( $form = new Form(
$this->controller, $this->controller,

4
forms/ImageFormAction.php
View File

@ -22,8 +22,8 @@ class ImageFormAction extends FormAction {
parent::__construct($action, $title, $form); parent::__construct($action, $title, $form);
} }
function Field() { function Field() {
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/ImageFormAction.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/ImageFormAction.js');
$classClause = ''; $classClause = '';

2
forms/SelectionGroup.php
View File

@ -80,7 +80,7 @@ class SelectionGroup extends CompositeField {
function FieldHolder() { function FieldHolder() {
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/SelectionGroup.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/SelectionGroup.js');
Requirements::css(SAPPHIRE_DIR . '/css/SelectionGroup.css'); Requirements::css(SAPPHIRE_DIR . '/css/SelectionGroup.css');

12
forms/TabSet.php
View File

@ -49,13 +49,13 @@ class TabSet extends CompositeField {
* The HTML is a standardised format, containing a &lt;ul; * The HTML is a standardised format, containing a &lt;ul;
*/ */
public function FieldHolder() { public function FieldHolder() {
Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js");
Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js");
Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css");

6
forms/TableField.php
View File

@ -500,9 +500,9 @@ class TableField extends TableListField {
* Sets the template to be rendered with * Sets the template to be rendered with
*/ */
function FieldHolder() { function FieldHolder() {
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js');

6
forms/TableListField.php
View File

@ -284,9 +284,9 @@ class TableListField extends FormField {
} }
function FieldHolder() { function FieldHolder() {
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js');

6
forms/ToggleCompositeField.php
View File

@ -21,9 +21,9 @@ class ToggleCompositeField extends CompositeField {
} }
public function FieldHolder() { public function FieldHolder() {
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleCompositeField.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleCompositeField.js");
return $this->renderWith("ToggleCompositeField"); return $this->renderWith("ToggleCompositeField");

6
forms/ToggleField.php
View File

@ -49,9 +49,9 @@ class ToggleField extends ReadonlyField {
function Field() { function Field() {
$content = ''; $content = '';
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleField.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleField.js");
if($this->startClosed) $this->addExtraClass('startClosed'); if($this->startClosed) $this->addExtraClass('startClosed');

6
forms/TreeDropdownField.php
View File

@ -40,9 +40,9 @@ class TreeDropdownField extends FormField {
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(THIRDPARTY_DIR . '/tree/tree.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/tree/tree.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/TreeSelectorField.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/TreeSelectorField.js');
Requirements::css(THIRDPARTY_DIR . '/tree/tree.css'); Requirements::css(THIRDPARTY_DIR . '/tree/tree.css');

6
forms/TreeSelectorField.php
View File

@ -13,9 +13,9 @@ class TreeSelectorField extends FormField {
} }
function Field() { function Field() {
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . "/javascript/TreeSelectorField.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/TreeSelectorField.js");

6
forms/Validator.php
View File

@ -172,9 +172,9 @@ abstract class Validator extends Object {
function includeJavascriptValidation() { function includeJavascriptValidation() {
if($this->getJavascriptValidationHandler() == 'prototype') { if($this->getJavascriptValidationHandler() == 'prototype') {
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::javascript(SAPPHIRE_DIR . "/javascript/Validator.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/Validator.js");

8
security/Member.php
View File

@ -1320,12 +1320,12 @@ class Member_ProfileForm extends Form {
Requirements::clear(); Requirements::clear();
Requirements::css(CMS_DIR . '/css/typography.css'); Requirements::css(CMS_DIR . '/css/typography.css');
Requirements::css(CMS_DIR . '/css/cms_right.css'); Requirements::css(CMS_DIR . '/css/cms_right.css');
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.js");
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/layout_helpers.js");
Requirements::css(SAPPHIRE_DIR . "/css/Form.css"); Requirements::css(SAPPHIRE_DIR . "/css/Form.css");
Requirements::css(SAPPHIRE_DIR . "/css/MemberProfileForm.css"); Requirements::css(SAPPHIRE_DIR . "/css/MemberProfileForm.css");

28
security/Security.php
View File

@ -327,10 +327,10 @@ class Security extends Controller {
// only display tabs when more than one authenticator is provided // only display tabs when more than one authenticator is provided
// to save bandwidth and reduce the amount of custom styling needed // to save bandwidth and reduce the amount of custom styling needed
if(count($forms) > 1) { if(count($forms) > 1) {
Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/effects.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/effects.js");
Requirements::css(SAPPHIRE_DIR . "/css/Form.css"); Requirements::css(SAPPHIRE_DIR . "/css/Form.css");
@ -339,8 +339,8 @@ class Security extends Controller {
$link_base = Director::absoluteURL($this->Link("login")); $link_base = Director::absoluteURL($this->Link("login"));
Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js");
Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js");
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js");
Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css");
@ -393,10 +393,10 @@ class Security extends Controller {
* @return string Returns the "lost password" page as HTML code. * @return string Returns the "lost password" page as HTML code.
*/ */
public function lostpassword() { public function lostpassword() {
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
$tmpPage = new Page(); $tmpPage = new Page();
@ -452,10 +452,10 @@ class Security extends Controller {
* @return string Returns the "password sent" page as HTML code. * @return string Returns the "password sent" page as HTML code.
*/ */
public function passwordsent($request) { public function passwordsent($request) {
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
$tmpPage = new Page(); $tmpPage = new Page();

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 + "jsparty/greybox/"; var GB_IMG_DIR = theBaseHref + "sapphire/thirdparty/greybox/";
} catch(err) { } catch(err) {
var GB_IMG_DIR = "jsparty/greybox/"; var GB_IMG_DIR = "sapphire/thirdparty/greybox/";
} }
function GreyBox() { function GreyBox() {

2
thirdparty/tinymce-advcode/dialog.html vendored
View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title>{#advcode_dlg.title}</title> <title>{#advcode_dlg.title}</title>
<script type="text/javascript" src="../tiny_mce/tiny_mce_popup.js"></script> <script type="text/javascript" src="../../thirdparty/tinymce/tiny_mce_popup.js"></script>
<script type="text/javascript" src="js/dialog.js"></script> <script type="text/javascript" src="js/dialog.js"></script>
<script type="text/javascript" src="js/codepress/codepress.js"></script> <script type="text/javascript" src="js/codepress/codepress.js"></script>
</head> </head>