summaryrefslogtreecommitdiff
path: root/themes/default/views
diff options
context:
space:
mode:
Diffstat (limited to 'themes/default/views')
-rw-r--r--themes/default/views/album.html.php1
-rw-r--r--themes/default/views/footer.html.php4
-rw-r--r--themes/default/views/header.html.php2
-rw-r--r--themes/default/views/movie.html.php6
-rw-r--r--themes/default/views/page.html.php42
-rw-r--r--themes/default/views/photo.html.php1
6 files changed, 34 insertions, 22 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 7e6913df..46b0d29a 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,6 +19,7 @@
<?= $child->thumb_img(array("class" => "gThumbnail")) ?>
</a>
<?= $theme->thumb_bottom($child) ?>
+ <?= $theme->thumb_menu($child) ?>
<h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
<ul class="gMetadata">
<?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
index d7111922..040a4062 100644
--- a/themes/default/views/footer.html.php
+++ b/themes/default/views/footer.html.php
@@ -2,7 +2,9 @@
<?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<?= $footer_text ?>
-<? else: ?>
+<? endif ?>
+
+<? if (module::get_var("gallery", "show_credits")): ?>
<ul id="gCredits">
<?= $theme->credits() ?>
</ul>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 1e70b7ac..b38cffed 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
<?= $header_text ?>
<? else: ?>
<a href="<?= url::site("albums/1") ?>">
- <img id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+ <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
</a>
<? endif ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 0cdf63fa..134e3571 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -1,5 +1,4 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script src="<?= url::file("lib/flowplayer.js") ?>" type="text/javascript"></script>
<div id="gItem">
<?= $theme->photo_top() ?>
@@ -25,7 +24,7 @@
},
controls: {
autoHide: 'always',
- hideDelay: 2000,
+ hideDelay: 2000
}
}
})
@@ -36,5 +35,8 @@
<div><?= p::clean($item->description) ?></div>
</div>
+ <script type="text/javascript">
+ var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
+ </script>
<?= $theme->photo_bottom() ?>
</div>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 3feb14cb..3ae3e155 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -23,17 +23,17 @@
<? endif ?>
<? endif ?>
</title>
- <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+ <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
media="screen,print,projection" />
<link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
media="screen" />
<link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
media="screen,print,projection" />
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+ <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
media="screen,print,projection" />
<!--[if lt IE 8]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+ <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
media="screen,print,projection" />
<![endif]-->
<? if ($theme->page_type == 'album'): ?>
@@ -49,18 +49,24 @@
</style>
<? endif ?>
<? endif ?>
- <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
- <? if ($theme->page_type == 'photo'): ?>
- <script src="<?= url::file("lib/jquery.scrollTo.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery.localscroll.js") ?>" type="text/javascript"></script>
+ <?= $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") ?>
+ <?= $theme->script("lib/jquery.localscroll.js") ?>
+ <?= $theme->theme_script("js/ui.init.js") ?>
+
+ <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+ <? if ($theme->page_type == "photo"): ?>
+ <?= $theme->script("lib/jquery.scrollTo.js") ?>
+ <?= $theme->script("lib/gallery.show_full_size.js") ?>
+ <? elseif ($theme->page_type == "movie"): ?>
+ <?= $theme->script("lib/flowplayer.js") ?>
<? endif ?>
- <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
+
<?= $theme->head() ?>
</head>
@@ -69,7 +75,7 @@
<div id="doc4" class="yui-t5 gView">
<?= $theme->site_status() ?>
<div id="gHeader">
- <?= $theme->display("header.html") ?>
+ <?= new View("header.html") ?>
</div>
<div id="bd">
<div id="yui-main">
@@ -81,11 +87,13 @@
</div>
</div>
<div id="gSidebar" class="yui-b">
- <?= $theme->display("sidebar.html") ?>
+ <? if ($theme->page_type != "login"): ?>
+ <?= new View("sidebar.html") ?>
+ <? endif ?>
</div>
</div>
<div id="gFooter">
- <?= $theme->display("footer.html") ?>
+ <?= new View("footer.html") ?>
</div>
</div>
<?= $theme->page_bottom() ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 1c3b81a7..4765a4e3 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -2,7 +2,6 @@
<? if (access::can("view_full", $theme->item())): ?>
<!-- Use javascript to show the full size as an overlay on the current page -->
-<script src="<?= url::file("lib/gallery.show_full_size.js") ?>" type="text/javascript"></script>
<script>
$(document).ready(function() {
$(".gFullSizeLink").click(function() {
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-18 01:05:31 +0000