From 081d2d1b0dc978038e55fbd6738ecb8bb95f8c73 Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Wed, 14 Mar 2012 15:19:27 +0100
Subject: [PATCH] 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
---
 css/pear.css         |  2 ++
 js/pear.js           |  1 +
 theme.info           |  2 +-
 views/album.html.php | 10 +++++++---
 views/page.html.php  |  1 +
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/css/pear.css b/css/pear.css
index 15b761f2..9fce1567 100644
--- a/css/pear.css
+++ b/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/js/pear.js b/js/pear.js
index ff396c2a..f4e855b9 100644
--- a/js/pear.js
+++ b/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/theme.info b/theme.info
index 5903a3df..58956738 100644
--- a/theme.info
+++ b/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 <fredrik.e@gmail.com>"
 site = 1
 admin = 0
diff --git a/views/album.html.php b/views/album.html.php
index d2e4c7f4..747f94c5 100644
--- a/views/album.html.php
+++ b/views/album.html.php
@@ -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 () {
diff --git a/views/page.html.php b/views/page.html.php
index 7891aad9..ef6c2719 100644
--- a/views/page.html.php
+++ b/views/page.html.php
@@ -171,6 +171,7 @@ if (isset($_GET['ajax'])) {
 		<?= $theme->header_bottom() ?>
 	</div>
 </div>
+<?= $theme->messages() ?>
 
 <?= $content ?>