Skip to content

Commit

Permalink
Merge commit '88ad9c5dee764f3129a6f8c8fd219e53868e9b83' into joomla35
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilsonge
wilsonge committed Aug 9, 2014
2 parents 6ba36b6 + 88ad9c5 commit edf7617
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 52 deletions.
8 changes: 8 additions & 0 deletions changelog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
- -> Removed
! -> Note

Version 1.5.4
+ Used more unique naming convertions to prevent overrides
- Removed unnecessary jQuery file for (Joomla 3.2)
^ Updated jQuery to 1.11.1 (Joomla 2.5/3.1)

Version 1.5.3
+ Custom Slide text now translatable

Version 1.5.2
# Added missing span to prevent text overlapping
# Added missing language string for parameter description
Expand Down
73 changes: 37 additions & 36 deletions mod_social_slider/media/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,44 +35,45 @@ ul#jj_sl_navigation li a {
}
ul#jj_sl_navigation li a .jj_social_text {
display: inline-block;
width: 130px;
width: 130px;
text-transform: inherit;
}
ul#jj_sl_navigation .facebook a:hover{ background-color: #3B5998; }
ul#jj_sl_navigation .twitter a:hover{ background-color: #62BDB2; }
ul#jj_sl_navigation .google a:hover{ background-color: #DB4A39; }
ul#jj_sl_navigation .myspace a:hover{ background-color: #3B64B3; }
ul#jj_sl_navigation .youtube a:hover{ background-color: #CC252C; }
ul#jj_sl_navigation .linkedin a:hover{ background-color: #4F93B3; }
ul#jj_sl_navigation .steam a:hover{ background-color: #111111; }
ul#jj_sl_navigation .lastfm a:hover{ background-color: #bf0d1c; }
ul#jj_sl_navigation .pinterest a:hover{ background-color: #b61d23; }
ul#jj_sl_navigation .soundcloud a:hover{ background-color: #ff5419; }
ul#jj_sl_navigation .tumblr a:hover{ background-color: #304e6c; }
ul#jj_sl_navigation .github a:hover{ background-color: #222222; }
ul#jj_sl_navigation .flickr a:hover{ background-color: #ff0084; }
ul#jj_sl_navigation .rss a:hover{ background-color: #FF6600; }
ul#jj_sl_navigation .vimeo a:hover{ background-color: #1BB7EA; }
ul#jj_sl_navigation .jj_sl_facebook a:hover{ background-color: #3B5998; }
ul#jj_sl_navigation .jj_sl_twitter a:hover{ background-color: #62BDB2; }
ul#jj_sl_navigation .jj_sl_google a:hover{ background-color: #DB4A39; }
ul#jj_sl_navigation .jj_sl_myspace a:hover{ background-color: #3B64B3; }
ul#jj_sl_navigation .jj_sl_youtube a:hover{ background-color: #CC252C; }
ul#jj_sl_navigation .jj_sl_linkedin a:hover{ background-color: #4F93B3; }
ul#jj_sl_navigation .jj_sl_steam a:hover{ background-color: #111111; }
ul#jj_sl_navigation .jj_sl_lastfm a:hover{ background-color: #bf0d1c; }
ul#jj_sl_navigation .jj_sl_pinterest a:hover{ background-color: #b61d23; }
ul#jj_sl_navigation .jj_sl_soundcloud a:hover{ background-color: #ff5419; }
ul#jj_sl_navigation .jj_sl_tumblr a:hover{ background-color: #304e6c; }
ul#jj_sl_navigation .jj_sl_github a:hover{ background-color: #222222; }
ul#jj_sl_navigation .jj_sl_flickr a:hover{ background-color: #ff0084; }
ul#jj_sl_navigation .jj_sl_rss a:hover{ background-color: #FF6600; }
ul#jj_sl_navigation .jj_sl_vimeo a:hover{ background-color: #1BB7EA; }

