Replace custom breadcrumbs code with Gallery 3.0.3's breadcrumb code.
This commit is contained in:
parent
e9950a12aa
commit
a58a1d348a
@ -31,18 +31,19 @@ class CalendarView_Controller extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Draw the page.
|
// Draw the page.
|
||||||
$template = new Theme_View("calpage.html", "other", "CalendarView");
|
$root = item::root();
|
||||||
$template->set_global("calendar_user", $display_user);
|
$template = new Theme_View("page.html", "other", "CalendarView");
|
||||||
|
$template->set_global(
|
||||||
|
array("calendar_user" => $display_user,
|
||||||
|
"breadcrumbs" => array(
|
||||||
|
Breadcrumb::instance($root->title, $root->url())->set_first(),
|
||||||
|
Breadcrumb::instance($display_year, url::site("calendarview/calendar/" . $display_year))->set_last())));
|
||||||
$template->page_title = t("Gallery :: Calendar");
|
$template->page_title = t("Gallery :: Calendar");
|
||||||
$template->content = new View("calendarview_year.html");
|
$template->content = new View("calendarview_year.html");
|
||||||
$template->content->calendar_year = $display_year;
|
$template->content->calendar_year = $display_year;
|
||||||
$template->content->calendar_user = $display_user;
|
$template->content->calendar_user = $display_user;
|
||||||
$template->content->calendar_user_year_form = $this->_get_calenderprefs_form($display_year, $display_user);
|
$template->content->calendar_user_year_form = $this->_get_calenderprefs_form($display_year, $display_user);
|
||||||
$template->content->title = t("Calendar") . ": " . $display_year;
|
$template->content->title = t("Calendar") . ": " . $display_year;
|
||||||
// Set up breadcrumbs
|
|
||||||
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb(item::root()->title, item::root()->url());
|
|
||||||
$calendar_breadcrumbs[1] = new Calendar_Breadcrumb($display_year, "");
|
|
||||||
$template->set_global("breadcrumbs", $calendar_breadcrumbs);
|
|
||||||
print $template;
|
print $template;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,42 +82,42 @@ class CalendarView_Controller extends Controller {
|
|||||||
throw new Kohana_404_Exception();
|
throw new Kohana_404_Exception();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set up the page.
|
|
||||||
$template = new Theme_View("calpage.html", "collection", "CalendarDayView");
|
|
||||||
$template->set_global("page", $page);
|
|
||||||
$template->set_global("max_pages", $max_pages);
|
|
||||||
$template->set_global("page_size", $page_size);
|
|
||||||
$template->page_title = t("Gallery :: Calendar");
|
|
||||||
|
|
||||||
// Figure out which photos go on this page.
|
// Figure out which photos go on this page.
|
||||||
|
$children = "";
|
||||||
if ($display_user == "-1") {
|
if ($display_user == "-1") {
|
||||||
$template->set_global("children", ORM::factory("item")
|
$children = ORM::factory("item")
|
||||||
->viewable()
|
->viewable()
|
||||||
->where("type", "!=", "album")
|
->where("type", "!=", "album")
|
||||||
->where("captured", ">=", mktime(0, 0, 0, $display_month, $display_day, $display_year))
|
->where("captured", ">=", mktime(0, 0, 0, $display_month, $display_day, $display_year))
|
||||||
->where("captured", "<", mktime(0, 0, 0, $display_month, ($display_day + 1), $display_year))
|
->where("captured", "<", mktime(0, 0, 0, $display_month, ($display_day + 1), $display_year))
|
||||||
->order_by("captured", "ASC")
|
->order_by("captured", "ASC")
|
||||||
->find_all($page_size, $offset));
|
->find_all($page_size, $offset);
|
||||||
} else {
|
} else {
|
||||||
$template->set_global("children", ORM::factory("item")
|
$children = ORM::factory("item")
|
||||||
->viewable()
|
->viewable()
|
||||||
->where("owner_id", "=", $display_user)
|
->where("owner_id", "=", $display_user)
|
||||||
->where("type", "!=", "album")
|
->where("type", "!=", "album")
|
||||||
->where("captured", ">=", mktime(0, 0, 0, $display_month, $display_day, $display_year))
|
->where("captured", ">=", mktime(0, 0, 0, $display_month, $display_day, $display_year))
|
||||||
->where("captured", "<", mktime(0, 0, 0, $display_month, ($display_day + 1), $display_year))
|
->where("captured", "<", mktime(0, 0, 0, $display_month, ($display_day + 1), $display_year))
|
||||||
->order_by("captured", "ASC")
|
->order_by("captured", "ASC")
|
||||||
->find_all($page_size, $offset));
|
->find_all($page_size, $offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set up breadcrumbs
|
// Create and display the page.
|
||||||
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb(item::root()->title, item::root()->url());
|
$root = item::root();
|
||||||
$calendar_breadcrumbs[1] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user));
|
$template = new Theme_View("page.html", "collection", "CalendarDayView");
|
||||||
$calendar_breadcrumbs[2] = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month));
|
$template->set_global(
|
||||||
$calendar_breadcrumbs[3] = new Calendar_Breadcrumb($display_day, "");
|
array("page" => $page,
|
||||||
$template->set_global("breadcrumbs", $calendar_breadcrumbs);
|
"max_pages" => $max_pages,
|
||||||
|
"page_size" => $page_size,
|
||||||
// Finish setting up and then display the page.
|
"children" => $children,
|
||||||
$template->set_global("children_count", $day_count);
|
"breadcrumbs" => array(
|
||||||
|
Breadcrumb::instance($root->title, $root->url())->set_first(),
|
||||||
|
Breadcrumb::instance($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)),
|
||||||
|
Breadcrumb::instance(t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)),
|
||||||
|
Breadcrumb::instance($display_day, url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month . "/" . $display_day))->set_last()),
|
||||||
|
"children_count" => $day_count));
|
||||||
|
$template->page_title = t("Gallery :: Calendar");
|
||||||
$template->content = new View("dynamic.html");
|
$template->content = new View("dynamic.html");
|
||||||
$template->content->title = t("Photos From ") . date("d", mktime(0, 0, 0, $display_month, $display_day, $display_year)) . " " . t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, $display_day, $display_year));
|
$template->content->title = t("Photos From ") . date("d", mktime(0, 0, 0, $display_month, $display_day, $display_year)) . " " . t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, $display_day, $display_year));
|
||||||
print $template;
|
print $template;
|
||||||
@ -157,41 +158,41 @@ class CalendarView_Controller extends Controller {
|
|||||||
throw new Kohana_404_Exception();
|
throw new Kohana_404_Exception();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set up the page.
|
|
||||||
$template = new Theme_View("calpage.html", "collection", "CalendarMonthView");
|
|
||||||
$template->set_global("page", $page);
|
|
||||||
$template->set_global("max_pages", $max_pages);
|
|
||||||
$template->set_global("page_size", $page_size);
|
|
||||||
$template->page_title = t("Gallery :: Calendar");
|
|
||||||
|
|
||||||
// Figure out which photos go on this page.
|
// Figure out which photos go on this page.
|
||||||
|
$children = "";
|
||||||
if ($display_user == "-1") {
|
if ($display_user == "-1") {
|
||||||
$template->set_global("children", ORM::factory("item")
|
$children = ORM::factory("item")
|
||||||
->viewable()
|
->viewable()
|
||||||
->where("type", "!=", "album")
|
->where("type", "!=", "album")
|
||||||
->where("captured", ">=", mktime(0, 0, 0, $display_month, 1, $display_year))
|
->where("captured", ">=", mktime(0, 0, 0, $display_month, 1, $display_year))
|
||||||
->where("captured", "<", mktime(0, 0, 0, $display_month+1, 1, $display_year))
|
->where("captured", "<", mktime(0, 0, 0, $display_month+1, 1, $display_year))
|
||||||
->order_by("captured", "ASC")
|
->order_by("captured", "ASC")
|
||||||
->find_all($page_size, $offset));
|
->find_all($page_size, $offset);
|
||||||
} else {
|
} else {
|
||||||
$template->set_global("children", ORM::factory("item")
|
$children = ORM::factory("item")
|
||||||
->viewable()
|
->viewable()
|
||||||
->where("owner_id", "=", $display_user)
|
->where("owner_id", "=", $display_user)
|
||||||
->where("type", "!=", "album")
|
->where("type", "!=", "album")
|
||||||
->where("captured", ">=", mktime(0, 0, 0, $display_month, 1, $display_year))
|
->where("captured", ">=", mktime(0, 0, 0, $display_month, 1, $display_year))
|
||||||
->where("captured", "<", mktime(0, 0, 0, $display_month+1, 1, $display_year))
|
->where("captured", "<", mktime(0, 0, 0, $display_month+1, 1, $display_year))
|
||||||
->order_by("captured", "ASC")
|
->order_by("captured", "ASC")
|
||||||
->find_all($page_size, $offset));
|
->find_all($page_size, $offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set up breadcrumbs
|
// Create and display the page.
|
||||||
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb(item::root()->title, item::root()->url());
|
$root = item::root();
|
||||||
$calendar_breadcrumbs[1] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user));
|
$template = new Theme_View("page.html", "collection", "CalendarMonthView");
|
||||||
$calendar_breadcrumbs[2] = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))), "");
|
$template->set_global(
|
||||||
$template->set_global("breadcrumbs", $calendar_breadcrumbs);
|
array("page" => $page,
|
||||||
|
"max_pages" => $max_pages,
|
||||||
// Finish setting up and then display the page.
|
"page_size" => $page_size,
|
||||||
$template->set_global("children_count", $day_count);
|
"breadcrumbs" => array(
|
||||||
|
Breadcrumb::instance($root->title, $root->url())->set_first(),
|
||||||
|
Breadcrumb::instance($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)),
|
||||||
|
Breadcrumb::instance(t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month))->set_last()),
|
||||||
|
"children" => $children,
|
||||||
|
"children_count" => $day_count));
|
||||||
|
$template->page_title = t("Gallery :: Calendar");
|
||||||
$template->content = new View("dynamic.html");
|
$template->content = new View("dynamic.html");
|
||||||
$template->content->title = t("Photos From ") . t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, 1, $display_year));
|
$template->content->title = t("Photos From ") . t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, 1, $display_year));
|
||||||
print $template;
|
print $template;
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
|
||||||
/**
|
|
||||||
* Gallery - a web based photo album viewer and editor
|
|
||||||
* Copyright (C) 2000-2012 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 Calendar_Breadcrumb_Core {
|
|
||||||
// Creates a class to maintain a single breadcrumb.
|
|
||||||
// Multiple breadcrumbs can be achieved by createing an array of this class type.
|
|
||||||
public $title = "";
|
|
||||||
public $id = 1;
|
|
||||||
public $url = "";
|
|
||||||
|
|
||||||
public function __construct($new_title, $new_url) {
|
|
||||||
$this->title = $new_title;
|
|
||||||
$this->url = $new_url;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,164 +0,0 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en">
|
|
||||||
<head>
|
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
|
||||||
<? $theme->start_combining("script,css") ?>
|
|
||||||
<title>
|
|
||||||
<? if ($page_title): ?>
|
|
||||||
<?= $page_title ?>
|
|
||||||
<? else: ?>
|
|
||||||
<? if ($theme->item()): ?>
|
|
||||||
<?= $theme->item()->title ?>
|
|
||||||
<? elseif ($theme->tag()): ?>
|
|
||||||
<?= t("Photos tagged with %tag_title", array("tag_title" => $theme->tag()->name)) ?>
|
|
||||||
<? else: /* Not an item, not a tag, no page_title specified. Help! */ ?>
|
|
||||||
<?= item::root()->title ?>
|
|
||||||
<? endif ?>
|
|
||||||
<? endif ?>
|
|
||||||
</title>
|
|
||||||
<link rel="shortcut icon"
|
|
||||||
href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
|
|
||||||
type="image/x-icon" />
|
|
||||||
|
|
||||||
<? if ($theme->page_type == "collection"): ?>
|
|
||||||
<? if ($thumb_proportion != 1): ?>
|
|
||||||
<? $new_width = round($thumb_proportion * 213) ?>
|
|
||||||
<? $new_height = round($thumb_proportion * 240) ?>
|
|
||||||
<style type="text/css">
|
|
||||||
.g-view #g-content #g-album-grid .g-item {
|
|
||||||
width: <?= $new_width ?>px;
|
|
||||||
height: <?= $new_height ?>px;
|
|
||||||
/* <?= $thumb_proportion ?> */
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<? endif ?>
|
|
||||||
<? endif ?>
|
|
||||||
|
|
||||||
<?= $theme->script("json2-min.js") ?>
|
|
||||||
<?= $theme->script("jquery.js") ?>
|
|
||||||
<?= $theme->script("jquery.form.js") ?>
|
|
||||||
<?= $theme->script("jquery-ui.js") ?>
|
|
||||||
<?= $theme->script("gallery.common.js") ?>
|
|
||||||
<? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
|
|
||||||
<script type="text/javascript">
|
|
||||||
var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
|
|
||||||
</script>
|
|
||||||
<?= $theme->script("gallery.ajax.js") ?>
|
|
||||||
<?= $theme->script("gallery.dialog.js") ?>
|
|
||||||
<?= $theme->script("superfish/js/superfish.js") ?>
|
|
||||||
<?= $theme->script("jquery.localscroll.js") ?>
|
|
||||||
|
|
||||||
<? /* These are page specific but they get combined */ ?>
|
|
||||||
<? if ($theme->page_subtype == "photo"): ?>
|
|
||||||
<?= $theme->script("jquery.scrollTo.js") ?>
|
|
||||||
<?= $theme->script("gallery.show_full_size.js") ?>
|
|
||||||
<? elseif ($theme->page_subtype == "movie"): ?>
|
|
||||||
<?= $theme->script("flowplayer.js") ?>
|
|
||||||
<? endif ?>
|
|
||||||
|
|
||||||
<?= $theme->head() ?>
|
|
||||||
|
|
||||||
<? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
|
|
||||||
<?= $theme->script("ui.init.js") ?>
|
|
||||||
<?= $theme->css("yui/reset-fonts-grids.css") ?>
|
|
||||||
<?= $theme->css("superfish/css/superfish.css") ?>
|
|
||||||
<?= $theme->css("themeroller/ui.base.css") ?>
|
|
||||||
<?= $theme->css("screen.css") ?>
|
|
||||||
<!--[if lte IE 8]>
|
|
||||||
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
|
|
||||||
media="screen,print,projection" />
|
|
||||||
<![endif]-->
|
|
||||||
|
|
||||||
<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
|
|
||||||
<?= $theme->get_combined("script") ?>
|
|
||||||
|
|
||||||
<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
|
|
||||||
<?= $theme->get_combined("css") ?>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body <?= $theme->body_attributes() ?>>
|
|
||||||
<?= $theme->page_top() ?>
|
|
||||||
<div id="doc4" class="yui-t5 g-view">
|
|
||||||
<?= $theme->site_status() ?>
|
|
||||||
<div id="g-header" class="ui-helper-clearfix">
|
|
||||||
<div id="g-banner">
|
|
||||||
<? if ($header_text = module::get_var("gallery", "header_text")): ?>
|
|
||||||
<?= $header_text ?>
|
|
||||||
<? else: ?>
|
|
||||||
<a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
|
|
||||||
<img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
|
|
||||||
</a>
|
|
||||||
<? endif ?>
|
|
||||||
<?= $theme->user_menu() ?>
|
|
||||||
<?= $theme->header_top() ?>
|
|
||||||
|
|
||||||
<!-- hide the menu until after the page has loaded, to minimize menu flicker -->
|
|
||||||
<div id="g-site-menu" style="visibility: hidden">
|
|
||||||
<?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
|
|
||||||
</div>
|
|
||||||
<script type="text/javascript"> $(document).ready(function() { $("#g-site-menu").css("visibility", "visible"); }) </script>
|
|
||||||
|
|
||||||
<?= $theme->header_bottom() ?>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<? // The following code was modifed to allow module-defined breadcrumbs.
|
|
||||||
// Everything else in this file is a copy of the default page.html.php file.
|
|
||||||
?>
|
|
||||||
<? if (!empty($breadcrumbs)): ?>
|
|
||||||
<ul class="g-breadcrumbs">
|
|
||||||
<? $i = 0 ?>
|
|
||||||
<? foreach ($breadcrumbs as $breadcrumb): ?>
|
|
||||||
<li<? if ($i == 0) print " class=\"g-first\"" ?>>
|
|
||||||
<!-- Adding ?show=<id> causes Gallery3 to display the page
|
|
||||||
containing that photo. For now, we just do it for
|
|
||||||
the immediate parent so that when you go back up a
|
|
||||||
level you're on the right page. -->
|
|
||||||
<? if ($breadcrumb->url) : ?>
|
|
||||||
<a href="<?= $breadcrumb->url ?>"><?= html::purify($breadcrumb->title) ?></a>
|
|
||||||
<? else : ?>
|
|
||||||
<?= html::purify($breadcrumb->title) ?>
|
|
||||||
<? endif ?>
|
|
||||||
</li>
|
|
||||||
<? $i++ ?>
|
|
||||||
<? endforeach ?>
|
|
||||||
</ul>
|
|
||||||
<? endif ?>
|
|
||||||
<? // End modified code ?>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div id="bd">
|
|
||||||
<div id="yui-main">
|
|
||||||
<div class="yui-b">
|
|
||||||
<div id="g-content" class="yui-g">
|
|
||||||
<?= $theme->messages() ?>
|
|
||||||
<?= $content ?>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div id="g-sidebar" class="yui-b">
|
|
||||||
<? if ($theme->page_subtype != "login"): ?>
|
|
||||||
<?= new View("sidebar.html") ?>
|
|
||||||
<? endif ?>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div id="g-footer" class="ui-helper-clearfix">
|
|
||||||
<?= $theme->footer() ?>
|
|
||||||
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
|
|
||||||
<?= $footer_text ?>
|
|
||||||
<? endif ?>
|
|
||||||
|
|
||||||
<? if (module::get_var("gallery", "show_credits")): ?>
|
|
||||||
<ul id="g-credits" class="g-inline">
|
|
||||||
<?= $theme->credits() ?>
|
|
||||||
</ul>
|
|
||||||
<? endif ?>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<?= $theme->page_bottom() ?>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
Reference in New Issue
Block a user