Skip to content

Commit

Permalink
Merge pull request #192 from JoomJunk/development
Browse files Browse the repository at this point in the history
Merge Update v6.0.1
C-Lodder committed Sep 30, 2015
2 parents 5e4240d + ca16fb5 commit dc47a57
Showing 5 changed files with 15 additions and 3 deletions.
3 changes: 3 additions & 0 deletions changelog.php
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@
- -> Removed
! -> Note

Version 6.0.1
# Fixes to smiley dropdown for Bootstrap 3

Version 6.0.0
+ Added option to hide security question for registered users
+ Added shoutbox history/archive
2 changes: 1 addition & 1 deletion mod_shoutbox/mod_shoutbox.xml
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions mod_shoutbox/sql/mysql/updates/6.0.1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Placeholder file for database changes for version 6.0.1
1 change: 1 addition & 0 deletions mod_shoutbox/sql/postgresql/updates/6.0.1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Placeholder file for database changes for version 6.0.1
11 changes: 9 additions & 2 deletions mod_shoutbox/tmpl/default.php
Original file line number Diff line number Diff line change
@@ -191,11 +191,18 @@ class="<?php echo $input_txtarea; ?>"
<?php echo $helper->smileyshow(); ?>
</ul>
</div>
<?php else: ?>
<?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>
<ul class="dropdown-menu inline list-inline list-style">
<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 list-inline list-unstyled">
<?php echo $helper->smileyshow(); ?>
</ul>
<?php endif; ?>

0 comments on commit dc47a57

Please sign in to comment.