ul#jj_sl_navigation .facebook a:hover,
ul#jj_sl_navigation .twitter a:hover,
ul#jj_sl_navigation .google a:hover,
ul#jj_sl_navigation .myspace a:hover,
ul#jj_sl_navigation .youtube a:hover,
ul#jj_sl_navigation .linkedin a:hover,
ul#jj_sl_navigation .steam a:hover,
ul#jj_sl_navigation .lastfm a:hover,
ul#jj_sl_navigation .pinterest a:hover,
ul#jj_sl_navigation .soundcloud a:hover,
ul#jj_sl_navigation .tumblr a:hover,
ul#jj_sl_navigation .github a:hover,
ul#jj_sl_navigation .flickr a:hover,
ul#jj_sl_navigation .rss a:hover,
ul#jj_sl_navigation .vimeo a:hover,
ul#jj_sl_navigation .custom1 a:hover,
ul#jj_sl_navigation .custom2 a:hover,
ul#jj_sl_navigation .custom3 a:hover,
ul#jj_sl_navigation .custom4 a:hover,
ul#jj_sl_navigation .custom5 a:hover{
ul#jj_sl_navigation .jj_sl_facebook a:hover,
ul#jj_sl_navigation .jj_sl_twitter a:hover,
ul#jj_sl_navigation .jj_sl_google a:hover,
ul#jj_sl_navigation .jj_sl_myspace a:hover,
ul#jj_sl_navigation .jj_sl_youtube a:hover,
ul#jj_sl_navigation .jj_sl_linkedin a:hover,
ul#jj_sl_navigation .jj_sl_steam a:hover,
ul#jj_sl_navigation .jj_sl_lastfm a:hover,
ul#jj_sl_navigation .jj_sl_pinterest a:hover,
ul#jj_sl_navigation .jj_sl_soundcloud a:hover,
ul#jj_sl_navigation .jj_sl_tumblr a:hover,
ul#jj_sl_navigation .jj_sl_github a:hover,
ul#jj_sl_navigation .jj_sl_flickr a:hover,
ul#jj_sl_navigation .jj_sl_rss a:hover,
ul#jj_sl_navigation .jj_sl_vimeo a:hover,
ul#jj_sl_navigation .jj_sl_custom1 a:hover,
ul#jj_sl_navigation .jj_sl_custom2 a:hover,
ul#jj_sl_navigation .jj_sl_custom3 a:hover,
ul#jj_sl_navigation .jj_sl_custom4 a:hover,
ul#jj_sl_navigation .jj_sl_custom5 a:hover{
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-ms-transition: all 0.3s ease;
Expand Down
4 changes: 0 additions & 4 deletions mod_social_slider/media/js/jquery.js
View file

This file was deleted.

18 changes: 9 additions & 9 deletions mod_social_slider/mod_social_slider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ function () {
foreach ($slides as $slide => $social){
if (strpos($social, "custom") === false)
{
$style .= 'ul#jj_sl_navigation .' . $social . ' a {
$style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
background-position: 144px 50%;
background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $social . '-' . $params->get('icon_colour') . '.png);
}';
}
else
{
$style .= 'ul#jj_sl_navigation .' . $social . ' a {
$style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
background-position: 144px 50%;
background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $params->get( $social . '_image') . ');
}';
Expand Down Expand Up @@ -193,34 +193,34 @@ function () {
foreach ($slides as $slide => $social){
if (strpos($social, "custom") === false)
{
$style .= 'ul#jj_sl_navigation .' . $social . ' a {
$style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
background-position: 4px 50%;
background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $social . '-' . $params->get('icon_colour') . '.png);
}';
}
else
{
$style .= 'ul#jj_sl_navigation .' . $social . ' a {
$style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
background-position: 4px 50%;
background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $params->get( $social . '_image') . ');
}';
}
}
}

$custom_css = 'ul#jj_sl_navigation .custom1 a:hover{
$custom_css = 'ul#jj_sl_navigation .jj_sl_custom1 a:hover{
background-color: ' . $params->get('custom1_colour') . ';
}
ul#jj_sl_navigation .custom2 a:hover{
ul#jj_sl_navigation .jj_sl_custom2 a:hover{
background-color: ' . $params->get('custom2_colour') . ';
}
ul#jj_sl_navigation .custom3 a:hover{
ul#jj_sl_navigation .jj_sl_custom3 a:hover{
background-color: ' . $params->get('custom3_colour') . ';
}
ul#jj_sl_navigation .custom4 a:hover{
ul#jj_sl_navigation .jj_sl_custom4 a:hover{
background-color: ' . $params->get('custom4_colour') . ';
}
ul#jj_sl_navigation .custom5 a:hover{
ul#jj_sl_navigation .jj_sl_custom5 a:hover{
background-color: ' . $params->get('custom5_colour') . ';
}';
$document->addStyleDeclaration($custom_css);
Expand Down
2 changes: 1 addition & 1 deletion mod_social_slider/mod_social_slider.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>http://www.joomjunk.co.uk</authorUrl>
<version>1.5.3</version>
<version>1.5.4</version>
<description>JJ_SOCIAL_SLIDER_DESC</description>

<files>
Expand Down
4 changes: 2 additions & 2 deletions mod_social_slider/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
{
if ($parts[1] < 16)
{
echo '<li class="' . $key . '"><a href="' . $params->get($key . '_link') . '"' . $target . '><span class="jj_social_text">' . JText::_('JJ_SOCIAL_SLIDER_VIA_' . $uppercase . '') . '</span></a></li>';
echo '<li class="jj_sl_' . $key . '"><a href="' . $params->get($key . '_link') . '"' . $target . '><span class="jj_social_text">' . JText::_('JJ_SOCIAL_SLIDER_VIA_' . $uppercase . '') . '</span></a></li>';
}
else
{
echo '<li class="' . $key . '"><a href="' . $params->get($key . '_link') . '"' . $target . '><span class="jj_social_text">' . JText::_($params->get($key . '_text')) . '</span></a></li>';
echo '<li class="jj_sl_' . $key . '"><a href="' . $params->get($key . '_link') . '"' . $target . '><span class="jj_social_text">' . JText::_($params->get($key . '_text')) . '</span></a></li>';
}
}
}
Expand Down

0 comments on commit edf7617

Please sign in to comment.