Fixed breadcrumbs in calendarview.
This commit is contained in:
parent
042ea227d2
commit
536fa8aa4c
@ -78,7 +78,7 @@ class CalendarView_Controller extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Set up the page.
|
// Set up the page.
|
||||||
$template = new Theme_View("page.html", "collection", "CalendarDayView");
|
$template = new Theme_View("calpage.html", "collection", "CalendarDayView");
|
||||||
$template->set_global("page", $page);
|
$template->set_global("page", $page);
|
||||||
$template->set_global("max_pages", $max_pages);
|
$template->set_global("max_pages", $max_pages);
|
||||||
$template->set_global("page_size", $page_size);
|
$template->set_global("page_size", $page_size);
|
||||||
@ -103,14 +103,14 @@ class CalendarView_Controller extends Controller {
|
|||||||
->order_by("captured", "ASC")
|
->order_by("captured", "ASC")
|
||||||
->find_all($page_size, $offset));
|
->find_all($page_size, $offset));
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
// Set up breadcrumbs
|
// Set up breadcrumbs
|
||||||
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user));
|
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb(item::root()->title, item::root()->url());
|
||||||
$calendar_breadcrumbs[1] = 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));
|
$calendar_breadcrumbs[1] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user));
|
||||||
$fake_item = new Calendar_Breadcrumb($display_day, "");
|
$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("item", $fake_item);
|
$calendar_breadcrumbs[3] = new Calendar_Breadcrumb($display_day, "");
|
||||||
$template->set_global("parents", $calendar_breadcrumbs);
|
$template->set_global("breadcrumbs", $calendar_breadcrumbs);
|
||||||
*/
|
|
||||||
// Finish setting up and then display the page.
|
// Finish setting up and then display the page.
|
||||||
$template->set_global("children_count", $day_count);
|
$template->set_global("children_count", $day_count);
|
||||||
$template->content = new View("dynamic.html");
|
$template->content = new View("dynamic.html");
|
||||||
@ -154,7 +154,7 @@ class CalendarView_Controller extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Set up the page.
|
// Set up the page.
|
||||||
$template = new Theme_View("page.html", "collection", "CalendarMonthView");
|
$template = new Theme_View("calpage.html", "collection", "CalendarMonthView");
|
||||||
$template->set_global("page", $page);
|
$template->set_global("page", $page);
|
||||||
$template->set_global("max_pages", $max_pages);
|
$template->set_global("max_pages", $max_pages);
|
||||||
$template->set_global("page_size", $page_size);
|
$template->set_global("page_size", $page_size);
|
||||||
@ -179,13 +179,13 @@ class CalendarView_Controller extends Controller {
|
|||||||
->order_by("captured", "ASC")
|
->order_by("captured", "ASC")
|
||||||
->find_all($page_size, $offset));
|
->find_all($page_size, $offset));
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
// Set up breadcrumbs for this page.
|
// Set up breadcrumbs
|
||||||
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user));
|
$calendar_breadcrumbs[0] = new Calendar_Breadcrumb(item::root()->title, item::root()->url());
|
||||||
$fake_item = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))), "");
|
$calendar_breadcrumbs[1] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user));
|
||||||
$template->set_global("item", $fake_item);
|
$calendar_breadcrumbs[2] = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))), "");
|
||||||
$template->set_global("parents", $calendar_breadcrumbs);
|
$template->set_global("breadcrumbs", $calendar_breadcrumbs);
|
||||||
*/
|
|
||||||
// Finish setting up and then display the page.
|
// Finish setting up and then display the page.
|
||||||
$template->set_global("children_count", $day_count);
|
$template->set_global("children_count", $day_count);
|
||||||
$template->content = new View("dynamic.html");
|
$template->content = new View("dynamic.html");
|
||||||
|
@ -21,27 +21,11 @@ class Calendar_Breadcrumb_Core {
|
|||||||
// Creates a class to maintain a single breadcrumb.
|
// Creates a class to maintain a single breadcrumb.
|
||||||
// Multiple breadcrumbs can be achieved by createing an array of this class type.
|
// Multiple breadcrumbs can be achieved by createing an array of this class type.
|
||||||
public $title = "";
|
public $title = "";
|
||||||
public $id = 0;
|
public $id = 1;
|
||||||
public $url = "";
|
public $url = "";
|
||||||
|
|
||||||
public function __construct($new_title, $new_url) {
|
public function __construct($new_title, $new_url) {
|
||||||
$this->title = $new_title;
|
$this->title = $new_title;
|
||||||
$this->url = $new_url;
|
$this->url = $new_url;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function url($query=null) {
|
|
||||||
return $this->url;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function parent() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function is_album() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function is_photo() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
154
modules/calendarview/views/calpage.html.php
Normal file
154
modules/calendarview/views/calpage.html.php
Normal file
@ -0,0 +1,154 @@
|
|||||||
|
<?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" xml:lang="en" lang="en">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||||
|
<title>
|
||||||
|
<? if ($page_title): ?>
|
||||||
|
<?= $page_title ?>
|
||||||
|
<? else: ?>
|
||||||
|
<? if ($theme->item()): ?>
|
||||||
|
<? if ($theme->item()->is_album()): ?>
|
||||||
|
<?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
|
||||||
|
<? elseif ($theme->item()->is_photo()): ?>
|
||||||
|
<?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
|
||||||
|
<? else: ?>
|
||||||
|
<?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
|
||||||
|
<? endif ?>
|
||||||
|
<? elseif ($theme->tag()): ?>
|
||||||
|
<?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
|
||||||
|
<? else: /* Not an item, not a tag, no page_title specified. Help! */ ?>
|
||||||
|
<?= t("Gallery") ?>
|
||||||
|
<? endif ?>
|
||||||
|
<? endif ?>
|
||||||
|
</title>
|
||||||
|
<link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
|
||||||
|
<?= $theme->css("yui/reset-fonts-grids.css") ?>
|
||||||
|
<?= $theme->css("superfish/css/superfish.css") ?>
|
||||||
|
<?= $theme->css("themeroller/ui.base.css") ?>
|
||||||
|
<?= $theme->css("gallery.common.css") ?>
|
||||||
|
<?= $theme->css("screen.css") ?>
|
||||||
|
<!--[if lt IE 8]>
|
||||||
|
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
|
||||||
|
media="screen,print,projection" />
|
||||||
|
<![endif]-->
|
||||||
|
<? if ($theme->page_type == "collection"): ?>
|
||||||
|
<? if ($thumb_proportion != 1): ?>
|
||||||
|
<? $new_width = $thumb_proportion * 213 ?>
|
||||||
|
<? $new_height = $thumb_proportion * 240 ?>
|
||||||
|
<style type="text/css">
|
||||||
|
#g-content #g-album-grid .g-item {
|
||||||
|
width: <?= $new_width ?>px;
|
||||||
|
height: <?= $new_height ?>px;
|
||||||
|
/* <?= $thumb_proportion ?> */
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<? endif ?>
|
||||||
|
<? endif ?>
|
||||||
|
<?= $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") ?>
|
||||||
|
<?= $theme->script("ui.init.js") ?>
|
||||||
|
|
||||||
|
<? /* These are page specific, but if we put them before $theme->head() 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() ?>
|
||||||
|
</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 and make it visible after the page has loaded, to minimize menu flicker -->
|
||||||
|
<div id="g-site-menu" style="visibility: hidden">
|
||||||
|
<?= $theme->site_menu() ?>
|
||||||
|
</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