mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
928529d04b
commit
ce3365d095
@ -86,7 +86,7 @@ class AssetAdmin extends LeftAndMain {
|
|||||||
|
|
||||||
Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
|
Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
|
||||||
Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
|
Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/SWFUpload/swfupload.js");
|
Requirements::javascript(CMS_DIR . "/thirdparty/swfupload/swfupload.js");
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
|
Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
|
Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
|
||||||
@ -97,9 +97,9 @@ class AssetAdmin extends LeftAndMain {
|
|||||||
Requirements::customScript(<<<JS
|
Requirements::customScript(<<<JS
|
||||||
_TREE_ICONS = {};
|
_TREE_ICONS = {};
|
||||||
_TREE_ICONS['Folder'] = {
|
_TREE_ICONS['Folder'] = {
|
||||||
fileIcon: 'jsparty/tree/images/page-closedfolder.gif',
|
fileIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif',
|
||||||
openFolderIcon: 'jsparty/tree/images/page-openfolder.gif',
|
openFolderIcon: 'sapphire/javascript/tree/images/page-openfolder.gif',
|
||||||
closedFolderIcon: 'jsparty/tree/images/page-closedfolder.gif'
|
closedFolderIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif'
|
||||||
};
|
};
|
||||||
JS
|
JS
|
||||||
);
|
);
|
||||||
@ -111,14 +111,14 @@ JS
|
|||||||
function uploadiframe() {
|
function uploadiframe() {
|
||||||
Requirements::clear();
|
Requirements::clear();
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/prototype.js");
|
Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/loader.js");
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.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 . "/layout_helpers.js");
|
Requirements::javascript(SAPPHIRE_DIR . "/javascript/layout_helpers.js");
|
||||||
Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
|
Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/multifile/multifile.js");
|
Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js");
|
||||||
Requirements::css(THIRDPARTY_DIR . "/multifile/multifile.css");
|
Requirements::css(CMS_DIR . "/thirdparty/multifile/multifile.css");
|
||||||
Requirements::css(CMS_DIR . "/css/typography.css");
|
Requirements::css(CMS_DIR . "/css/typography.css");
|
||||||
Requirements::css(CMS_DIR . "/css/layout.css");
|
Requirements::css(CMS_DIR . "/css/layout.css");
|
||||||
Requirements::css(CMS_DIR . "/css/cms_left.css");
|
Requirements::css(CMS_DIR . "/css/cms_left.css");
|
||||||
|
@ -989,9 +989,9 @@ JS;
|
|||||||
function canceldraftchangesdialog() {
|
function canceldraftchangesdialog() {
|
||||||
Requirements::clear();
|
Requirements::clear();
|
||||||
Requirements::css(CMS_DIR . 'css/dialog.css');
|
Requirements::css(CMS_DIR . 'css/dialog.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(CMS_DIR . '/javascript/dialog.js');
|
Requirements::javascript(CMS_DIR . '/javascript/dialog.js');
|
||||||
|
|
||||||
$message = _t('CMSMain.COPYPUBTOSTAGE',"Do you really want to copy the published content to the stage site?");
|
$message = _t('CMSMain.COPYPUBTOSTAGE',"Do you really want to copy the published content to the stage site?");
|
||||||
|
@ -22,7 +22,7 @@ class ImageEditor extends Controller {
|
|||||||
*/
|
*/
|
||||||
public function index() {
|
public function index() {
|
||||||
Requirements::clear();
|
Requirements::clear();
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/scriptaculous.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/scriptaculous.js');
|
||||||
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Utils.js');
|
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Utils.js');
|
||||||
//Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageHistory.js');
|
//Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageHistory.js');
|
||||||
@ -37,8 +37,8 @@ class ImageEditor extends Controller {
|
|||||||
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js');
|
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js');
|
||||||
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js');
|
Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js');
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
|
||||||
Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
|
Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
|
||||||
Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css');
|
Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css');
|
||||||
|
|
||||||
|
@ -164,23 +164,23 @@ class LeftAndMain extends Controller {
|
|||||||
// Firebug is a useful console for debugging javascript
|
// Firebug is a useful console for debugging javascript
|
||||||
// Its available as a Firefox extension or a javascript library
|
// Its available as a Firefox extension or a javascript library
|
||||||
// for easy inclusion in other browsers (just append ?debug_firebug=1 to the URL)
|
// for easy inclusion in other browsers (just append ?debug_firebug=1 to the URL)
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebug-lite-compressed.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/firebug-lite/firebug.js');
|
||||||
} else {
|
} else {
|
||||||
// By default, we include fake-objects for all firebug calls
|
// By default, we include fake-objects for all firebug calls
|
||||||
// to avoid javascript errors when referencing console.log() etc in javascript code
|
// to avoid javascript errors when referencing console.log() etc in javascript code
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebugx.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/firebug-lite/firebugx.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.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 . '/behaviour.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.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/core/jquery.ondemand.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/hover.js');
|
Requirements::javascript(CMS_DIR . '/javascript/hover.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::add_i18n_javascript(CMS_DIR . '/javascript/lang');
|
Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
|
||||||
|
|
||||||
@ -192,7 +192,7 @@ class LeftAndMain extends Controller {
|
|||||||
Requirements::javascript(THIRDPARTY_DIR . '/greybox/AmiJS.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/greybox/AmiJS.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/greybox/greybox.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/greybox/greybox.js');
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/tree/tree.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/tree/tree.js');
|
||||||
Requirements::css(THIRDPARTY_DIR . '/tree/tree.css');
|
Requirements::css(THIRDPARTY_DIR . '/tree/tree.css');
|
||||||
|
|
||||||
Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
|
Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
|
||||||
@ -224,56 +224,56 @@ class LeftAndMain extends Controller {
|
|||||||
Requirements::combine_files(
|
Requirements::combine_files(
|
||||||
'assets/base.js',
|
'assets/base.js',
|
||||||
array(
|
array(
|
||||||
'jsparty/prototype.js',
|
THIRDPARTY_DIR . '/prototype/prototype.js',
|
||||||
'jsparty/behaviour.js',
|
THIRDPARTY_DIR . '/behaviour/behaviour.js',
|
||||||
'jsparty/prototype_improvements.js',
|
SAPPHIRE_DIR . '/javascript/prototype_improvements.js',
|
||||||
'jsparty/jquery/jquery.js',
|
THIRDPARTY_DIR .'/jquery/jquery.js',
|
||||||
'jsparty/jquery/plugins/livequery/jquery.livequery.js',
|
THIRDPARTY_DIR .'/jquery-livequery/jquery.livequery.js',
|
||||||
'jsparty/jquery/plugins/effen/jquery.fn.js',
|
THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js',
|
||||||
'sapphire/javascript/core/jquery.ondemand.js',
|
SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js',
|
||||||
'jsparty/jquery/jquery_improvements.js',
|
SAPPHIRE_DIR . '/javascript/jquery_improvements.js',
|
||||||
'jsparty/firebug/firebugx.js',
|
THIRDPARTY_DIR . '/firebug-lite/firebugx.js',
|
||||||
'sapphire/javascript/i18n.js',
|
SAPPHIRE_DIR . '/javascript/i18n.js',
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
Requirements::combine_files(
|
Requirements::combine_files(
|
||||||
'assets/leftandmain.js',
|
'assets/leftandmain.js',
|
||||||
array(
|
array(
|
||||||
'jsparty/loader.js',
|
SAPPHIRE_DIR . '/javascript/loader.js',
|
||||||
'jsparty/hover.js',
|
CMS_DIR . '/javascript/hover.js',
|
||||||
'jsparty/layout_helpers.js',
|
SAPPHIRE_DIR . '/javascript/layout_helpers.js',
|
||||||
'jsparty/scriptaculous/effects.js',
|
THIRDPARTY_DIR . '/scriptaculous/effects.js',
|
||||||
'jsparty/scriptaculous/dragdrop.js',
|
THIRDPARTY_DIR . '/scriptaculous/dragdrop.js',
|
||||||
'jsparty/scriptaculous/controls.js',
|
THIRDPARTY_DIR . '/scriptaculous/controls.js',
|
||||||
'jsparty/greybox/AmiJS.js',
|
THIRDPARTY_DIR . '/greybox/AmiJS.js',
|
||||||
'jsparty/greybox/greybox.js',
|
THIRDPARTY_DIR . '/greybox/greybox.js',
|
||||||
'cms/javascript/LeftAndMain.js',
|
CMS_DIR . '/javascript/LeftAndMain.js',
|
||||||
'cms/javascript/LeftAndMain_left.js',
|
CMS_DIR . '/javascript/LeftAndMain_left.js',
|
||||||
'cms/javascript/LeftAndMain_right.js',
|
CMS_DIR . '/javascript/LeftAndMain_right.js',
|
||||||
'jsparty/tree/tree.js',
|
SAPPHIRE_DIR . '/javascript/tree/tree.js',
|
||||||
'jsparty/tabstrip/tabstrip.js',
|
THIRDPARTY_DIR . '/tabstrip/tabstrip.js',
|
||||||
'jsparty/SWFUpload/swfupload.js',
|
CMS_DIR . '/thirdparty/swfupload/swfupload.js',
|
||||||
'cms/javascript/Upload.js',
|
CMS_DIR . '/javascript/Upload.js',
|
||||||
'cms/javascript/TinyMCEImageEnhancement.js',
|
CMS_DIR . '/javascript/TinyMCEImageEnhancement.js',
|
||||||
'sapphire/javascript/TreeSelectorField.js',
|
SAPPHIRE_DIR . '/javascript/TreeSelectorField.js',
|
||||||
'cms/javascript/ThumbnailStripField.js',
|
CMS_DIR . '/javascript/ThumbnailStripField.js',
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
Requirements::combine_files(
|
Requirements::combine_files(
|
||||||
'assets/cmsmain.js',
|
'assets/cmsmain.js',
|
||||||
array(
|
array(
|
||||||
'cms/javascript/CMSMain.js',
|
CMS_DIR . '/javascript/CMSMain.js',
|
||||||
'cms/javascript/CMSMain_left.js',
|
CMS_DIR . '/javascript/CMSMain_left.js',
|
||||||
'cms/javascript/CMSMain_right.js',
|
CMS_DIR . '/javascript/CMSMain_right.js',
|
||||||
'cms/javascript/SideTabs.js',
|
CMS_DIR . '/javascript/SideTabs.js',
|
||||||
'cms/javascript/SideReports.js',
|
CMS_DIR . '/javascript/SideReports.js',
|
||||||
'cms/javascript/LangSelector.js',
|
CMS_DIR . '/javascript/LangSelector.js',
|
||||||
'cms/javascript/TranslationTab.js',
|
CMS_DIR . '/javascript/TranslationTab.js',
|
||||||
'jsparty/calendar/calendar.js',
|
THIRDPARTY_DIR . '/calendar/calendar.js',
|
||||||
'jsparty/calendar/lang/calendar-en.js',
|
THIRDPARTY_DIR . '/calendar/lang/calendar-en.js',
|
||||||
'jsparty/calendar/calendar-setup.js',
|
THIRDPARTY_DIR . '/calendar/calendar-setup.js',
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -1073,7 +1073,6 @@ JS;
|
|||||||
*/
|
*/
|
||||||
public function CMSVersion() {
|
public function CMSVersion() {
|
||||||
$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
|
$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
|
||||||
$jspartyVersionFile = file_get_contents('../jsparty/silverstripe_version');
|
|
||||||
$cmsVersionFile = file_get_contents('../cms/silverstripe_version');
|
$cmsVersionFile = file_get_contents('../cms/silverstripe_version');
|
||||||
|
|
||||||
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
|
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
|
||||||
@ -1083,13 +1082,6 @@ JS;
|
|||||||
$sapphireVersion = ($matches) ? $matches[1] : null;
|
$sapphireVersion = ($matches) ? $matches[1] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strstr($jspartyVersionFile, "/jsparty/trunk")) {
|
|
||||||
$jspartyVersion = "trunk";
|
|
||||||
} else {
|
|
||||||
preg_match("/jsparty\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $jspartyVersionFile, $matches);
|
|
||||||
$jspartyVersion = ($matches) ? $matches[1] : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(strstr($cmsVersionFile, "/cms/trunk")) {
|
if(strstr($cmsVersionFile, "/cms/trunk")) {
|
||||||
$cmsVersion = "trunk";
|
$cmsVersion = "trunk";
|
||||||
} else {
|
} else {
|
||||||
@ -1097,10 +1089,10 @@ JS;
|
|||||||
$cmsVersion = ($matches) ? $matches[1] : null;
|
$cmsVersion = ($matches) ? $matches[1] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($sapphireVersion == $jspartyVersion && $jspartyVersion == $cmsVersion) {
|
if($sapphireVersion == $cmsVersion) {
|
||||||
return $sapphireVersion;
|
return $sapphireVersion;
|
||||||
} else {
|
} else {
|
||||||
return "cms: $cmsVersion, sapphire: $sapphireVersion, jsparty: $jspartyVersion";
|
return "cms: $cmsVersion, sapphire: $sapphireVersion";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,12 +144,12 @@ abstract class ModelAdmin extends LeftAndMain {
|
|||||||
Requirements::css(CMS_DIR . '/css/silverstripe.tabs.css'); // follows the jQuery UI theme conventions
|
Requirements::css(CMS_DIR . '/css/silverstripe.tabs.css'); // follows the jQuery UI theme conventions
|
||||||
|
|
||||||
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(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
|
//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
|
||||||
//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
|
//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/form/jquery.form.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/jquery-form/jquery.form.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/effen/jquery.fn.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
|
||||||
Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js');
|
Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
|
|||||||
public function init() {
|
public function init() {
|
||||||
parent::init();
|
parent::init();
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/hover.js");
|
Requirements::javascript(CMS_DIR . '/javascript/hover.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
|
Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
|
||||||
|
|
||||||
// needed for MemberTableField (Requirements not determined before Ajax-Call)
|
// needed for MemberTableField (Requirements not determined before Ajax-Call)
|
||||||
|
@ -188,8 +188,8 @@ class PageCommentInterface extends RequestHandler {
|
|||||||
|
|
||||||
// Shall We use AJAX?
|
// Shall We use AJAX?
|
||||||
if(self::$use_ajax_commenting) {
|
if(self::$use_ajax_commenting) {
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
|
||||||
Requirements::javascript(CMS_DIR . '/javascript/PageCommentInterface.js');
|
Requirements::javascript(CMS_DIR . '/javascript/PageCommentInterface.js');
|
||||||
}
|
}
|
||||||
|
@ -326,7 +326,7 @@ ul.tree span.a.children.Root span.c {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ul.tree span.a.Root span.c {
|
ul.tree span.a.Root span.c {
|
||||||
background: url(../../jsparty/tree/images/i-bottom.gif) no-repeat scroll 0 50%;
|
background: url(../../sapphire/javascript/tree/images/i-bottom.gif) no-repeat scroll 0 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
ul#sitetree.tree ul {
|
ul#sitetree.tree ul {
|
||||||
@ -334,7 +334,7 @@ ul#sitetree.tree ul {
|
|||||||
}
|
}
|
||||||
ul#sitetree.tree ul ul {
|
ul#sitetree.tree ul ul {
|
||||||
padding-left: 16px;
|
padding-left: 16px;
|
||||||
background: url(../../jsparty/tree/images/i-repeater.gif) repeat-y scroll 0 50%;
|
background: url(../../sapphire/javascript/tree/images/i-repeater.gif) repeat-y scroll 0 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* the jQuery theme format
|
* the jQuery theme format
|
||||||
*
|
*
|
||||||
* @todo move generic tab styles into this file
|
* @todo move generic tab styles into this file
|
||||||
* @todo add to silverstripe specific branch of /jsparty/jquery/ui/themes
|
* @todo add to silverstripe specific branch of /sapphire/thirdparty/jquery/ui/themes
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Caution! Ensure accessibility in print and other media types... */
|
/* Caution! Ensure accessibility in print and other media types... */
|
||||||
|
@ -74,7 +74,7 @@ Upload.prototype = {
|
|||||||
button_window_mode : "transparent",
|
button_window_mode : "transparent",
|
||||||
button_width : this.buttonWidth,
|
button_width : this.buttonWidth,
|
||||||
button_height : this.buttonHeight,
|
button_height : this.buttonHeight,
|
||||||
flash_url : 'jsparty/SWFUpload/swfupload.swf', // Relative to this file
|
flash_url : 'cms/thirdparty/swfupload/swfupload.swf', // Relative to this file
|
||||||
swfupload_loaded_handler: this.buildUI.bind(this),
|
swfupload_loaded_handler: this.buildUI.bind(this),
|
||||||
debug: false,
|
debug: false,
|
||||||
preserve_relative_urls: true
|
preserve_relative_urls: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
<title>Insert a Macron</title>
|
<title>Insert a Macron</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/macron.js"></script>
|
<script type="text/javascript" src="js/macron.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body id="charmap" style="display:none">
|
<body id="charmap" style="display:none">
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<% require javascript(jsparty/tabstrip/tabstrip.js) %>
|
<% require javascript(sapphire/thirdparty/tabstrip/tabstrip.js) %>
|
||||||
<% require css(jsparty/tabstrip/tabstrip.css) %>
|
<% require css(sapphire/thirdparty/tabstrip/tabstrip.css) %>
|
||||||
|
|
||||||
<div id="LeftPane">
|
<div id="LeftPane">
|
||||||
<div id="SearchForm_holder" class="leftbottom">
|
<div id="SearchForm_holder" class="leftbottom">
|
||||||
|
Loading…
Reference in New Issue
Block a user