Permalink
Browse files

API-CHANGE sapphire folder can now be renamed.

  • Loading branch information...
1 parent f8082e4 commit 3a6341a25113be0f65f96a1317543e583bf318d0 @simonwelsh simonwelsh committed with halkyon Mar 24, 2012
Showing with 618 additions and 585 deletions.
  1. +4 −4 README.md
  2. +3 −3 _config.php
  3. +1 −1 _register_database.php
  4. +3 −2 admin/_config.php
  5. +43 −43 admin/code/LeftAndMain.php
  6. +2 −2 admin/code/MemberImportForm.php
  7. +1 −1 admin/code/ModelAdmin.php
  8. +9 −9 admin/code/SecurityAdmin.php
  9. +3 −3 admin/javascript/LeftAndMain.Tree.js
  10. +2 −2 admin/scss/_forms.scss
  11. +2 −2 admin/templates/Includes/CMSLoadingScreen.ss
  12. +1 −1 admin/templates/LeftAndMain.ss
  13. +1 −1 admin/tests/LeftAndMainTest.php
  14. +1 −1 admin/tests/ModelAdminTest.php
  15. +1 −1 admin/tests/SecurityAdminTest.php
  16. +2 −2 api/DataFormatter.php
  17. +2 −2 api/RestfulServer.php
  18. +2 −2 cli-script.php
  19. +2 −2 conf/ConfigureFromEnv.php
  20. +1 −1 control/Controller.php
  21. +1 −1 control/Director.php
  22. +2 −2 control/NullHTTPRequest.php
  23. +2 −2 control/RequestHandler.php
  24. +1 −1 core/ClassInfo.php
  25. +31 −20 core/Core.php
  26. +1 −1 core/Object.php
  27. +2 −2 core/manifest/ClassManifest.php
  28. +2 −2 css/FileIFrameField.css
  29. +6 −6 css/HasManyFileField.css
  30. +0 −1 dev/BuildTask.php
  31. +1 −1 dev/BulkLoader.php
  32. +2 −2 dev/DevelopmentAdmin.php
  33. +1 −1 dev/FunctionalTest.php
  34. +1 −1 dev/JSTestRunner.php
  35. +3 −13 dev/SapphireInfo.php
  36. +2 −2 dev/SapphireREPL.php
  37. +2 −2 dev/TaskRunner.php
  38. +6 −9 dev/TestRunner.php
  39. +4 −4 dev/install/config-form.html
  40. +3 −2 dev/install/install.php
  41. +23 −34 dev/install/install.php5
  42. +18 −2 dev/phpunit/PhpUnitWrapper.php
  43. +12 −3 dev/phpunit/PhpUnitWrapper_3_4.php
  44. +10 −2 dev/phpunit/PhpUnitWrapper_3_5.php
  45. +1 −1 email/Email.php
  46. +1 −1 email/Mailer.php
  47. +6 −6 filesystem/File.php
  48. +1 −1 filesystem/Folder.php
  49. +2 −2 forms/AjaxUniqueTextField.php
  50. +3 −2 forms/CheckboxSetField.php
  51. +12 −12 forms/ComplexTableField.php
  52. +3 −3 forms/ConfirmedPasswordField.php
  53. +2 −2 forms/DateField.php
  54. +1 −1 forms/DatetimeField.php
  55. +8 −8 forms/FileIFrameField.php
  56. +1 −1 forms/Form.php
  57. +4 −4 forms/HasManyComplexTableField.php
  58. +0 −2 forms/HtmlEditorConfig.php
  59. +4 −4 forms/HtmlEditorField.php
  60. +2 −2 forms/ImageFormAction.php
  61. +3 −3 forms/InlineFormAction.php
  62. +2 −2 forms/NullableField.php
  63. +3 −3 forms/SelectionGroup.php
  64. +6 −6 forms/TabSet.php
  65. +6 −6 forms/TableField.php
  66. +10 −7 forms/TableListField.php
  67. +3 −3 forms/ToggleCompositeField.php
  68. +3 −3 forms/ToggleField.php
  69. +7 −7 forms/TreeDropdownField.php
  70. +8 −8 forms/TreeMultiselectField.php
  71. +7 −7 forms/UploadField.php
  72. +1 −1 forms/Validator.php
  73. +5 −5 forms/gridfield/GridField.php
  74. +1 −1 forms/gridfield/GridFieldPrintButton.php
  75. +3 −3 i18n/i18n.php
  76. +3 −3 i18n/i18nTextCollector.php
  77. +1 −1 lang/ar_SA.php
  78. +1 −1 lang/bg_BG.php
  79. +1 −1 lang/ca_AD.php
  80. +1 −1 lang/cs_CZ.php
  81. +1 −1 lang/da_DK.php
  82. +1 −1 lang/de_DE.php
  83. +1 −1 lang/en_GB.php
  84. +1 −1 lang/eo_XX.php
  85. +1 −1 lang/es_419.php
  86. +1 −1 lang/es_ES.php
  87. +1 −1 lang/es_MX.php
  88. +1 −1 lang/et_EE.php
  89. +1 −1 lang/fi_FI.php
  90. +1 −1 lang/fr_FR.php
  91. +1 −1 lang/he_IL.php
  92. +1 −1 lang/hr_HR.php
  93. +1 −1 lang/hu_HU.php
  94. +1 −1 lang/id_ID.php
  95. +1 −1 lang/it_IT.php
  96. +1 −1 lang/ja_JP.php
  97. +1 −1 lang/lc_XX.php
  98. +1 −1 lang/lt_LT.php
  99. +1 −1 lang/lv_LV.php
  100. +1 −1 lang/ms_MY.php
  101. +1 −1 lang/nb_NO.php
  102. +1 −1 lang/ne_NP.php
  103. +1 −1 lang/nl_NL.php
  104. +1 −1 lang/pl_PL.php
  105. +1 −1 lang/pt_BR.php
  106. +1 −1 lang/pt_PT.php
  107. +1 −1 lang/ru_RU.php
  108. +1 −1 lang/si_LK.php
  109. +1 −1 lang/sk_SK.php
  110. +1 −1 lang/sr_RS.php
  111. +1 −1 lang/sv_SE.php
  112. +1 −1 lang/tr_TR.php
  113. +1 −1 lang/zh_CN.php
  114. +1 −1 lang/zh_TW.php
  115. +4 −4 main.php
  116. +1 −1 model/MySQLDatabase.php
  117. +2 −2 model/fieldtypes/HTMLText.php
  118. +5 −2 parsers/BBCodeParser.php
  119. +11 −8 sake
  120. +3 −3 scss/FileIFrameField.scss
  121. +6 −6 scss/HasManyFileField.scss
  122. +2 −2 security/Group.php
  123. +1 −1 security/Member.php
  124. +2 −2 security/PermissionCheckboxSetField.php
  125. +5 −5 security/Security.php
  126. +1 −1 static-main.php
  127. +6 −6 tasks/ScheduledTask.php
  128. +2 −2 templates/CodeViewer.ss
  129. +3 −3 templates/ComplexTableField.ss
  130. +2 −2 templates/ComplexTableField_popup.ss
  131. +9 −9 templates/Includes/TableListField_PageControls.ss
  132. +1 −1 templates/RelationComplexTableField.ss
  133. +4 −4 templates/SapphireInfo.ss
  134. +3 −3 templates/TableField.ss
  135. +2 −2 templates/TableListField.ss
  136. +2 −2 templates/TestViewer.ss
  137. +3 −3 templates/forms/ToggleCompositeField.ss
  138. +6 −6 tests/FullTestSuite.php
  139. +2 −2 tests/PhpSyntaxTest.php
  140. +9 −6 tests/bootstrap.php
  141. +2 −2 tests/control/DirectorTest.php
  142. +2 −2 tests/core/ClassInfoTest.php
  143. +2 −2 tests/core/CoreTest.php
  144. +29 −29 tests/core/manifest/NamespacedClassManifestTest.php
  145. +3 −3 tests/core/manifest/TokenisedRegularExpressionTest.php
  146. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
  147. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
  148. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
  149. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
  150. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
  151. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
  152. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
  153. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
  154. +2 −2 tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
  155. +1 −1 tests/dev/CsvBulkLoaderTest.php
  156. +5 −5 tests/dev/DeprecationTest.php
  157. +2 −2 tests/forms/LookupFieldTest.php
  158. +1 −1 tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
  159. +2 −2 tests/forms/gridfield/GridFieldDeleteActionTest.php
  160. +2 −2 tests/forms/gridfield/GridFieldEditButtonTest.php
  161. +1 −1 tests/i18n/i18nTest.php
  162. +1 −1 tests/i18n/i18nTextCollectorTest.php
  163. +1 −1 tests/model/DataDifferencerTest.php
  164. +3 −3 tests/model/DataDifferencerTest.yml
  165. +0 −32 tests/salad/step_definitions/db-fixture.rb
  166. +7 −7 tests/templates/RequirementsTest_Conditionals.ss
  167. +3 −3 tests/testing/YamlFixtureTest.php
  168. +6 −6 tests/view/SSViewerTest.php
  169. +3 −3 thirdparty/behaviour/README.md
  170. +2 −2 thirdparty/prototype/prototype.js
  171. +33 −0 view/GenericTemplateGlobalProvider.php
  172. +8 −8 view/Requirements.php
  173. +1 −1 view/SSTemplateParser.php.inc
  174. +1 −1 view/TemplateGlobalProvider.php
