From d34279eecbdb284dd8a44f71e1684a81feaf9de3 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 27 Jun 2014 18:18:22 +0100
Subject: [PATCH] Improved the style features in he advanced tap area of the
 module

---
 .../language/en-GB/en-GB.mod_pergroup.ini     |  1 +
 mod_pergroup.xml                              |  9 +++---
 tmpl/default.php                              | 32 ++++++++++++++-----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.mod_pergroup.ini b/administrator/language/en-GB/en-GB.mod_pergroup.ini
index 98170c8..961a1de 100644
--- a/administrator/language/en-GB/en-GB.mod_pergroup.ini
+++ b/administrator/language/en-GB/en-GB.mod_pergroup.ini
@@ -17,6 +17,7 @@ MOD_PERGROUP_NOT_IN_GROUP="Not In Group"
 MOD_PERGROUP_EXECUTION_DIRECTION="Execution Direction"
 MOD_PERGROUP_UP="Up"
 MOD_PERGROUP_DOWN="Down"
+MOD_PERGROUP_NONE="None"
 MOD_PERGROUP_BREAK="New Line"
 MOD_PERGROUP_CLASS="Class [&lt;div class=&quot;separator&quot;&gt;]"
 MOD_PERGROUP_BOOTSTRAP="Bootstrap"
diff --git a/mod_pergroup.xml b/mod_pergroup.xml
index 2867e0e..c5d49b0 100644
--- a/mod_pergroup.xml
+++ b/mod_pergroup.xml
@@ -306,10 +306,11 @@
 					<option value="0">MOD_PERGROUP_DOWN</option>
 				</field>
 				<field name="separator" type="radio" default="0" label="MOD_PERGROUP_SEPERATOR" description="">
-  					<option value="0">MOD_PERGROUP_BREAK</option>
-  					<option value="1">MOD_PERGROUP_CLASS</option>
-  					<option value="2">MOD_PERGROUP_BOOTSTRAP</option>
-  					<option value="3">MOD_PERGROUP_DIV</option>
+					<option value="0">MOD_PERGROUP_NONE</option>
+  					<option value="1">MOD_PERGROUP_BREAK</option>
+  					<option value="2">MOD_PERGROUP_CLASS</option>
+  					<option value="3">MOD_PERGROUP_BOOTSTRAP</option>
+  					<option value="4">MOD_PERGROUP_DIV</option>
 				</field>
 				<field
 					name="layout"
diff --git a/tmpl/default.php b/tmpl/default.php
index 2d353b1..606222a 100644
--- a/tmpl/default.php
+++ b/tmpl/default.php
@@ -15,17 +15,33 @@ $separator_value = $params->get('separator');
 ?>
 
 <?php if(is_array($module->results)): ?>
-<div>
 	<?php $i = 0; ?>
 	<?php foreach($module->results as $group_id => &$group): ?>
 		<?php if(is_array($group)): ?>
-        <?php foreach($group as $text): ?>
-			<?php if($counter): ?>
-				<?php echo '<br/>'; ?>
-			<?php endif; ?>
-			<?php echo ($prepare_content) ? JHtml::_('content.prepare', $text) : $text; $i++; ?>
-        <?php endforeach; ?>
+			<?php foreach($group as $text): ?>
+                <?php if($text): ?>
+                        
+						<?php if($separator_value): ?>
+                        	<?php if($separator_value == 1): ?>
+                            	<?php echo ($i) ? '<br/>' : ''; ?>
+                            <?php else: ?>
+                            	<div<?php echo ($separator_value == 2) ? ' class="separator"' : ''; echo ($separator_value == 3) ? ' class="jumbotron"' : ''; ?>>
+                            <?php endif; ?>
+                        <?php endif; ?>
+                        
+                        <!-- the main text -->
+                        <?php echo ($prepare_content) ? JHtml::_('content.prepare', $text) : $text; ?>
+                        
+                        <?php if($separator_value): ?>
+                        	<?php if($separator_value != 1): ?>
+                            	</div>
+                            <?php endif; ?>
+                        <?php endif ?>
+                        
+						<?php $i++; ?>
+                        
+            	<?php endif; ?>
+            <?php endforeach; ?>
 		<?php endif; ?>
 	<?php endforeach; ?>
-</div>
 <?php endif; ?>
\ No newline at end of file