1
0

Updated theme support files.

This commit is contained in:
rWatcher 2011-09-14 17:40:30 -04:00
parent 21feda51e5
commit d544ed6c09
10 changed files with 96 additions and 50 deletions

View File

@ -56,8 +56,8 @@
<meta name="teoma" content="noindex, nofollow, noarchive" /> <meta name="teoma" content="noindex, nofollow, noarchive" />
<? endif; ?> <? endif; ?>
<? if ($theme->blendpagetrans): ?> <? if ($theme->blendpagetrans): ?>
<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5)" /> <meta http-equiv="Page-Enter" content="blendtrans(duration=0.5)" />
<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5)" /> <meta http-equiv="Page-Exit" content="blendtrans(duration=0.5)" />
<? endif; ?> <? endif; ?>
<!-- Internet Explorer 9 Meta tags : Start --> <!-- Internet Explorer 9 Meta tags : Start -->
<meta name="application-name" content="<?= $_title; ?>" /> <meta name="application-name" content="<?= $_title; ?>" />
@ -124,12 +124,20 @@
<style type="text/css"> #g-column-bottom #g-thumbnav-block, #g-column-top #g-thumbnav-block { display: none; } </style> <style type="text/css"> #g-column-bottom #g-thumbnav-block, #g-column-top #g-thumbnav-block { display: none; } </style>
<? endif; ?> <? endif; ?>
</head> </head>
<? if ($theme->item()): ?> <? if ($theme->item()):
<? $item = $theme->item(); ?> $item = $theme->item();
<? else: ?> else:
<? $item = item::root(); ?> $item = item::root();
<? endif; ?> endif;
<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($theme->is_rtl)? "class=\"rtl\"" : null; ?> > if ($theme->is_rtl):
$body_class = "rtl";
else:
$body_class = "";
endif;
if ($theme->viewmode == "mini"):
$body_class .= "viewmode-mini";
endif; ?>
<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($body_class)? 'class="' . $body_class . '"' : null; ?>>
<?= $theme->page_top() ?> <?= $theme->page_top() ?>
<?= $theme->site_status() ?> <?= $theme->site_status() ?>
<? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?> <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?>
@ -140,14 +148,15 @@
<? endif ?> <? endif ?>
<div id="g-header"> <div id="g-header">
<?= $theme->header_top() ?> <?= $theme->header_top() ?>
<? if ($header_text = module::get_var("gallery", "header_text")): ?> <? if ($theme->viewmode != "mini"): ?>
<? if ($header_text = module::get_var("gallery", "header_text")): ?>
<span id="g-header-text"><?= $theme->bb2html($header_text, 1) ?></span> <span id="g-header-text"><?= $theme->bb2html($header_text, 1) ?></span>
<? else: ?> <? else: ?>
<a id="g-logo" href="<?= item::root()->url() ?><?= ($theme->allow_root_page)? "?root=yes" : null; ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>"> <a id="g-logo" href="<?= item::root()->url() ?><?= ($theme->allow_root_page)? "?root=yes" : null; ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
<img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->logopath ?>" /> <img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->logopath ?>" />
</a> </a>
<? endif ?> <? endif; ?>
<? endif; ?>
<? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?> <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?>
<div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>"> <div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>">
<?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?> <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
@ -160,13 +169,18 @@
<? if ($theme->loginmenu_position == "header"): ?> <? if ($theme->loginmenu_position == "header"): ?>
<?= $theme->user_menu() ?> <?= $theme->user_menu() ?>
<? endif ?> <? endif ?>
<? <?
// Custom rWatcher code, based on the breadcrumb menu function. // Custom rWatcher code, based on the breadcrumb menu function.
// The rest of this file is the original page.html.php file from the Grey Dragon theme. // The rest of this file is the original page.html.php file from the Grey Dragon theme.
?> ?>
<? if (empty($breadcrumbs)): ?> <? if (empty($breadcrumbs)): ?>
<? if (empty($parents)): ?>
<?= $theme->breadcrumb_menu($theme, null); ?> <?= $theme->breadcrumb_menu($theme, null); ?>
<? else: ?> <? else: ?>
<?= $theme->breadcrumb_menu($theme, $parents); ?>
<? endif; ?>
<? else: ?>
<? <?
$breadcrumb_content = ""; $breadcrumb_content = "";
if ($this->breadcrumbs_position == "hide"): if ($this->breadcrumbs_position == "hide"):
@ -193,6 +207,7 @@
// End Edit. // End Edit.
?> ?>
<? endif; ?> <? endif; ?>
<?= $theme->custom_header(); ?> <?= $theme->custom_header(); ?>
</div> </div>
@ -281,15 +296,17 @@
</div> </div>
<? endif; ?> <? endif; ?>
<div id="g-footer"> <div id="g-footer">
<?= $theme->footer() ?> <? if ($theme->viewmode != "mini"): ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?> <?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<span id="g-footer-text"><?= $theme->bb2html($footer_text, 1) ?></span> <span id="g-footer-text"><?= $theme->bb2html($footer_text, 1) ?></span>
<? endif ?> <? endif ?>
<?= $theme->credits() ?> <?= $theme->credits() ?>
<ul id="g-footer-rightside"><li><?= $theme->copyright ?></li></ul> <ul id="g-footer-rightside"><li><?= $theme->copyright ?></li></ul>
<? if ($theme->loginmenu_position == "default"): ?> <? if ($theme->loginmenu_position == "default"): ?>
<?= $theme->user_menu() ?> <?= $theme->user_menu() ?>
<? endif ?> <? endif; ?>
<? endif; ?>
<?= $theme->custom_footer(); ?> <?= $theme->custom_footer(); ?>
</div> </div>
<?= $theme->page_bottom() ?> <?= $theme->page_bottom() ?>