View
@@ -5,13 +5,13 @@ Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstrip
## Installation ##
-See [installation on different platforms](http://doc.silverstripe.org/sapphire/en/installation/),
-and [installation from source](http://doc.silverstripe.org/sapphire/en/installation/from-source).
+See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
+and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
## Links ##
- * [Requirements](http://doc.silverstripe.org/sapphire/en/installation/server-requirements)
- * [Changelogs](http://doc.silverstripe.org/sapphire/en/changelogs/)
+ * [Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
+ * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
* [Bugtracker](http://open.silverstripe.org)
* [Forums](http://silverstripe.org/forums)
* [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
View
@@ -1,9 +1,9 @@
<?php
/**
- * Sapphire configuration file
+ * Framework configuration file
*
- * Here you can make different settings for the Sapphire module (the core
+ * Here you can make different settings for the Framework module (the core
* module).
*
* For example you can register the authentication methods you wish to use
@@ -45,7 +45,7 @@
/**
* The root directory of TinyMCE
*/
-define('MCE_ROOT', 'sapphire/thirdparty/tinymce/');
+define('MCE_ROOT', FRAMEWORK_DIR . '/thirdparty/tinymce/');
ShortcodeParser::get('default')->register('file_link', array('File', 'link_shortcode_handler'));
View
@@ -5,7 +5,7 @@
array(
'class' => 'MySQLDatabase',
'title' => 'MySQL 5.0+',
- 'helperPath' => 'sapphire/dev/install/MySQLDatabaseConfigurationHelper.php',
+ 'helperPath' => FRAMEWORK_PATH . '/dev/install/MySQLDatabaseConfigurationHelper.php',
'supported' => function_exists('mysql_connect'),
)
);
View
@@ -22,7 +22,8 @@
'use_native_selects' => true, // fancy selects are bug as of SS 2.3.0
'valid_elements' => "@[id|class|style|title],#a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
- 'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"
+ 'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]",
+ 'spellchecker_rpc_url' => THIRDPARTY_DIR . '/tinymce-spellchecker/rpc.php'
));
HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen');
@@ -34,4 +35,4 @@
HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
-CMSMenu::remove_menu_item('CMSProfileController');
+CMSMenu::remove_menu_item('CMSProfileController');
View
@@ -209,7 +209,7 @@ function init() {
$htmlEditorConfig->setOption('language', i18n::get_tinymce_lang());
if(!$htmlEditorConfig->getOption('content_css')) {
$cssFiles = array();
- $cssFiles[] = 'sapphire/admin/css/editor.css';
+ $cssFiles[] = FRAMEWORK_ADMIN_DIR . '/css/editor.css';
// Use theme from the site config
if(class_exists('SiteConfig') && ($config = SiteConfig::current_site_config()) && $config->Theme) {
@@ -241,32 +241,32 @@ function init() {
array(
THIRDPARTY_DIR . '/jquery/jquery.js',
THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js',
- SAPPHIRE_DIR . '/javascript/jquery-ondemand/jquery.ondemand.js',
- SAPPHIRE_DIR . '/admin/javascript/lib.js',
+ FRAMEWORK_DIR . '/javascript/jquery-ondemand/jquery.ondemand.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/lib.js',
THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js',
THIRDPARTY_DIR . '/json-js/json2.js',
THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js',
THIRDPARTY_DIR . '/jquery-cookie/jquery.cookie.js',
THIRDPARTY_DIR . '/jquery-query/jquery.query.js',
THIRDPARTY_DIR . '/jquery-form/jquery.form.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/jsizes/lib/jquery.sizes.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/jlayout/lib/jlayout.border.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/jlayout/lib/jquery.jlayout.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.adapter.jquery.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.html4.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/jsizes/lib/jquery.sizes.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/jlayout/lib/jlayout.border.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/jlayout/lib/jquery.jlayout.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.adapter.jquery.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.html4.js',
THIRDPARTY_DIR . '/jstree/jquery.jstree.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/chosen/chosen/chosen.jquery.js',
- SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-hoverIntent/jquery.hoverIntent.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/jquery-changetracker/lib/jquery.changetracker.js',
- SAPPHIRE_DIR . '/javascript/TreeDropdownField.js',
- SAPPHIRE_DIR . '/javascript/DateField.js',
- SAPPHIRE_DIR . '/javascript/HtmlEditorField.js',
- SAPPHIRE_DIR . '/javascript/TabSet.js',
- SAPPHIRE_DIR . '/javascript/i18n.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/ssui.core.js',
- SAPPHIRE_DIR . '/javascript/GridField.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/chosen/chosen/chosen.jquery.js',
+ FRAMEWORK_ADMIN_DIR . '/thirdparty/jquery-hoverIntent/jquery.hoverIntent.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/jquery-changetracker/lib/jquery.changetracker.js',
+ FRAMEWORK_DIR . '/javascript/TreeDropdownField.js',
+ FRAMEWORK_DIR . '/javascript/DateField.js',
+ FRAMEWORK_DIR . '/javascript/HtmlEditorField.js',
+ FRAMEWORK_DIR . '/javascript/TabSet.js',
+ FRAMEWORK_DIR . '/javascript/i18n.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/ssui.core.js',
+ FRAMEWORK_DIR . '/javascript/GridField.js',
)
);
@@ -276,36 +276,36 @@ function init() {
'leftandmain.js',
array_unique(array_merge(
array(
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Panel.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Tree.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Ping.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Content.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.EditForm.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Menu.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.AddForm.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Preview.js',
- SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.BatchActions.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Panel.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Tree.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Ping.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Content.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.EditForm.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Menu.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.AddForm.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Preview.js',
+ FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.BatchActions.js',
),
- Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang', true, true),
- Requirements::add_i18n_javascript(SAPPHIRE_ADMIN_DIR . '/javascript/lang', true, true)
+ Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang', true, true),
+ Requirements::add_i18n_javascript(FRAMEWORK_ADMIN_DIR . '/javascript/lang', true, true)
))
);
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.css');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.css');
Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
- Requirements::css(SAPPHIRE_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css');
+ Requirements::css(FRAMEWORK_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css');
Requirements::css(THIRDPARTY_DIR . '/jstree/themes/apple/style.css');
- Requirements::css(SAPPHIRE_DIR . '/css/TreeDropdownField.css');
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
- Requirements::css(SAPPHIRE_DIR . '/css/GridField.css');
+ Requirements::css(FRAMEWORK_DIR . '/css/TreeDropdownField.css');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
+ Requirements::css(FRAMEWORK_DIR . '/css/GridField.css');
// Browser-specific requirements
$ie = isset($_SERVER['HTTP_USER_AGENT']) ? strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') : false;
if($ie) {
$version = substr($_SERVER['HTTP_USER_AGENT'], $ie + 5, 3);
- if($version == 7) Requirements::css('sapphire/admin/css/ie7.css');
- else if($version == 8) Requirements::css('sapphire/admin/css/ie8.css');
+ if($version == 7) Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/ie7.css');
+ else if($version == 8) Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/ie8.css');
}
// Custom requirements
@@ -1078,7 +1078,7 @@ public function printable() {
$form->setActions(null);
Requirements::clear();
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/LeftAndMain_printable.css');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/LeftAndMain_printable.css');
return array(
"PrintForm" => $form
);
@@ -1175,11 +1175,11 @@ public function CMSVersion() {
if(defined('CMS_PATH') && file_exists(CMS_PATH . '/silverstripe_version')) {
$sapphireVersion = file_get_contents(CMS_PATH . '/silverstripe_version');
} else {
- $sapphireVersion = file_get_contents(SAPPHIRE_PATH . '/silverstripe_version');
+ $sapphireVersion = file_get_contents(FRAMEWORK_PATH . '/silverstripe_version');
}
if(!$sapphireVersion) $sapphireVersion = _t('LeftAndMain.VersionUnknown', 'unknown');
return sprintf(
- "sapphire: %s",
+ "SilverStripe: %s",
$sapphireVersion
);
}
@@ -1313,7 +1313,7 @@ function providePermissions() {
/**
* Register the given javascript file as required in the CMS.
- * Filenames should be relative to the base, eg, SAPPHIRE_DIR . '/javascript/loader.js'
+ * Filenames should be relative to the base, eg, FRAMEWORK_DIR . '/javascript/loader.js'
*/
public static function require_javascript($file) {
self::$extra_requirements['javascript'][] = array($file);
@@ -57,8 +57,8 @@ function __construct($controller, $name, $fields = null, $actions = null, $valid
parent::__construct($controller, $name, $fields, $actions, $validator);
- Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
- Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/MemberImportForm.js');
+ Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
+ Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/MemberImportForm.js');
$this->addExtraClass('cms');
$this->addExtraClass('import-form');
@@ -110,7 +110,7 @@ public function init() {
user_error('ModelAdmin::init(): Invalid Model class', E_USER_ERROR);
}
- Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/ModelAdmin.js');
+ Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/ModelAdmin.js');
}
function getEditForm($id = null, $fields = null) {
@@ -31,7 +31,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
public function init() {
parent::init();
- Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/SecurityAdmin.js');
+ Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/SecurityAdmin.js');
}
public function getEditForm($id = null, $fields = null) {
@@ -133,12 +133,12 @@ public function getEditForm($id = null, $fields = null) {
public function memberimport() {
Requirements::clear();
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/MemberImportForm.css');
- Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
- Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/MemberImportForm.js');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/MemberImportForm.css');
+ Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
+ Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/MemberImportForm.js');
return $this->renderWith('BlankPage', array(
'Form' => $this->MemberImportForm()->forTemplate(),
@@ -164,12 +164,12 @@ public function MemberImportForm() {
public function groupimport() {
Requirements::clear();
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
- Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/MemberImportForm.css');
- Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
- Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/MemberImportForm.js');
+ Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/MemberImportForm.css');
+ Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
+ Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/MemberImportForm.js');
return $this->renderWith('BlankPage', array(
'Content' => ' ',
@@ -159,10 +159,10 @@
},
'themes': {
'theme': 'apple',
- 'url': 'sapphire/thirdparty/jstree/themes/apple/style.css'
+ 'url': $('body').data('frameworkpath') + '/thirdparty/jstree/themes/apple/style.css'
},
// Caution: SilverStripe has disabled $.vakata.css.add_sheet() for performance reasons,
- // which means you need to add any CSS manually to sapphire/admin/scss/_tree.css
+ // which means you need to add any CSS manually to framework/admin/scss/_tree.css
'plugins': [
'html_data', 'ui', 'dnd', 'crrm', 'themes',
'checkbox' // checkboxes are hidden unless .multiple is set
@@ -338,4 +338,4 @@
}
});
});
-}(jQuery));
+}(jQuery));
View
@@ -1,6 +1,6 @@
/**
* This file defines common styles for form elements used throughout the CMS interface.
- * It is an addition to the base styles defined in sapphire/css/Form.css.
+ * It is an addition to the base styles defined in framework/css/Form.css.
*
* @package sapphire
* @subpackage admin
@@ -504,4 +504,4 @@ input.radio {
.action-hidden {
display: none;
-}
+}
@@ -1,6 +1,6 @@
<div class="ss-loading-screen">
<div class="loading-logo">
- <img class="loading-animation" src="sapphire/admin/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" />
+ <img class="loading-animation" src="$FrameworkAdminDir/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" />
<noscript><p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></span></p></noscript>
</div>
-</div>
+</div>
@@ -7,7 +7,7 @@
<title>$Title</title>
</head>
-<body class="loading cms" lang="$Locale.RFC1766">
+<body class="loading cms" lang="$Locale.RFC1766" data-frameworkpath="$FrameworkDir">
<% include CMSLoadingScreen %>
@@ -5,7 +5,7 @@
*/
class LeftAndMainTest extends FunctionalTest {
- static $fixture_file = 'sapphire/admin/tests/LeftAndMainTest.yml';
+ static $fixture_file = 'LeftAndMainTest.yml';
protected $extraDataObjects = array('LeftAndMainTest_Object');
@@ -1,7 +1,7 @@
<?php
class ModelAdminTest extends FunctionalTest {
- static $fixture_file = 'sapphire/admin/tests/ModelAdminTest.yml';
+ static $fixture_file = 'ModelAdminTest.yml';
protected $extraDataObjects = array(
'ModelAdminTest_Admin',
@@ -5,7 +5,7 @@
*/
class SecurityAdminTest extends FunctionalTest {
- static $fixture_file = 'sapphire/admin/tests/LeftAndMainTest.yml';
+ static $fixture_file = 'LeftAndMainTest.yml';
protected $extraDataObjects = array('LeftAndMainTest_Object');
View
@@ -1,6 +1,6 @@
<?php
/**
- * A DataFormatter object handles transformation of data from Sapphire model objects to a particular output format, and vice versa.
+ * A DataFormatter object handles transformation of data from SilverStripe model objects to a particular output format, and vice versa.
* This is most commonly used in developing RESTful APIs.
*
* @package sapphire
@@ -297,4 +297,4 @@ public function convertStringToArray($strData) {
user_error('DataFormatter::convertStringToArray not implemented on subclass', E_USER_ERROR);
}
-}
+}
View
@@ -1,10 +1,10 @@
<?php
/**
- * Sapphire's generic RESTful server.
+ * SilverStripe's generic RESTful server.
*
* This class gives your application a RESTful API for free. All you have to do is define static $api_access = true on
* the appropriate DataObjects. You will need to ensure that all of your data manipulation and security is defined in
- * your model layer (ie, the DataObject classes) and not in your Controllers. This is the recommended design for Sapphire
+ * your model layer (ie, the DataObject classes) and not in your Controllers. This is the recommended design for SilverStripe
* applications.
*
* Enabling restful access on a model will also enable a SOAP API, see {@link SOAPModelAccess}.
Oops, something went wrong.

0 comments on commit 3a6341a

Please sign in to comment.