gallerific increase thumb count, increase main image size

3 files changed, 9 insertions, 8 deletions

diff --git a/FisheyeGallery.php b/FisheyeGallery.php
index 75334b9..ac579d9 100644
--- a/FisheyeGallery.php
+++ b/FisheyeGallery.php
@@ -188,14 +188,14 @@ class FisheyeGallery extends FisheyeBase {
 		return count($this->mInfo);
 	}
 
-	function loadImages( $pPage=-1 ) {
+	function loadImages( $pPage=-1, $pImagesPerPage=-1) {
 		global $gLibertySystem, $gBitSystem, $gBitUser;
 		if( !$this->isValid() ) {
 			return NULL;
 		}
 		$bindVars = array($this->mContentId);
 		$whereSql = $selectSql = $joinSql = $orderSql = '';
-		$rows = $offset = NULL;
+		$rowCount = $offset = NULL;
 
 		if( $gBitSystem->isFeatureActive( 'fisheye_gallery_default_sort_mode' ) ) {
 			$orderSql = ", ".$this->mDb->convertSortmode( $gBitSystem->getConfig( 'fisheye_gallery_default_sort_mode' ) );
@@ -217,10 +217,10 @@ class FisheyeGallery extends FisheyeBase {
 					array_push( $bindVars, $mantissa );
 				}
 			} elseif( $this->getLayout() == FISHEYE_PAGINATION_FIXED_GRID ) {
-				$rows = $this->getField( 'rows_per_page' ) * $this->getField( 'cols_per_page' );
-				$offset = $rows * ($pPage - 1);
+				$rowCount = $this->getField( 'rows_per_page' ) * $this->getField( 'cols_per_page' );
+				$offset = $rowCount * ($pPage - 1);
 			} else {
-				$rows = -1;
+				$rowCount = $pImagesPerPage;
 			}
 		}
 
@@ -234,7 +234,7 @@ class FisheyeGallery extends FisheyeBase {
 					LEFT OUTER JOIN `".BIT_DB_PREFIX."users_favorites_map` ufm ON ( ufm.`favorite_content_id`=lc.`content_id` AND lc.`user_id`=ufm.`user_id` )
 				WHERE fgim.`gallery_content_id` = ? $whereSql
 				ORDER BY fgim.`item_position` $orderSql";
-		$rs = $this->mDb->query($query, $bindVars, $rows, $offset);
+		$rs = $this->mDb->query($query, $bindVars, $rowCount, $offset);
 
 		$rows = $rs->getRows();
 		foreach ($rows as $row) {
diff --git a/gallery_views/galleriffic/css/galleriffic_style_1.css b/gallery_views/galleriffic/css/galleriffic_style_1.css
index 07bbaeb..6283898 100644
--- a/gallery_views/galleriffic/css/galleriffic_style_1.css
+++ b/gallery_views/galleriffic/css/galleriffic_style_1.css
@@ -172,7 +172,7 @@ div.image-desc {
 div.download {
 	margin-top: 8px;
 }
-.navigation-container { width:35%; float:left; }
+.navigation-container { width:30%; float:left; }
 div.navigation {
 	float: left;
 	position: relative;
@@ -246,6 +246,7 @@ div.gallery-gutter {
 	padding-bottom: 20px;
 }
 #gallery {
+	width:70%;
 	overflow:hidden;
 }
 div#page {
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index 6649896..50eb780 100644
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
@@ -106,7 +106,7 @@ jQuery(document).ready(function($) {
 	// Initialize Advanced Galleriffic Gallery
 	var gallery = $('#thumbs').galleriffic({
 		delay:                     2500,
-		numThumbs:                 20,
+		numThumbs:                 30,
 		preloadAhead:              10,
 		enableTopPager:            true,
 		enableBottomPager:         true,