Continue to refactor locale and gallery3 ui from the user module to the gallery module

This commit is contained in:
Tim Almdal
2009-10-13 12:46:27 -07:00
parent f8eee90705
commit 1c313e9d2d
2 changed files with 13 additions and 36 deletions

View File

@@ -37,6 +37,11 @@ class gallery_theme_Core {
}
}
if (count(locales::installed())) {
// Needed by the languages block
$theme->script("jquery.cookie.js");
}
if ($session->get("l10n_mode", false)) {
$theme->css("l10n_client.css");
$theme->script("jquery.cookie.js");
@@ -46,6 +51,14 @@ class gallery_theme_Core {
return $buf;
}
static function header_top($theme) {
if ($theme->page_type != "login") {
$view = new View("login.html");
$view->user = user::active();
return $view->render();
}
}
static function admin_head($theme) {
$theme->script("gallery.panel.js");
$session = Session::instance();

View File

@@ -1,36 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class user_theme_Core {
static function head($theme) {
if (count(locales::installed())) {
// Needed by the languages block
$theme->script("jquery.cookie.js");
}
return "";
}
static function header_top($theme) {
if ($theme->page_type != "login") {
$view = new View("login.html");
$view->user = user::active();
return $view->render();
}
}
}