diff options
| -rw-r--r-- | core/libraries/Theme_View.php | 18 | ||||
| -rw-r--r-- | modules/search/helpers/search_theme.php | 8 | ||||
| -rw-r--r-- | themes/default/views/login_page.html.php | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php index e992103f..cc36de03 100644 --- a/core/libraries/Theme_View.php +++ b/core/libraries/Theme_View.php @@ -72,15 +72,17 @@ class Theme_View_Core extends View { public function site_menu() { $menu = Menu::factory("root"); - core_menu::site($menu, $this); + if ($this->page_type != "login") { + core_menu::site($menu, $this); - foreach (module::installed() as $module) { - if ($module->name == "core") { - continue; - } - $class = "{$module->name}_menu"; - if (method_exists($class, "site")) { - call_user_func_array(array($class, "site"), array(&$menu, $this)); + foreach (module::installed() as $module) { + if ($module->name == "core") { + continue; + } + $class = "{$module->name}_menu"; + if (method_exists($class, "site")) { + call_user_func_array(array($class, "site"), array(&$menu, $this)); + } } } diff --git a/modules/search/helpers/search_theme.php b/modules/search/helpers/search_theme.php index 63cc41c4..08d4b2e1 100644 --- a/modules/search/helpers/search_theme.php +++ b/modules/search/helpers/search_theme.php @@ -19,7 +19,11 @@ */ class search_theme_Core { static function header_top($theme) { - $view = new View("search_link.html"); - return $view->render(); + if ($theme->page_type() != "login") { + $view = new View("search_link.html"); + return $view->render(); + }else { + return ""; + } } }
\ No newline at end of file diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php index 8e0639d5..ffe1762b 100644 --- a/themes/default/views/login_page.html.php +++ b/themes/default/views/login_page.html.php @@ -25,8 +25,6 @@ <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script> <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script> <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script> - <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script> - <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script> <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script> <?= $theme->head() ?> <script> @@ -34,14 +32,12 @@ $("#gLoginLink").click(); }); </script> - </head> <body> <?= $theme->page_top() ?> <div id="doc4" class="yui-t5 gView"> <div id="hd"> - <?= $theme->site_status() ?> <div id="gHeader"> <?= $theme->display("header.html") ?> </div> @@ -49,9 +45,7 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b"> - <div id="gContent" class="yui-g"> - <?= $theme->messages() ?> - </div> + <div id="gContent" class="yui-g"> </div> </div> </div> <div id="gSidebar" class="yui-b"> </div> |