View File

@ -53,7 +53,7 @@
$siblings = $dynamic_siblings; $siblings = $dynamic_siblings;
for ($i = 1; $i <= $total_pages; $i++): for ($i = 1; $i <= $total_pages; $i++):
if ($page_type == "item") { if ($page_type == "item") {
$_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id); $_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($siblings[$i-1]->name));
} elseif ($page_type == "") { } elseif ($page_type == "") {
} }
endfor; endfor;
@ -91,6 +91,7 @@
$_pagelist[1] = url::site(); $_pagelist[1] = url::site();
break; break;
} }
// rWatcher Mod // rWatcher Mod
endif; endif;
// End rWatcher Mod. // End rWatcher Mod.

View File

@ -48,7 +48,7 @@
<div id="g-info"> <div id="g-info">
<h1><?= $_title ?></h1> <h1><?= $_title ?></h1>
</div> </div>
<?= $theme->add_paginator("top"); ?> <?= $theme->add_paginator("top", FALSE); ?>
<?= $theme->photo_top() ?> <?= $theme->photo_top() ?>
<? if (($theme->photo_descmode == "top") and ($_description)): ?> <? if (($theme->photo_descmode == "top") and ($_description)): ?>
<div id="g-info"><div class="g-description"><?= $_description ?></div></div> <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
@ -56,7 +56,7 @@
<div id="g-photo"> <div id="g-photo">
<?= $theme->resize_top($item) ?> <?= $theme->resize_top($item) ?>
<? $_resizewidth = $item->resize_width; <? $_resizewidth = $item->resize_width;
// rWatcher Modification. // rWatcher Modification.
$siblings = ""; $siblings = "";
if (isset($dynamic_siblings)) { if (isset($dynamic_siblings)) {
@ -116,7 +116,7 @@
<? if (($theme->photo_descmode == "bottom") and ($_description)): ?> <? if (($theme->photo_descmode == "bottom") and ($_description)): ?>
<div id="g-info"><div class="g-description"><?= $_description ?></div></div> <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
<? endif; ?> <? endif; ?>
<?= $theme->add_paginator("bottom"); ?> <?= $theme->add_paginator("bottom", FALSE); ?>
<?= $theme->photo_bottom() ?> <?= $theme->photo_bottom() ?>
</div> </div>
<?= $script ?> <?= $script ?>

View File

@ -132,7 +132,7 @@
<?= $theme->header_bottom() ?> <?= $theme->header_bottom() ?>
</div> </div>
<? // The following code was modifed to allow module-defined breadcrumbs. <? // rWatcher EDIT: 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. // Everything else in this file is a copy of the default page.html.php file.
?> ?>
<? if (!empty($breadcrumbs)): ?> <? if (!empty($breadcrumbs)): ?>
@ -145,9 +145,14 @@
the immediate parent so that when you go back up a the immediate parent so that when you go back up a
level you're on the right page. --> level you're on the right page. -->
<? if ($breadcrumb->url) : ?> <? if ($breadcrumb->url) : ?>
<a href="<?= $breadcrumb->url ?>"><?= html::purify($breadcrumb->title) ?></a> <a href="<?= $breadcrumb->url ?>">
<? // limit the title length to something reasonable (defaults to 15) ?>
<?= html::purify(text::limit_chars($breadcrumb->title,
module::get_var("gallery", "visible_title_length"))) ?>
</a>
<? else : ?> <? else : ?>
<?= html::purify($breadcrumb->title) ?> <?= html::purify(text::limit_chars($breadcrumb->title,
module::get_var("gallery", "visible_title_length"))) ?>
<? endif ?> <? endif ?>
</li> </li>
<? $i++ ?> <? $i++ ?>
@ -156,7 +161,7 @@
<? endif ?> <? endif ?>
<? // End modified code ?> <? // End modified code ?>
</div> </div>
<div id="bd"> <div id="bd">
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"> <div class="yui-b">

View File

@ -56,8 +56,8 @@
<meta name="teoma" content="noindex, nofollow, noarchive" /> <meta name="teoma" content="noindex, nofollow, noarchive" />
<? endif; ?> <? endif; ?>
<? if ($theme->blendpagetrans): ?> <? if ($theme->blendpagetrans): ?>
<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5)" /> <meta http-equiv="Page-Enter" content="blendtrans(duration=0.5)" />
<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5)" /> <meta http-equiv="Page-Exit" content="blendtrans(duration=0.5)" />
<? endif; ?> <? endif; ?>
<!-- Internet Explorer 9 Meta tags : Start --> <!-- Internet Explorer 9 Meta tags : Start -->
<meta name="application-name" content="<?= $_title; ?>" /> <meta name="application-name" content="<?= $_title; ?>" />
@ -124,12 +124,20 @@
<style type="text/css"> #g-column-bottom #g-thumbnav-block, #g-column-top #g-thumbnav-block { display: none; } </style> <style type="text/css"> #g-column-bottom #g-thumbnav-block, #g-column-top #g-thumbnav-block { display: none; } </style>
<? endif; ?> <? endif; ?>
</head> </head>
<? if ($theme->item()): ?> <? if ($theme->item()):
<? $item = $theme->item(); ?> $item = $theme->item();
<? else: ?> else:
<? $item = item::root(); ?> $item = item::root();
<? endif; ?> endif;
<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($theme->is_rtl)? "class=\"rtl\"" : null; ?> > if ($theme->is_rtl):
$body_class = "rtl";
else:
$body_class = "";
endif;
if ($theme->viewmode == "mini"):
$body_class .= "viewmode-mini";
endif; ?>
<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($body_class)? 'class="' . $body_class . '"' : null; ?>>
<?= $theme->page_top() ?> <?= $theme->page_top() ?>
<?= $theme->site_status() ?> <?= $theme->site_status() ?>
<? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?> <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?>
@ -140,14 +148,15 @@
<? endif ?> <? endif ?>
<div id="g-header"> <div id="g-header">
<?= $theme->header_top() ?> <?= $theme->header_top() ?>
<? if ($header_text = module::get_var("gallery", "header_text")): ?> <? if ($theme->viewmode != "mini"): ?>
<? if ($header_text = module::get_var("gallery", "header_text")): ?>
<span id="g-header-text"><?= $theme->bb2html($header_text, 1) ?></span> <span id="g-header-text"><?= $theme->bb2html($header_text, 1) ?></span>
<? else: ?> <? else: ?>
<a id="g-logo" href="<?= item::root()->url() ?><?= ($theme->allow_root_page)? "?root=yes" : null; ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>"> <a id="g-logo" href="<?= item::root()->url() ?><?= ($theme->allow_root_page)? "?root=yes" : null; ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
<img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->logopath ?>" /> <img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->logopath ?>" />
</a> </a>
<? endif ?> <? endif; ?>
<? endif; ?>
<? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?> <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?>
<div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>"> <div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>">
<?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?> <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
@ -160,13 +169,18 @@
<? if ($theme->loginmenu_position == "header"): ?> <? if ($theme->loginmenu_position == "header"): ?>
<?= $theme->user_menu() ?> <?= $theme->user_menu() ?>
<? endif ?> <? endif ?>
<? <?
// Custom rWatcher code, based on the breadcrumb menu function. // Custom rWatcher code, based on the breadcrumb menu function.
// The rest of this file is the original page.html.php file from the Grey Dragon theme. // The rest of this file is the original page.html.php file from the Grey Dragon theme.
?> ?>
<? if (empty($breadcrumbs)): ?> <? if (empty($breadcrumbs)): ?>
<? if (empty($parents)): ?>
<?= $theme->breadcrumb_menu($theme, null); ?> <?= $theme->breadcrumb_menu($theme, null); ?>
<? else: ?> <? else: ?>
<?= $theme->breadcrumb_menu($theme, $parents); ?>
<? endif; ?>
<? else: ?>
<? <?
$breadcrumb_content = ""; $breadcrumb_content = "";
if ($this->breadcrumbs_position == "hide"): if ($this->breadcrumbs_position == "hide"):
@ -193,6 +207,7 @@
// End Edit. // End Edit.
?> ?>
<? endif; ?> <? endif; ?>
<?= $theme->custom_header(); ?> <?= $theme->custom_header(); ?>
</div> </div>
@ -281,15 +296,17 @@
</div> </div>
<? endif; ?> <? endif; ?>
<div id="g-footer"> <div id="g-footer">
<?= $theme->footer() ?> <? if ($theme->viewmode != "mini"): ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?> <?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<span id="g-footer-text"><?= $theme->bb2html($footer_text, 1) ?></span> <span id="g-footer-text"><?= $theme->bb2html($footer_text, 1) ?></span>
<? endif ?> <? endif ?>
<?= $theme->credits() ?> <?= $theme->credits() ?>
<ul id="g-footer-rightside"><li><?= $theme->copyright ?></li></ul> <ul id="g-footer-rightside"><li><?= $theme->copyright ?></li></ul>
<? if ($theme->loginmenu_position == "default"): ?> <? if ($theme->loginmenu_position == "default"): ?>
<?= $theme->user_menu() ?> <?= $theme->user_menu() ?>
<? endif ?> <? endif; ?>
<? endif; ?>
<?= $theme->custom_footer(); ?> <?= $theme->custom_footer(); ?>
</div> </div>
<?= $theme->page_bottom() ?> <?= $theme->page_bottom() ?>

