1
0

Merge pull request #104 from fredrike/master

Made a stupid error in my last commit, please accept this update.
This commit is contained in:
Tim Almdal 2012-03-14 08:33:09 -07:00
commit 677de0d367
5 changed files with 12 additions and 4 deletions

View File

@ -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 {

View File

@ -632,6 +632,7 @@ function pearInit(options) {
switchToGrid();
}
checkCookie();
$('#mosaicTable').css('top', 45 +$('#g-action-status').outerHeight(true));
$('#loading').hide();
}

View File

@ -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

View File

@ -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 () {

View File

@ -171,6 +171,7 @@ if (isset($_GET['ajax'])) {
<?= $theme->header_bottom() ?>
</div>
</div>
<?= $theme->messages() ?>
<?= $content ?>