From d4a5772bf310e928ddaeca1a08b5d671ca80d57f Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Fri, 8 Mar 2013 20:09:29 -0800
Subject: [PATCH] Gallery main-page template switched to bootstrap styling

---
 e107_plugins/gallery/e_shortcode.php          |  8 ++--
 e107_plugins/gallery/gallery_style.css        | 24 ++---------
 .../gallery/templates/gallery_template.php    | 42 +++++++++++--------
 3 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/e107_plugins/gallery/e_shortcode.php b/e107_plugins/gallery/e_shortcode.php
index 5fb93a903..ad659cf1c 100644
--- a/e107_plugins/gallery/e_shortcode.php
+++ b/e107_plugins/gallery/e_shortcode.php
@@ -58,8 +58,8 @@ class gallery_shortcodes extends e_shortcode
 		$tp 		= e107::getParser();	
 		$parms 		= eHelper::scParams($parm);
 		
-		$w 			= vartrue($parms['w']) ? $parms['w'] : 190;
-		$h 			= vartrue($parms['h']) ? $parms['h'] : 150;	
+		$w 			= vartrue($parms['w']) ? $parms['w'] : 160;
+		$h 			= vartrue($parms['h']) ? $parms['h'] : 120;	
 		
 		$class 		= ($this->slideMode == TRUE) ? 'gallery-slideshow-thumb' : 'gallery-thumb';
 		$rel 		= ($this->slideMode == TRUE) ? 'lightbox.SlideGallery' : 'lightbox.Gallery';
@@ -117,8 +117,8 @@ class gallery_shortcodes extends e_shortcode
 	{
 		$parms = eHelper::scParams($parm);
 		
-		$w 			= vartrue($parms['w']) ? $parms['w'] : 190;
-		$h 			= vartrue($parms['h']) ? $parms['h'] : 150;	
+		$w 			= vartrue($parms['w']) ? $parms['w'] : 260;
+		$h 			= vartrue($parms['h']) ? $parms['h'] : 180;	
 		$att 		= 'aw='.$w.'&ah='.$h.'&x=1'; // 'aw=190&ah=150';
 		
 		$url = e107::getUrl()->create('gallery/index/list', $this->var);
diff --git a/e107_plugins/gallery/gallery_style.css b/e107_plugins/gallery/gallery_style.css
index 1ef8ed139..20f52f844 100644
--- a/e107_plugins/gallery/gallery_style.css
+++ b/e107_plugins/gallery/gallery_style.css
@@ -3,32 +3,16 @@
 
 /* IMAGE LIST */
 
-.gallery-list-start		{ clear:both; }
-
-.gallery-list-item		{ width:190px; height:180px; float:left; margin:3px; border:1px solid #000000; background-color:#000000 }
-
-.gallery-list-end		{ text-align:center; clear:both; padding-top:20px; }
-
-.gallery-list-caption 	{ display:block; text-align:center; color:#FFFFFF; }
-
+ul.gallery > li > div > h5 			{ text-align: center }
+ul.gallery-cat > li > div > h3 		{ text-align: center }
 
 /* CATEGORY LIST */
 
-.gallery-cat-start		{ clear:both; }
 
-.gallery-cat-item		{ width:190px; height:180px; float:left; margin:3px; border:1px solid #000000; background-color:#000000; }
 
-.gallery-cat-end		{ text-align:center; clear:both; }
+.lb-dataContainer					{ padding-top:10px; font-size: 110%;}
 
-.gallery-cat-title		{ text-align:center; }
-
-.gallery-list-nextprev	{ text-align:center; }
-
-.gallery-list-back		{ }
-
-.lb-dataContainer		{ padding-top:10px; font-size: 110%;}
-
-.lb-caption				{  }
+.lb-caption							{  }
 
 
 /* SLIDESHOW */
diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php
index ca9fe56e1..1dd3c729d 100644
--- a/e107_plugins/gallery/templates/gallery_template.php
+++ b/e107_plugins/gallery/templates/gallery_template.php
@@ -8,40 +8,48 @@
 
   
 $GALLERY_TEMPLATE['LIST_START'] = 
-	"<div class='gallery-list-start'>";
+	'<ul class="thumbnails gallery">';
 
 		
-$GALLERY_TEMPLATE['LIST_ITEM'] = 
-	"<div class='gallery-list-item'>
-	<div>{GALLERY_THUMB}</div>
-	<div class='gallery-list-caption'>{GALLERY_CAPTION}</div>
+$GALLERY_TEMPLATE['LIST_ITEM'] =  '
+ <li class="span2">
+	<div class="thumbnail">
+		{GALLERY_THUMB}
+		<h5>{GALLERY_CAPTION}</h5>
 	</div>
-	";
+</li>';
 
 $GALLERY_TEMPLATE['LIST_END'] = 
-	"</div>
-	<div class='gallery-list-end' >
-	<div class='gallery-list-nextprev'>{GALLERY_NEXTPREV}</div>
-	<div class='gallery-list-back'><a href='{GALLERY_BASEURL}'>Back to Categories</a></div>
+	"</ul>
+	<div class='center' >
+		<div class='gallery-list-nextprev'>{GALLERY_NEXTPREV}</div>
+		<div class='gallery-list-back'><a class='btn' href='{GALLERY_BASEURL}'>Back to Categories</a></div>
 	</div>
-	";
+";
 	
 	
 $GALLERY_TEMPLATE['CAT_START'] = 
-	"<div class='gallery-cat-start'>";
+	'<ul class="thumbnails gallery-cat">';
+	
+	    
+$GALLERY_TEMPLATE['CAT_ITEM'] = '
+ <li class="span3">
+	<div class="thumbnail">
+		{GALLERY_CAT_THUMB}
+		<h3>{GALLERY_CAT_TITLE}</h3>
+	</div>
+</li>';
 
-		
+/*		
 $GALLERY_TEMPLATE['CAT_ITEM'] = 
 	"<div class='gallery-cat-item'>
 	<div class='gallery-cat-thumb'>{GALLERY_CAT_THUMB}</div>
 	<div class='gallery-cat-title'><h3>{GALLERY_CAT_TITLE}</h3></div>
 	</div>
 	";
-
+*/
 $GALLERY_TEMPLATE['CAT_END'] = 
-	"</div>
-	<div class='gallery-cat-end'>
-	</div>
+	"</ul>
 	";
 
 // {GALLERY_SLIDESHOW=X}  X = Gallery Category. Default: 1 (ie. 'gallery_1') Overrides preference in admin.