Squashed '3.0/themes/pear4gallery3/' changes from 02f212c..f9f9805
f9f9805 support for -messages() at page top 57643c2 fixes problem when the pear_album_views table not is available version up (3.4.1.) git-subtree-dir: 3.0/themes/pear4gallery3 git-subtree-split: f9f9805920d5408256b146536f794aada14d8765
This commit is contained in:
parent
7e86b7c02b
commit
081d2d1b0d
@ -2,6 +2,7 @@ body {
|
||||
overflow: hidden;
|
||||
font-size: 10px;
|
||||
color: #999 !important;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#loading {
|
||||
@ -165,6 +166,7 @@ outline: medium none;
|
||||
overflow: hidden;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#mosaicDetail {
|
||||
|
@ -632,6 +632,7 @@ function pearInit(options) {
|
||||
switchToGrid();
|
||||
}
|
||||
checkCookie();
|
||||
$('#mosaicTable').css('top', 45 +$('#g-action-status').outerHeight(true));
|
||||
$('#loading').hide();
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
name = ".Pear Theme"
|
||||
description = "A theme with the intention to mimic Apples mobile me gallery."
|
||||
version = 3.4
|
||||
version = 3.4.1
|
||||
author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
|
||||
site = 1
|
||||
admin = 0
|
||||
|
@ -5,9 +5,13 @@ var slideshowImages = new Array();
|
||||
var thumbImages = new Array();
|
||||
<?
|
||||
$defaultView = module::get_var("th_pear4gallery3", "mainmenu_view", "grid");
|
||||
$result = ORM::factory("pear_album_view")->where("album_id", "=", $item->id)->find();
|
||||
if($result->loaded()) {
|
||||
$defaultView = $result->view_mode;
|
||||
try {
|
||||
$result = ORM::factory("pear_album_view")->where("album_id", "=", $item->id)->find();
|
||||
if($result->loaded()) {
|
||||
$defaultView = $result->view_mode;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
unset($e);
|
||||
}
|
||||
?>
|
||||
$(window).load(function () {
|
||||
|
@ -171,6 +171,7 @@ if (isset($_GET['ajax'])) {
|
||||
<?= $theme->header_bottom() ?>
|
||||
</div>
|
||||
</div>
|
||||
<?= $theme->messages() ?>
|
||||
|
||||
<?= $content ?>
|
||||
|
||||
|
Reference in New Issue
Block a user