From 8c072b4ba44aecfd02e2939f39f00644c6f98aaa Mon Sep 17 00:00:00 2001
From: Lodder <lodder15@hotmail.co.uk>
Date: Wed, 30 Sep 2015 10:51:05 +0100
Subject: [PATCH 1/5] Prevent BS3 dropdown from auto opening

---
 mod_shoutbox/tmpl/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod_shoutbox/tmpl/default.php b/mod_shoutbox/tmpl/default.php
index 569c50d..aca1898 100644
--- a/mod_shoutbox/tmpl/default.php
+++ b/mod_shoutbox/tmpl/default.php
@@ -192,7 +192,7 @@ class="<?php echo $input_txtarea; ?>"
 									</ul>
 								</div>
 							<?php else: ?>
-								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown">
+								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 									<img src="<?php echo JUri::root(); ?>images/mod_shoutbox/icon_e_smile.gif" alt="&#9786;" />
 								</button>
 								<ul class="dropdown-menu inline list-inline list-style">

From fbaa732de4026a70f6ccc9153070cea5baf59fcb Mon Sep 17 00:00:00 2001
From: C-Lodder <lodder15@hotmail.co.uk>
Date: Wed, 30 Sep 2015 11:51:03 +0100
Subject: [PATCH 2/5] Separate BS2/3 dropdown classes

---
 mod_shoutbox/tmpl/default.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mod_shoutbox/tmpl/default.php b/mod_shoutbox/tmpl/default.php
index aca1898..8c5e120 100644
--- a/mod_shoutbox/tmpl/default.php
+++ b/mod_shoutbox/tmpl/default.php
@@ -191,11 +191,18 @@ class="<?php echo $input_txtarea; ?>"
 										<?php echo $helper->smileyshow(); ?>
 									</ul>
 								</div>
-							<?php else: ?>
+							<?php else if ($framework == 'bootstrap') : ?>
+								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown">
+									<img src="<?php echo JUri::root(); ?>images/mod_shoutbox/icon_e_smile.gif" alt="&#9786;" />
+								</button>
+								<ul class="dropdown-menu inline unstyled">
+									<?php echo $helper->smileyshow(); ?>
+								</ul>
+							<?php else : ?>
 								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 									<img src="<?php echo JUri::root(); ?>images/mod_shoutbox/icon_e_smile.gif" alt="&#9786;" />
 								</button>
-								<ul class="dropdown-menu inline list-inline list-style">
+								<ul class="dropdown-menu list-inline list-unstyled">
 									<?php echo $helper->smileyshow(); ?>
 								</ul>
 							<?php endif; ?>

From 30e59f282f384150bbffe135e855b56d2ae1fdc1 Mon Sep 17 00:00:00 2001
From: C-Lodder <lodder15@hotmail.co.uk>
Date: Wed, 30 Sep 2015 13:03:34 +0100
Subject: [PATCH 3/5] Fixed Fatal error

---
 mod_shoutbox/tmpl/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod_shoutbox/tmpl/default.php b/mod_shoutbox/tmpl/default.php
index 8c5e120..6ef91a8 100644
--- a/mod_shoutbox/tmpl/default.php
+++ b/mod_shoutbox/tmpl/default.php
@@ -191,7 +191,7 @@ class="<?php echo $input_txtarea; ?>"
 										<?php echo $helper->smileyshow(); ?>
 									</ul>
 								</div>
-							<?php else if ($framework == 'bootstrap') : ?>
+							<?php elseif ($framework == 'bootstrap') : ?>
 								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown">
 									<img src="<?php echo JUri::root(); ?>images/mod_shoutbox/icon_e_smile.gif" alt="&#9786;" />
 								</button>

From 4b5a16742ea48a609be347a65c16ffc227612343 Mon Sep 17 00:00:00 2001
From: Lodder <lodder15@hotmail.co.uk>
Date: Wed, 30 Sep 2015 14:24:03 +0100
Subject: [PATCH 4/5] Updated WIP

---
 changelog.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.php b/changelog.php
index 4108546..9273a5f 100644
--- a/changelog.php
+++ b/changelog.php
@@ -14,6 +14,9 @@
 - -> Removed
 ! -> Note
 
+WIP
+# Fixes to smiley dropdown for Bootstrap 3
+
 Version 6.0.0
 + Added option to hide security question for registered users
 + Added shoutbox history/archive

From ca16fb50eb101b48e10ccc9e905d23418be39ea4 Mon Sep 17 00:00:00 2001
From: C-Lodder <lodder15@hotmail.co.uk>
Date: Wed, 30 Sep 2015 22:46:42 +0100
Subject: [PATCH 5/5] Update to v6.0.1

---
 changelog.php                                 | 2 +-
 mod_shoutbox/mod_shoutbox.xml                 | 2 +-
 mod_shoutbox/sql/mysql/updates/6.0.1.sql      | 1 +
 mod_shoutbox/sql/postgresql/updates/6.0.1.sql | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 mod_shoutbox/sql/mysql/updates/6.0.1.sql
 create mode 100644 mod_shoutbox/sql/postgresql/updates/6.0.1.sql

diff --git a/changelog.php b/changelog.php
index 9273a5f..b654cf3 100644
--- a/changelog.php
+++ b/changelog.php
@@ -14,7 +14,7 @@
 - -> Removed
 ! -> Note
 
-WIP
+Version 6.0.1
 # Fixes to smiley dropdown for Bootstrap 3
 
 Version 6.0.0
diff --git a/mod_shoutbox/mod_shoutbox.xml b/mod_shoutbox/mod_shoutbox.xml
index 6566688..574b1e8 100644
--- a/mod_shoutbox/mod_shoutbox.xml
+++ b/mod_shoutbox/mod_shoutbox.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license> 
 	<authorEmail>admin@joomjunk.co.uk</authorEmail> 
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl> 
-	<version>6.0.0</version> 
+	<version>6.0.1</version> 
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>
diff --git a/mod_shoutbox/sql/mysql/updates/6.0.1.sql b/mod_shoutbox/sql/mysql/updates/6.0.1.sql
new file mode 100644
index 0000000..b6d7c43
--- /dev/null
+++ b/mod_shoutbox/sql/mysql/updates/6.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 6.0.1
\ No newline at end of file
diff --git a/mod_shoutbox/sql/postgresql/updates/6.0.1.sql b/mod_shoutbox/sql/postgresql/updates/6.0.1.sql
new file mode 100644
index 0000000..b6d7c43
--- /dev/null
+++ b/mod_shoutbox/sql/postgresql/updates/6.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 6.0.1
\ No newline at end of file