Merge commit '081d2d1b0dc978038e55fbd6738ecb8bb95f8c73'
This commit is contained in:
commit
4a5672ef64
@ -2,6 +2,7 @@ body {
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
color: #999 !important;
|
color: #999 !important;
|
||||||
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
#loading {
|
#loading {
|
||||||
@ -165,6 +166,7 @@ outline: medium none;
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mosaicDetail {
|
#mosaicDetail {
|
||||||
|
@ -632,6 +632,7 @@ function pearInit(options) {
|
|||||||
switchToGrid();
|
switchToGrid();
|
||||||
}
|
}
|
||||||
checkCookie();
|
checkCookie();
|
||||||
|
$('#mosaicTable').css('top', 45 +$('#g-action-status').outerHeight(true));
|
||||||
$('#loading').hide();
|
$('#loading').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
name = ".Pear Theme"
|
name = ".Pear Theme"
|
||||||
description = "A theme with the intention to mimic Apples mobile me gallery."
|
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>"
|
author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
|
||||||
site = 1
|
site = 1
|
||||||
admin = 0
|
admin = 0
|
||||||
|
@ -5,10 +5,14 @@ var slideshowImages = new Array();
|
|||||||
var thumbImages = new Array();
|
var thumbImages = new Array();
|
||||||
<?
|
<?
|
||||||
$defaultView = module::get_var("th_pear4gallery3", "mainmenu_view", "grid");
|
$defaultView = module::get_var("th_pear4gallery3", "mainmenu_view", "grid");
|
||||||
|
try {
|
||||||
$result = ORM::factory("pear_album_view")->where("album_id", "=", $item->id)->find();
|
$result = ORM::factory("pear_album_view")->where("album_id", "=", $item->id)->find();
|
||||||
if($result->loaded()) {
|
if($result->loaded()) {
|
||||||
$defaultView = $result->view_mode;
|
$defaultView = $result->view_mode;
|
||||||
}
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
unset($e);
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
$(window).load(function () {
|
$(window).load(function () {
|
||||||
pearInit( {
|
pearInit( {
|
||||||
|
@ -171,6 +171,7 @@ if (isset($_GET['ajax'])) {
|
|||||||
<?= $theme->header_bottom() ?>
|
<?= $theme->header_bottom() ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<?= $theme->messages() ?>
|
||||||
|
|
||||||
<?= $content ?>
|
<?= $content ?>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user