From 03c5caea724b1abef767f1f9e22d03ba40b5bc4f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 26 Nov 2009 05:08:08 +0000 Subject: [PATCH] MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- _config.php | 2 +- core/Core.php | 4 ++-- core/Requirements.php | 4 ++-- core/control/ContentController.php | 4 ++-- core/model/SiteTree.php | 9 ++++----- forms/CalendarDateField.php | 4 ++-- forms/ComplexTableField.php | 8 ++++---- forms/ConfirmedPasswordField.php | 6 +++--- forms/FileIFrameField.php | 6 +++--- forms/HtmlEditorField.php | 16 +++++++-------- forms/ImageFormAction.php | 4 ++-- forms/SelectionGroup.php | 2 +- forms/TabSet.php | 12 +++++------ forms/TableField.php | 6 +++--- forms/TableListField.php | 6 +++--- forms/ToggleCompositeField.php | 6 +++--- forms/ToggleField.php | 6 +++--- forms/TreeDropdownField.php | 6 +++--- forms/TreeSelectorField.php | 6 +++--- forms/Validator.php | 6 +++--- security/Member.php | 8 ++++---- security/Security.php | 28 +++++++++++++------------- thirdparty/greybox/greybox.js | 4 ++-- thirdparty/tinymce-advcode/dialog.html | 2 +- 24 files changed, 82 insertions(+), 83 deletions(-) diff --git a/_config.php b/_config.php index 178ff9bf5..fc16de167 100755 --- a/_config.php +++ b/_config.php @@ -54,7 +54,7 @@ Object::useCustomClass('Datetime', 'SS_Datetime', true); /** * 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 diff --git a/core/Core.php b/core/Core.php index d4edc8a54..a3539756d 100755 --- a/core/Core.php +++ b/core/Core.php @@ -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('MODULES_DIR', 'modules'); define('MODULES_PATH', BASE_PATH . '/' . MODULES_DIR); -define('THIRDPARTY_DIR', 'jsparty'); -define('THIRDPARTY_PATH', BASE_PATH . '/' . THIRDPARTY_DIR); define('THEMES_DIR', 'themes'); define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR); define('SAPPHIRE_DIR', 'sapphire'); define('SAPPHIRE_PATH', BASE_PATH . '/' . SAPPHIRE_DIR); define('CMS_DIR', 'cms'); 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_PATH', BASE_PATH . '/' . ASSETS_DIR); diff --git a/core/Requirements.php b/core/Requirements.php index e6a24e373..cdf612650 100644 --- a/core/Requirements.php +++ b/core/Requirements.php @@ -137,7 +137,7 @@ class Requirements { * Register the given stylesheet file as required. * 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") * @see http://www.w3.org/TR/REC-CSS2/media.html */ @@ -476,7 +476,7 @@ class Requirements_Backend { /** * 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") * @see http://www.w3.org/TR/REC-CSS2/media.html */ diff --git a/core/control/ContentController.php b/core/control/ContentController.php index 5b3e53687..d0aacf988 100755 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -289,8 +289,8 @@ class ContentController extends Controller { if(Director::isDev() || Permission::check('CMS_ACCESS_CMSMain')) { Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - // Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/behaviour.js'); + // Requirements::javascript(THIRDPARTY_DIR . '/prototype/prototype.js'); Requirements::customScript(<<form->getRecord() && $this->form->getRecord()->exists()) { return $this->createTag ( @@ -97,7 +97,7 @@ class FileIFrameField extends FileField { // clear the requirements added by any parent controllers Requirements::clear(); 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::css('cms/css/typography.css'); diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php index 558c5bfff..b4081e461 100755 --- a/forms/HtmlEditorField.php +++ b/forms/HtmlEditorField.php @@ -200,8 +200,8 @@ class HtmlEditorField_Toolbar extends RequestHandler { * @return Form */ function LinkForm() { - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js"); $form = new Form( $this->controller, @@ -246,9 +246,9 @@ class HtmlEditorField_Toolbar extends RequestHandler { * @return Form */ function ImageForm() { - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . '/SWFUpload/swfupload.js'); - Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(CMS_DIR . '/thirdparty/swfupload/swfupload.js'); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js"); Requirements::javascript(CMS_DIR . '/javascript/Upload.js'); Requirements::css(CMS_DIR .'/css/TinyMCEImageEnhancement.css'); Requirements::javascript(CMS_DIR . '/javascript/TinyMCEImageEnhancement.js'); @@ -309,10 +309,10 @@ class HtmlEditorField_Toolbar extends RequestHandler { } 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(THIRDPARTY_DIR . "/tiny_mce_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . '/SWFUpload/swfupload.js'); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js"); + Requirements::javascript(CMS_DIR . '/thirdparty/swfupload/swfupload.js'); $form = new Form( $this->controller, diff --git a/forms/ImageFormAction.php b/forms/ImageFormAction.php index 613c708e0..9331dc012 100755 --- a/forms/ImageFormAction.php +++ b/forms/ImageFormAction.php @@ -22,8 +22,8 @@ class ImageFormAction extends FormAction { parent::__construct($action, $title, $form); } function Field() { - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/ImageFormAction.js'); $classClause = ''; diff --git a/forms/SelectionGroup.php b/forms/SelectionGroup.php index bb0d08f53..a28629d51 100755 --- a/forms/SelectionGroup.php +++ b/forms/SelectionGroup.php @@ -80,7 +80,7 @@ class SelectionGroup extends CompositeField { function FieldHolder() { 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::css(SAPPHIRE_DIR . '/css/SelectionGroup.css'); diff --git a/forms/TabSet.php b/forms/TabSet.php index 7c1e9c9fe..38873b698 100644 --- a/forms/TabSet.php +++ b/forms/TabSet.php @@ -49,13 +49,13 @@ class TabSet extends CompositeField { * The HTML is a standardised format, containing a <ul; */ public function FieldHolder() { - Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js'); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); - Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); + Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js'); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css"); diff --git a/forms/TableField.php b/forms/TableField.php index cdb6ed3b3..a402c0229 100644 --- a/forms/TableField.php +++ b/forms/TableField.php @@ -500,9 +500,9 @@ class TableField extends TableListField { * Sets the template to be rendered with */ function FieldHolder() { - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js'); diff --git a/forms/TableListField.php b/forms/TableListField.php index 2133ec299..9075920c6 100755 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -284,9 +284,9 @@ class TableListField extends FormField { } function FieldHolder() { - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/TableListField.js'); diff --git a/forms/ToggleCompositeField.php b/forms/ToggleCompositeField.php index 7f6a92b58..a63bb851c 100755 --- a/forms/ToggleCompositeField.php +++ b/forms/ToggleCompositeField.php @@ -21,9 +21,9 @@ class ToggleCompositeField extends CompositeField { } public function FieldHolder() { - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleCompositeField.js"); return $this->renderWith("ToggleCompositeField"); diff --git a/forms/ToggleField.php b/forms/ToggleField.php index faf07e8d8..fb36cecb7 100755 --- a/forms/ToggleField.php +++ b/forms/ToggleField.php @@ -49,9 +49,9 @@ class ToggleField extends ReadonlyField { function Field() { $content = ''; - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleField.js"); if($this->startClosed) $this->addExtraClass('startClosed'); diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php index 044f581ec..e09822e76 100755 --- a/forms/TreeDropdownField.php +++ b/forms/TreeDropdownField.php @@ -40,9 +40,9 @@ class TreeDropdownField extends FormField { Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/tree/tree.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/tree/tree.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/TreeSelectorField.js'); Requirements::css(THIRDPARTY_DIR . '/tree/tree.css'); diff --git a/forms/TreeSelectorField.php b/forms/TreeSelectorField.php index 75a4161f9..785007703 100755 --- a/forms/TreeSelectorField.php +++ b/forms/TreeSelectorField.php @@ -13,9 +13,9 @@ class TreeSelectorField extends FormField { } function Field() { - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::javascript(SAPPHIRE_DIR . "/javascript/TreeSelectorField.js"); diff --git a/forms/Validator.php b/forms/Validator.php index 88f5aca8e..9bcd66cd2 100755 --- a/forms/Validator.php +++ b/forms/Validator.php @@ -172,9 +172,9 @@ abstract class Validator extends Object { function includeJavascriptValidation() { if($this->getJavascriptValidationHandler() == 'prototype') { - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::javascript(SAPPHIRE_DIR . "/javascript/Validator.js"); diff --git a/security/Member.php b/security/Member.php index c8f6a5662..e3c5c436f 100644 --- a/security/Member.php +++ b/security/Member.php @@ -1320,12 +1320,12 @@ class Member_ProfileForm extends Form { Requirements::clear(); Requirements::css(CMS_DIR . '/css/typography.css'); Requirements::css(CMS_DIR . '/css/cms_right.css'); - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/scriptaculous.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/MemberProfileForm.css"); diff --git a/security/Security.php b/security/Security.php index 9627fcb8a..154196084 100644 --- a/security/Security.php +++ b/security/Security.php @@ -327,10 +327,10 @@ class Security extends Controller { // only display tabs when more than one authenticator is provided // to save bandwidth and reduce the amount of custom styling needed if(count($forms) > 1) { - Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js'); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/effects.js"); Requirements::css(SAPPHIRE_DIR . "/css/Form.css"); @@ -339,8 +339,8 @@ class Security extends Controller { $link_base = Director::absoluteURL($this->Link("login")); Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery.js"); - Requirements::javascript(THIRDPARTY_DIR . "/jquery/jquery_improvements.js"); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/jquery_improvements.js"); + Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js'); Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js"); 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. */ public function lostpassword() { - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); $tmpPage = new Page(); @@ -452,10 +452,10 @@ class Security extends Controller { * @return string Returns the "password sent" page as HTML code. */ public function passwordsent($request) { - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); $tmpPage = new Page(); diff --git a/thirdparty/greybox/greybox.js b/thirdparty/greybox/greybox.js index 51010999d..268851c8c 100755 --- a/thirdparty/greybox/greybox.js +++ b/thirdparty/greybox/greybox.js @@ -20,9 +20,9 @@ var GB_ONLY_ONE = null; // modified 2006-01-06 by Silverstripe Ltd. try { var theBaseHref = document.getElementsByTagName("base")[0].href; - var GB_IMG_DIR = theBaseHref + "jsparty/greybox/"; + var GB_IMG_DIR = theBaseHref + "sapphire/thirdparty/greybox/"; } catch(err) { - var GB_IMG_DIR = "jsparty/greybox/"; + var GB_IMG_DIR = "sapphire/thirdparty/greybox/"; } function GreyBox() { diff --git a/thirdparty/tinymce-advcode/dialog.html b/thirdparty/tinymce-advcode/dialog.html index 8591068e6..85e954d45 100644 --- a/thirdparty/tinymce-advcode/dialog.html +++ b/thirdparty/tinymce-advcode/dialog.html @@ -1,7 +1,7 @@ {#advcode_dlg.title} - +