diff --git a/3.0/themes/pear4gallery3/css/pear.css b/3.0/themes/pear4gallery3/css/pear.css index 15b761f2..9fce1567 100644 --- a/3.0/themes/pear4gallery3/css/pear.css +++ b/3.0/themes/pear4gallery3/css/pear.css @@ -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 { diff --git a/3.0/themes/pear4gallery3/js/pear.js b/3.0/themes/pear4gallery3/js/pear.js index ff396c2a..f4e855b9 100644 --- a/3.0/themes/pear4gallery3/js/pear.js +++ b/3.0/themes/pear4gallery3/js/pear.js @@ -632,6 +632,7 @@ function pearInit(options) { switchToGrid(); } checkCookie(); + $('#mosaicTable').css('top', 45 +$('#g-action-status').outerHeight(true)); $('#loading').hide(); } diff --git a/3.0/themes/pear4gallery3/theme.info b/3.0/themes/pear4gallery3/theme.info index 5903a3df..58956738 100644 --- a/3.0/themes/pear4gallery3/theme.info +++ b/3.0/themes/pear4gallery3/theme.info @@ -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 " site = 1 admin = 0 diff --git a/3.0/themes/pear4gallery3/views/album.html.php b/3.0/themes/pear4gallery3/views/album.html.php index d2e4c7f4..747f94c5 100644 --- a/3.0/themes/pear4gallery3/views/album.html.php +++ b/3.0/themes/pear4gallery3/views/album.html.php @@ -5,9 +5,13 @@ var slideshowImages = new Array(); var thumbImages = new Array(); 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 () { diff --git a/3.0/themes/pear4gallery3/views/page.html.php b/3.0/themes/pear4gallery3/views/page.html.php index 7891aad9..ef6c2719 100644 --- a/3.0/themes/pear4gallery3/views/page.html.php +++ b/3.0/themes/pear4gallery3/views/page.html.php @@ -171,6 +171,7 @@ if (isset($_GET['ajax'])) { header_bottom() ?> +messages() ?>