stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-28 10:43:53 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:gallery/gallery3

Browse Source 
Conflicts:
	modules/gallery/libraries/Theme_View.php
	themes/admin_default/views/admin.html.php
This commit is contained in:
Tim Almdal
2009-06-29 06:44:05 -07:00
parent 42c82ef7f0 b0bb107b7e
commit 10b4eda6f0
19 changed files with 240 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/helpers/gallery_theme.php
+5 -37
View File
@@ -21,30 +21,12 @@ class gallery_theme_Core {
static function head($theme) {
$session = Session::instance();
$buf = "";
$theme->script("lib/jquery.js");
$theme->script("lib/jquery.form.js");
$theme->script("lib/jquery-ui.js");
$theme->script("lib/gallery.common.js");
$theme->script("lib/gallery.dialog.js");
$theme->script("lib/gallery.form.js");
$theme->script("lib/superfish/js/superfish.js");
if ($theme->page_type == 'photo') {
$theme->script("lib/jquery.scrollTo.js");
$theme->script("lib/jquery.localscroll.js");
$theme->script("lib/gallery.show_full_size.js");
}
if ($theme->page_type == 'movie') {
$theme->script("lib/flowplayer.js");
}
$theme->script($theme->url("js/ui.init.js", false, true));
if ($session->get("debug")) {
$buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
url::file("modules/gallery/css/debug.css") . "\" />";
$theme->css("modules/gallery/css/debug.css");
}
if (($theme->page_type == "album" || $theme->page_type == "photo")
&& access::can("edit", $theme->item())) {
$buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
url::file("modules/gallery/css/quick.css") . "\" />";
$theme->css("modules/gallery/css/quick.css");
$theme->script("modules/gallery/js/quick.js");
}
@@ -57,8 +39,7 @@ class gallery_theme_Core {
}
if ($session->get("l10n_mode", false)) {
$buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
url::file("modules/gallery/css/l10n_client.css") . "\" />";
$theme->css("modules/gallery/css/l10n_client.css");
$theme->script("lib/jquery.cookie.js");
$theme->script("modules/gallery/js/l10n_client.js");
}
@@ -94,28 +75,15 @@ class gallery_theme_Core {
static function admin_head($theme) {
$session = Session::instance();
$buf = "";
$theme->script("lib/jquery.js");
$theme->script("lib/jquery.form.js");
$theme->script("lib/jquery-ui.js");
$theme->script("lib/gallery.common.js");
$theme->script("lib/gallery.dialog.js");
$theme->script("lib/superfish/js/superfish.js");
$theme->script($theme->url("js/jquery.dropshadow.js", false, true));
$theme->script($theme->url("js/ui.init.js", false, true));
if ($session->get("debug")) {
$buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
url::file("modules/gallery/css/debug.css") . "\" />";
$theme->css("modules/gallery/css/debug.css");
}
if ($session->get("l10n_mode", false)) {
$buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
url::file("modules/gallery/css/l10n_client.css") . "\" />";
$theme->css("modules/gallery/css/l10n_client.css");
$theme->script("lib/jquery.cookie.js");
$theme->script("modules/gallery/js/l10n_client.js");
}
return $buf;
}
static function page_bottom($theme) {