Skip to content
Browse files

MINOR Fixed remaining references to jsparty/ directory in CSS and PHP…

… files

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92750 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent cfcaa54 commit d0d676b1b0c955e83d8c9523ff1bd98396727034 @chillu chillu committed
Showing with 10 additions and 26 deletions.
  1. +3 −3 code/AssetAdmin.php
  2. +4 −17 code/LeftAndMain.php
  3. +2 −2 css/cms_left.css
  4. +1 −1 css/silverstripe.tabs.css
  5. +0 −3 templates/Includes/ModelAdmin_left.ss
View
6 code/AssetAdmin.php
@@ -97,9 +97,9 @@ function init() {
Requirements::customScript(<<<JS
_TREE_ICONS = {};
_TREE_ICONS['Folder'] = {
- fileIcon: 'jsparty/tree/images/page-closedfolder.gif',
- openFolderIcon: 'jsparty/tree/images/page-openfolder.gif',
- closedFolderIcon: 'jsparty/tree/images/page-closedfolder.gif'
+ fileIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif',
+ openFolderIcon: 'sapphire/javascript/tree/images/page-openfolder.gif',
+ closedFolderIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif'
};
JS
);
View
21 code/LeftAndMain.php
@@ -249,11 +249,10 @@ function init() {
'sapphire/javascript/prototype_improvements.js',
'sapphire/thirdparty/jquery/jquery.js',
'sapphire/thirdparty/jquery-livequery/jquery.livequery.js',
- 'jsparty/jquery/plugins/effen/jquery.fn.js',
'sapphire/javascript/jquery-ondemand/jquery.ondemand.js',
'sapphire/javascript/jquery_improvements.js',
- 'sapphire/jsparty/firebug-lite/firebug.js',
- 'sapphire/jsparty/firebug-lite/firebugx.js',
+ 'sapphire/thirdparty/firebug-lite/firebug.js',
+ 'sapphire/thirdparty/firebug-lite/firebugx.js',
'sapphire/javascript/i18n.js',
)
);
@@ -267,7 +266,7 @@ function init() {
'cms/javascript/LeftAndMain.js',
'cms/javascript/LeftAndMain_left.js',
'cms/javascript/LeftAndMain_right.js',
- 'jsparty/tree/tree.js',
+ 'sapphire/javascript/tree/tree.js',
'cms/javascript/TinyMCEImageEnhancement.js',
'cms/thirdparty/swfupload/swfupload.js',
'cms/javascript/Upload.js',
@@ -899,7 +898,6 @@ public function EditorToolbar() {
*/
public function CMSVersion() {
$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
- $jspartyVersionFile = file_get_contents('../jsparty/silverstripe_version');
$cmsVersionFile = file_get_contents('../cms/silverstripe_version');
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
@@ -909,13 +907,6 @@ public function CMSVersion() {
$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")) {
$cmsVersion = "trunk";
} else {
@@ -923,11 +914,7 @@ public function CMSVersion() {
$cmsVersion = ($matches) ? $matches[1] : null;
}
- if($sapphireVersion == $jspartyVersion && $jspartyVersion == $cmsVersion) {
- return $sapphireVersion;
- } else {
- return "cms: $cmsVersion, sapphire: $sapphireVersion, jsparty: $jspartyVersion";
- }
+ return "cms: $cmsVersion, sapphire: $sapphireVersion";
}
/**
View
4 css/cms_left.css
@@ -333,7 +333,7 @@ ul.tree span.a.children.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%;
}
#sitetree_ul {
@@ -346,7 +346,7 @@ ul#sitetree.tree ul {
}
ul#sitetree.tree ul ul {
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%;
}
View
2 css/silverstripe.tabs.css
@@ -5,7 +5,7 @@
* the jQuery theme format
*
* @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... */
View
3 templates/Includes/ModelAdmin_left.ss
@@ -1,6 +1,3 @@
-<% require javascript(jsparty/tabstrip/tabstrip.js) %>
-<% require css(jsparty/tabstrip/tabstrip.css) %>
-
<div id="LeftPane">
<div id="SearchForm_holder" class="leftbottom">
<% if SearchClassSelector = tabs %>

0 comments on commit d0d676b

Please sign in to comment.
Something went wrong with that request. Please try again.