Updated plugin for Croogo 1.3.2

jeremyharris · Sep 8, 2010 · 7574e27 · 7574e27
1 parent b0d9375
commit 7574e27
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 14 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
diff --git a/webroot/plugin.yml → config/plugin.yml b/webroot/plugin.yml → config/plugin.yml
diff --git a/controllers/components/syntax_hook.php → config/syntax_activation.php b/controllers/components/syntax_hook.php → config/syntax_activation.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Syntax Hook component
+ * Syntax Activator
  *
  * @package	   syntax
- * @subpackage syntax.controllers.components
+ * @subpackage syntax.config
  * @author	   Jeremy Harris <jeremy@42pixels.com>
  * @license	   http://www.opensource.org/licenses/mit-license.php The MIT License
- * @link	   http://42pixels.com
+ * @link			http://42pixels.com
  */
-class SyntaxHookComponent extends Object {
+class SyntaxActivation extends Object {
 
 /**
  * Languages offered
@@ -41,13 +41,23 @@ class SyntaxHookComponent extends Object {
 		 'Xml' => 'XML'
 	);
 
+/**
+ * onActivate will be called if this returns true
+ *
+ * @param  object $controller Controller
+ * @return boolean
+ */
+    public function beforeActivation(&$controller) {
+        return true;
+    }
+
 /**
  * Called after activating the hook in ExtensionsHooksController::admin_toggle()
  *
  * @param object $controller Controller
  * @return void
  */
-    public function onActivate(&$controller) {
+    public function onActivation(&$controller) {
 		$settings = array(
 			array(
 				'key' => 'Syntax.theme',
@@ -153,13 +163,23 @@ public function onActivate(&$controller) {
 		$controller->Croogo->addPluginBootstrap('Syntax');
     }
 
+/**
+ * onDeactivate will be called if this returns true
+ *
+ * @param  object $controller Controller
+ * @return boolean
+ */
+    public function beforeDeactivation(&$controller) {
+        return true;
+    }
+
 /**
  * Called after deactivating the hook in ExtensionsHooksController::admin_toggle()
  *
  * @param object $controller Controller
  * @return void
  */
-    public function onDeactivate(&$controller) {
+    public function onDeactivation(&$controller) {
 		$settings = $controller->Setting->find('all', array('conditions' => 'Setting.key LIKE "%Syntax.%"'));
 		if (count($settings) > 0) {
 			foreach($settings as $setting) {

diff --git a/config/syntax_bootstrap.php b/config/syntax_bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Helper
+ */
+    Croogo::hookHelper('Nodes', 'Syntax.Syntax');
+
+/**
+ * Admin menu (navigation)
+ */
+    Croogo::hookAdminMenu('Syntax');
+?>
diff --git a/controllers/syntax_settings_controller.php b/controllers/syntax_settings_controller.php
@@ -17,6 +17,8 @@ class SyntaxSettingsController extends SyntaxAppController {
 
 	 var $uses = array('Setting');
 
+	 var $helpers = array('Syntax.Syntax');
+
 /**
  * Settings index
  */

diff --git a/views/elements/admin_menu.ctp b/views/elements/admin_menu.ctp
@@ -1 +1 @@
-<?php echo $html->link('<span class="ui-icon ui-icon-script"></span>' . __('SyntaxHighlighter', true), array('plugin' => 'syntax', 'controller' => 'syntax_settings', 'action' => 'index'), array('class' => Configure::read('Admin.menus') ? 'separator' : '', 'escape' => false)); ?>
+<?php echo $html->link(__('SyntaxHighlighter', true), array('plugin' => 'syntax', 'controller' => 'syntax_settings', 'action' => 'index')); ?>
diff --git a/views/helpers/syntax_hook.php → views/helpers/syntax.php b/views/helpers/syntax_hook.php → views/helpers/syntax.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Syntax Hook helper
+ * Syntax helper
  *
  * @package	   syntax
  * @subpackage syntax.views.helpers
  * @author	   Jeremy Harris <jeremy@42pixels.com>
  * @license	   http://www.opensource.org/licenses/mit-license.php The MIT License
- * @link	   http://42pixels.com
+ * @link			http://42pixels.com
  */
-class SyntaxHookHelper extends AppHelper {
+class SyntaxHelper extends AppHelper {
 
 /**
  * Other helpers used by this helper

diff --git a/views/syntax_settings/admin_index.ctp b/views/syntax_settings/admin_index.ctp
@@ -12,7 +12,7 @@
 <br/>  echo 'test' . 5;
 <br/>  //end function
 <br/>}
-<br/>visit: <a href="http://crogo.org">http://crogo.org!</a>
+<br/>visit: <a href="http://croogo.org">http://croogo.org!</a>
 		 </<?php echo Configure::read('Syntax.tagName'); ?>>
     <br />
 	 <p>Below are a list of default settings for each SyntaxHighlighted area. For more information, visit <a href="http://alexgorbatchev.com/SyntaxHighlighter/manual/configuration/" target="_blank">SyntaxHighlighter Configuration</a>.</p>