Merge pull request #11 from sminnee/3.1-fixes

3.1 fixes
nyeholt · May 30, 2013 · b937354 · b937354
2 parents 709d0dd + 5b5a2f3
commit b937354
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/code/controllers/ExternalContentAdmin.php b/code/controllers/ExternalContentAdmin.php
@@ -1,8 +1,5 @@
 <?php
 
-define('EXTERNALCONTENT', 'external-content');
-
-
 /**
  * Backend administration pages for the external content module
  * 
@@ -16,12 +13,17 @@ class ExternalContentAdmin extends LeftAndMain implements CurrentPageIdentifier,
 	 */
 	const URL_STUB = 'extadmin';
 
+	/**
+	 * The directory that the module is assuming it's installed in to.
+	 */
+	static $directory = 'external-content';
+
 	/**
 	 * URL segment used by the backend 
 	 * 
 	 * @var string
 	 */
-	static $url_segment = EXTERNALCONTENT;
+	static $url_segment = 'external-content';
 	static $url_rule = '$Action//$ID';
 	static $menu_title = 'External Content';
 	public static $tree_class = 'ExternalContentSource';
@@ -36,16 +38,18 @@ class ExternalContentAdmin extends LeftAndMain implements CurrentPageIdentifier,
 		'migrate',
 		'download',
 		'view',
-		'treeview'
+		'treeview',
+		'EditForm',
+		'AddForm'
 	);
 
 
 	public function init(){
 		parent::init();
 		Requirements::css(CMS_DIR . '/css/screen.css');
 		Requirements::customCSS($this->generatePageIconsCss());
-		Requirements::css(EXTERNALCONTENT . '/css/external-content-admin.css');
-		Requirements::javascript(EXTERNALCONTENT . '/javascript/external-content-admin.js');
+		Requirements::css(self::$directory . '/css/external-content-admin.css');
+		Requirements::javascript(self::$directory . '/javascript/external-content-admin.js');
 	}
 
 

diff --git a/code/extensions/ExternalContentHtmlEditorExtension.php b/code/extensions/ExternalContentHtmlEditorExtension.php
@@ -9,7 +9,7 @@
 class ExternalContentHtmlEditorExtension extends Extension {
 
 	public function updateLinkForm(Form $form) {
-		Requirements::javascript(EXTERNALCONTENT . "/javascript/external_tiny_mce_improvements.js");
+		Requirements::javascript(ExternalContentAdmin::$directory . "/javascript/external_tiny_mce_improvements.js");
 
 		$fields = $form->Fields();
 		$fields->replaceField('LinkType', $options = new OptionsetField(

diff --git a/code/forms/ExternalHtmlEditorField_Toolbar.php b/code/forms/ExternalHtmlEditorField_Toolbar.php
@@ -25,7 +25,7 @@ function __construct($controller, $name) {
 	 */
 	function LinkForm() {
 		Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js");
-		Requirements::javascript(EXTERNALCONTENT . "/javascript/external_tiny_mce_improvements.js");
+		Requirements::javascript(ExternalContentAdmin::$directory . "/javascript/external_tiny_mce_improvements.js");
 
 		$form = new Form(
 			$this->controller,