View File

@ -53,7 +53,7 @@
$siblings = $dynamic_siblings; $siblings = $dynamic_siblings;
for ($i = 1; $i <= $total_pages; $i++): for ($i = 1; $i <= $total_pages; $i++):
if ($page_type == "item") { if ($page_type == "item") {
$_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id); $_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($siblings[$i-1]->name));
} elseif ($page_type == "") { } elseif ($page_type == "") {
} }
endfor; endfor;
@ -91,6 +91,7 @@
$_pagelist[1] = url::site(); $_pagelist[1] = url::site();
break; break;
} }
// rWatcher Mod // rWatcher Mod
endif; endif;
// End rWatcher Mod. // End rWatcher Mod.

View File

@ -48,7 +48,7 @@
<div id="g-info"> <div id="g-info">
<h1><?= $_title ?></h1> <h1><?= $_title ?></h1>
</div> </div>
<?= $theme->add_paginator("top"); ?> <?= $theme->add_paginator("top", FALSE); ?>
<?= $theme->photo_top() ?> <?= $theme->photo_top() ?>
<? if (($theme->photo_descmode == "top") and ($_description)): ?> <? if (($theme->photo_descmode == "top") and ($_description)): ?>
<div id="g-info"><div class="g-description"><?= $_description ?></div></div> <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
@ -56,7 +56,7 @@
<div id="g-photo"> <div id="g-photo">
<?= $theme->resize_top($item) ?> <?= $theme->resize_top($item) ?>
<? $_resizewidth = $item->resize_width; <? $_resizewidth = $item->resize_width;
// rWatcher Modification. // rWatcher Modification.
$siblings = ""; $siblings = "";
if (isset($dynamic_siblings)) { if (isset($dynamic_siblings)) {
@ -116,7 +116,7 @@
<? if (($theme->photo_descmode == "bottom") and ($_description)): ?> <? if (($theme->photo_descmode == "bottom") and ($_description)): ?>
<div id="g-info"><div class="g-description"><?= $_description ?></div></div> <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
<? endif; ?> <? endif; ?>
<?= $theme->add_paginator("bottom"); ?> <?= $theme->add_paginator("bottom", FALSE); ?>
<?= $theme->photo_bottom() ?> <?= $theme->photo_bottom() ?>
</div> </div>
<?= $script ?> <?= $script ?>

View File

@ -132,7 +132,7 @@
<?= $theme->header_bottom() ?> <?= $theme->header_bottom() ?>
</div> </div>
<? // The following code was modifed to allow module-defined breadcrumbs. <? // rWatcher EDIT: 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. // Everything else in this file is a copy of the default page.html.php file.
?> ?>
<? if (!empty($breadcrumbs)): ?> <? if (!empty($breadcrumbs)): ?>
@ -145,9 +145,14 @@
the immediate parent so that when you go back up a the immediate parent so that when you go back up a
level you're on the right page. --> level you're on the right page. -->
<? if ($breadcrumb->url) : ?> <? if ($breadcrumb->url) : ?>
<a href="<?= $breadcrumb->url ?>"><?= html::purify($breadcrumb->title) ?></a> <a href="<?= $breadcrumb->url ?>">
<? // limit the title length to something reasonable (defaults to 15) ?>
<?= html::purify(text::limit_chars($breadcrumb->title,
module::get_var("gallery", "visible_title_length"))) ?>
</a>
<? else : ?> <? else : ?>
<?= html::purify($breadcrumb->title) ?> <?= html::purify(text::limit_chars($breadcrumb->title,
module::get_var("gallery", "visible_title_length"))) ?>
<? endif ?> <? endif ?>
</li> </li>
<? $i++ ?> <? $i++ ?>
@ -156,7 +161,7 @@
<? endif ?> <? endif ?>
<? // End modified code ?> <? // End modified code ?>
</div> </div>
<div id="bd"> <div id="bd">
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"> <div class="yui-b">