diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 70c0d0c..435b350 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -62,7 +62,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->app = $this->getApplication()->getOption('app'); - + // Add jQuery :) + $view->headScript()->appendFile('http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js'); + Zend_Locale::setDefault('sv_SE'); diff --git a/application/modules/default/views/layout/default.phtml b/application/modules/default/views/layout/default.phtml index 65ee86b..cf217c7 100644 --- a/application/modules/default/views/layout/default.phtml +++ b/application/modules/default/views/layout/default.phtml @@ -6,6 +6,8 @@ headMeta() . "\n" /* Newline for pretty source :) */ ?> + headScript() ?> +
diff --git a/library/Fiktiv/View/Helper/AuthLink.php b/library/Fiktiv/View/Helper/AuthLink.php index d52dd86..01e3a2e 100644 --- a/library/Fiktiv/View/Helper/AuthLink.php +++ b/library/Fiktiv/View/Helper/AuthLink.php @@ -7,6 +7,7 @@ class Fiktiv_View_Helper_AuthLink extends Zend_View_Helper_Abstract $auth = Zend_Auth::getInstance(); $options = array( + 'route' => 'default', 'module' => 'default', 'controller' => 'auth' ); diff --git a/library/Fiktiv/View/Helper/RenderMenu.php b/library/Fiktiv/View/Helper/RenderMenu.php index c77aacf..d50cf7c 100644 --- a/library/Fiktiv/View/Helper/RenderMenu.php +++ b/library/Fiktiv/View/Helper/RenderMenu.php @@ -7,7 +7,7 @@ class Fiktiv_View_Helper_RenderMenu extends Zend_View_Helper_Abstract $navigation = $this->view->navigation(); $container = $navigation->getContainer(); $active = $navigation->menu()->findActive($navigation->getContainer()); - + if ($active && $active['page']->getParent()->hasPages()) { return true; } diff --git a/public/js/menu.js b/public/js/menu.js new file mode 100644 index 0000000..2f89cd3 --- /dev/null +++ b/public/js/menu.js @@ -0,0 +1,3 @@ +$(document).ready(function(){ + $(".subnav").hide().slideDown(500); +}); \ No newline at end of file