Skip to content

Commit

Permalink
Merge branch 'development35' into joomla35
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge committed Aug 31, 2014
2 parents edf7617 + b3dd3fc commit 421e8dd
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 223 deletions.
6 changes: 6 additions & 0 deletions changelog.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
- -> Removed
! -> Note

Version 1.5.5
# Slider container will no longer overlap other elements
^ CSS enhancements
- Removed jQuery option and thus dropping support for IE8
- Removed support for Joomla 3.0 and 3.1

Version 1.5.4
+ Used more unique naming convertions to prevent overrides
- Removed unnecessary jQuery file for (Joomla 3.2)
Expand Down
48 changes: 0 additions & 48 deletions mod_social_slider/fields/jquery.php

This file was deleted.

30 changes: 15 additions & 15 deletions mod_social_slider/fields/sorting.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected function getInput()
'sort_19' => JText::_('COM_MODULES_CUSTOM4_FIELDSET_LABEL'),
'sort_20' => JText::_('COM_MODULES_CUSTOM5_FIELDSET_LABEL')
);
$document = JFactory::getDocument();
$doc = JFactory::getDocument();

// Inject jQuery onto the page
JHtml::_('jquery.framework');
Expand All @@ -65,24 +65,24 @@ protected function getInput()
JHtml::_('script', 'mod_social_slider/jquery-sortable.js', false, true);

// Now initialize the plugin
$document->addScriptDeclaration('
jQuery(document).ready(function($) {
var group = $("#sortable").sortable({
pullPlaceholder: false,
onDrop: function (item, container, _super) {
$("#' . $this->id . '").val(group.sortable("serialize").get().join("\n"))
_super(item, container)
},
serialize: function (parent, children, isContainer) {
return isContainer ? children.join() : parent.attr("id")
},
})
});
$doc->addScriptDeclaration('
jQuery(document).ready(function($) {
var group = $("#sortable").sortable({
pullPlaceholder: false,
onDrop: function (item, container, _super) {
$("#' . $this->id . '").val(group.sortable("serialize").get().join("\n"))
_super(item, container)
},
serialize: function (parent, children, isContainer) {
return isContainer ? children.join() : parent.attr("id")
},
})
});
');

// Add in relevant styles
$icon = JUri::root() . 'media/mod_social_slider/icons/';
$document->addStyleDeclaration('
$doc->addStyleDeclaration('
body.dragging, body.dragging * {
cursor: move !important;
}
Expand Down
7 changes: 1 addition & 6 deletions mod_social_slider/language/en-GB/en-GB.mod_social_slider.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
; @ Released under GNU/GPL 3.0 License
; Note : All ini files need to be saved as UTF-8

JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 or jQuery animations, providing a small caption which you can link to a social network page.</p>"
JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 transitions, providing a small caption which you can link to a social network page.</p>"

COM_MODULES_FACEBOOK_FIELDSET_LABEL="Facebook"
COM_MODULES_TWITTER_FIELDSET_LABEL="Twitter"
Expand Down Expand Up @@ -144,11 +144,6 @@ JJ_SOCIAL_SLIDER_ICON_COLOUR="Icon Colour"
JJ_SOCIAL_SLIDER_ICON_COLOUR_DESC="Select whether you would likes to have black or white icons"
JJ_SOCIAL_SLIDER_ICONS_WHITE="White"
JJ_SOCIAL_SLIDER_ICONS_BLACK="Black"
JJ_SOCIAL_SLIDER_CSS="CSS"
JJ_SOCIAL_SLIDER_JQUERY_CSS="jQuery or CSS"
JJ_SOCIAL_SLIDER_JQUERY_CSS_DESC="Choose whether you would like to use jQuery or CSS animations"
JJ_SOCIAL_SLIDER_JQUERY="jQuery"
JJ_SOCIAL_SLIDER_NOJQUERY_30="jQuery is included locally in Joomla 3.x by default"
JJ_SOCIAL_SLIDER_TAB="Target"
JJ_SOCIAL_SLIDER_TAB_DESC="Select whether you want the social network to open in the same or a new tab"
JJ_SOCIAL_SLIDER_TAB_NEW="New tab"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
; @ Released under GNU/GPL 3.0 License
; Note : All ini files need to be saved as UTF-8

JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 or jQuery animations, providing a small caption which you can link to a social network page.</p>"
JJ_SOCIAL_SLIDER_JOOMLA_VERSION_OUTDATED="This module requires Joomla 3.2 or higher. There are packages available for download at <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a> available for Joomla 2.5"
JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 transitions, providing a small caption which you can link to a social network page.</p>"
JJ_SOCIAL_SLIDER_JOOMLA_VERSION_OUTDATED="This module requires Joomla 2.5 or Joomla 3.2+."
3 changes: 3 additions & 0 deletions mod_social_slider/media/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ ul#jj_sl_navigation li a {
-o-transition: all 0.3s ease;
transition: all 0.3s ease;
}
ul.jj_sl_navigation li a:focus {
outline: 0;
}
ul#jj_sl_navigation li a .jj_social_text {
display: inline-block;
width: 130px;
Expand Down
Loading

0 comments on commit 421e8dd

Please sign in to comment.