Skip to content

Commit

Permalink
Merge pull request #48 from JoomJunk/development35
Browse files Browse the repository at this point in the history 
Update to version 1.5.2
  • Loading branch information
@wilsonge
wilsonge committed Apr 8, 2014
2 parents ebec51d + 8bf399f commit f660f2f
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 27 deletions.
5 changes: 5 additions & 0 deletions changelog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
- -> Removed
! -> Note

Version 1.5.2
# Added missing span to prevent text overlapping
# Added missing language string for parameter description
^ Increased span width by 5px

Version 1.5.1 (IMPORTANT BUG FIX FOR JOOMLA 3.1 USERS)
+ Added background colour transition
# Fixed Joomla 3.1 module parameters page breaking
Expand Down
5 changes: 2 additions & 3 deletions mod_social_slider/media/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ ul#jj_sl_navigation li a {
-moz-transition: all 0.3s ease;
-ms-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
transition: all 0.3s ease;

transition: all 0.3s ease;
}
ul#jj_sl_navigation li a .jj_social_text {
display: inline-block;
width: 125px;
width: 130px;
}
ul#jj_sl_navigation .facebook a:hover{ background-color: #3B5998; }
ul#jj_sl_navigation .twitter a:hover{ background-color: #62BDB2; }
Expand Down
44 changes: 22 additions & 22 deletions 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>admin@joomjunk.co.uk</authorEmail>
<authorUrl>http://www.joomjunk.co.uk</authorUrl>
<version>1.5.1</version>
<version>1.5.2</version>
<description>JJ_SOCIAL_SLIDER_DESC</description>

<files>
Expand Down Expand Up @@ -38,119 +38,119 @@
<config>
<fields name="params">
<fieldset name="DEFAULT">
<field name="sep1" type="sep" label="Facebook Settings" />
<field name="sep1" type="sep" label="COM_MODULES_FACEBOOK_FIELDSET_LABEL" />

<field name="facebook" default="1" type="radio" label="JJ_SOCIAL_SLIDER_FACEBOOK" description="JJ_SOCIAL_SLIDER_FACEBOOK_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="facebook_link" default="http://facebook.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_FACEBOOK_LINK" description="JJ_SOCIAL_SLIDER_FACEBOOK_LINK_DESC" />

<field name="sep2" type="sep" label="Twitter Settings" />
<field name="sep2" type="sep" label="COM_MODULES_TWITTER_FIELDSET_LABEL" />

<field name="twitter" default="1" type="radio" label="JJ_SOCIAL_SLIDER_TWITTER" description="JJ_SOCIAL_SLIDER_TWITTER_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="twitter_link" default="http://twitter.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_TWITTER_LINK" description="JJ_SOCIAL_SLIDER_TWITTER_LINK_DESC" />

<field name="sep3" type="sep" label="Google+ Settings" />
<field name="sep3" type="sep" label="COM_MODULES_GOOGLES_FIELDSET_LABEL" />

<field name="google" default="1" type="radio" label="JJ_SOCIAL_SLIDER_GOOGLE" description="JJ_SOCIAL_SLIDER_GOOGLE_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="google_link" default="http://plus.google.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_GOOGLE_LINK" description="JJ_SOCIAL_SLIDER_GOOGLE_LINK_DESC" />

<field name="sep4" type="sep" label="MySpace Settings" />
<field name="sep4" type="sep" label="COM_MODULES_MYSPACE_FIELDSET_LABEL" />

<field name="myspace" default="1" type="radio" label="JJ_SOCIAL_SLIDER_MYSPACE" description="JJ_SOCIAL_SLIDER_MYSPACE_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="myspace_link" default="http://myspace.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_MYSPACE_LINK" description="JJ_SOCIAL_SLIDER_MYSPACE_LINK_DESC" />

<field name="sep5" type="sep" label="Youtube Settings" />
<field name="sep5" type="sep" label="COM_MODULES_YOUTUBE_FIELDSET_LABEL" />

<field name="youtube" default="1" type="radio" label="JJ_SOCIAL_SLIDER_YOUTUBE" description="JJ_SOCIAL_SLIDER_YOUTUBE_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="youtube_link" default="http://youtube.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_YOUTUBE_LINK" description="JJ_SOCIAL_SLIDER_YOUTUBE_LINK_DESC" />

<field name="sep6" type="sep" label="LinkedIn Settings" />
<field name="sep6" type="sep" label="COM_MODULES_LINKEDIN_FIELDSET_LABEL" />

<field name="linkedin" default="1" type="radio" label="JJ_SOCIAL_SLIDER_LINKEDIN" description="JJ_SOCIAL_SLIDER_LINKEDIN_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="linkedin_link" default="http://linkedin.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_LINKEDIN_LINK" description="JJ_SOCIAL_SLIDER_LINKEDIN_LINK_DESC" />

<field name="sep7" type="sep" label="Steam Settings" />
<field name="sep7" type="sep" label="COM_MODULES_STEAM_FIELDSET_LABEL" />

<field name="steam" default="1" type="radio" label="JJ_SOCIAL_SLIDER_STEAM" description="JJ_SOCIAL_SLIDER_STEAM_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="steam_link" default="http://steam.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_STEAM_LINK" description="JJ_SOCIAL_SLIDER_STEAM_LINK_DESC" />

<field name="sep8" type="sep" label="Last.fm Settings" />
<field name="sep8" type="sep" label="COM_MODULES_LASTFM_FIELDSET_LABEL" />

<field name="lastfm" default="1" type="radio" label="JJ_SOCIAL_SLIDER_LASTFM" description="JJ_SOCIAL_SLIDER_LASTFM_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="lastfm_link" default="http://last.fm" type="text" size="50" label="JJ_SOCIAL_SLIDER_LASTFM_LINK" description="JJ_SOCIAL_SLIDER_LASTFM_LINK_DESC" />

<field name="sep9" type="sep" label="Pinterest Settings" />
<field name="sep9" type="sep" label="COM_MODULES_PINTEREST_FIELDSET_LABEL" />

<field name="pinterest" default="1" type="radio" label="JJ_SOCIAL_SLIDER_PINTEREST" description="JJ_SOCIAL_SLIDER_PINTEREST_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="pinterest_link" default="http://pinterest.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_PINTEREST_LINK" description="JJ_SOCIAL_SLIDER_PINTEREST_LINK_DESC" />

<field name="sep10" type="sep" label="Soundcloud Settings" />
<field name="sep10" type="sep" label="COM_MODULES_SOUNDCLOUD_FIELDSET_LABEL" />

<field name="soundcloud" default="1" type="radio" label="JJ_SOCIAL_SLIDER_SOUNDCLOUD" description="JJ_SOCIAL_SLIDER_SOUNDCLOUD_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="soundcloud_link" default="http://soundcloud.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_SOUNDCLOUD_LINK" description="JJ_SOCIAL_SLIDER_SOUNDCLOUD_LINK_DESC" />

<field name="sep11" type="sep" label="Tumblr Settings" />
<field name="sep11" type="sep" label="COM_MODULES_TUMBLR_FIELDSET_LABEL" />

<field name="tumblr" default="1" type="radio" label="JJ_SOCIAL_SLIDER_TUMBLR" description="JJ_SOCIAL_SLIDER_TUMBLR_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="tumblr_link" default="http://tumblr.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_TUMBLR_LINK" description="JJ_SOCIAL_SLIDER_TUMBLR_LINK_DESC" />

<field name="sep12" type="sep" label="Github Settings" />
<field name="sep12" type="sep" label="COM_MODULES_GITHUB_FIELDSET_LABEL" />

<field name="github" default="1" type="radio" label="JJ_SOCIAL_SLIDER_GITHUB" description="JJ_SOCIAL_SLIDER_GITHUB_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="github_link" default="http://github.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_GITHUB_LINK" description="JJ_SOCIAL_SLIDER_GITHUB_LINK_DESC" />

<field name="sep13" type="sep" label="Flickr Settings" />
<field name="sep13" type="sep" label="COM_MODULES_FLICKR_FIELDSET_LABEL" />

<field name="flickr" default="1" type="radio" label="JJ_SOCIAL_SLIDER_FLICKR" description="JJ_SOCIAL_SLIDER_FLICKR_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="flickr_link" default="http://flickr.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_FLICKR_LINK" description="JJ_SOCIAL_SLIDER_FLICKR_LINK_DESC" />

<field name="sep14" type="sep" label="RSS Settings" />
<field name="sep14" type="sep" label="COM_MODULES_RSS_FIELDSET_LABEL" />

<field name="rss" default="1" type="radio" label="JJ_SOCIAL_SLIDER_RSS" description="JJ_SOCIAL_SLIDER_RSS_DESC">
<option value="0">JJ_OFF</option>
<option value="1">JJ_ON</option>
</field>
<field name="rss_link" default="http://link-to-rss-feed.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_RSS_LINK" description="JJ_SOCIAL_SLIDER_RSS_LINK_DESC" />

<field name="sep15" type="sep" label="Vimeo Settings" />
<field name="sep15" type="sep" label="COM_MODULES_VIMEO_FIELDSET_LABEL" />

<field name="vimeo" default="1" type="radio" label="JJ_SOCIAL_SLIDER_VIMEO" description="JJ_SOCIAL_SLIDER_VIMEO_DESC">
<option value="0">JJ_OFF</option>
Expand All @@ -161,7 +161,7 @@

<fieldset name="CUSTOM">

<field name="sep16" type="sep" label="Custom 1 Settings" />
<field name="sep16" type="sep" label="COM_MODULES_CUSTOM1_FIELDSET_LABEL" />

<field name="custom1" default="0" type="radio" label="JJ_SOCIAL_SLIDER_CUSTOM1" description="JJ_SOCIAL_SLIDER_CUSTOM1_DESC">
<option value="0">JJ_OFF</option>
Expand All @@ -172,7 +172,7 @@
<field name="custom1_link" default="http://example.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM1_LINK" description="JJ_SOCIAL_SLIDER_CUSTOM1_LINK_DESC" />
<field name="custom1_image" default="icon.png" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM1_IMAGE" description="JJ_SOCIAL_SLIDER_CUSTOM1_IMAGE_DESC" />

<field name="sep17" type="sep" label="Custom 2 Settings" />
<field name="sep17" type="sep" label="COM_MODULES_CUSTOM2_FIELDSET_LABEL" />

<field name="custom2" default="0" type="radio" label="JJ_SOCIAL_SLIDER_CUSTOM2" description="JJ_SOCIAL_SLIDER_CUSTOM2_DESC">
<option value="0">JJ_OFF</option>
Expand All @@ -183,7 +183,7 @@
<field name="custom2_link" default="http://example.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM2_LINK" description="JJ_SOCIAL_SLIDER_CUSTOM2_LINK_DESC" />
<field name="custom2_image" default="icon.png" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM2_IMAGE" description="JJ_SOCIAL_SLIDER_CUSTOM2_IMAGE_DESC" />

<field name="sep18" type="sep" label="Custom 3 Settings" />
<field name="sep18" type="sep" label="COM_MODULES_CUSTOM3_FIELDSET_LABEL" />

<field name="custom3" default="0" type="radio" label="JJ_SOCIAL_SLIDER_CUSTOM3" description="JJ_SOCIAL_SLIDER_CUSTOM3_DESC">
<option value="0">JJ_OFF</option>
Expand All @@ -194,7 +194,7 @@
<field name="custom3_link" default="http://example.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM3_LINK" description="JJ_SOCIAL_SLIDER_CUSTOM3_LINK_DESC" />
<field name="custom3_image" default="icon.png" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM4_IMAGE" description="JJ_SOCIAL_SLIDER_CUSTOM4_IMAGE_DESC" />

<field name="sep19" type="sep" label="Custom 4 Settings" />
<field name="sep19" type="sep" label="COM_MODULES_CUSTOM4_FIELDSET_LABEL" />

<field name="custom4" default="0" type="radio" label="JJ_SOCIAL_SLIDER_CUSTOM4" description="JJ_SOCIAL_SLIDER_CUSTOM4_DESC">
<option value="0">JJ_OFF</option>
Expand All @@ -205,7 +205,7 @@
<field name="custom4_link" default="http://example.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM4_LINK" description="JJ_SOCIAL_SLIDER_CUSTOM4_LINK_DESC" />
<field name="custom4_image" default="icon.png" type="text" size="50" label="JJ_SOCIAL_SLIDER_CUSTOM4_IMAGE" description="JJ_SOCIAL_SLIDER_CUSTOM4_IMAGE_DESC" />

<field name="sep20" type="sep" label="Custom 5 Settings" />
<field name="sep20" type="sep" label="COM_MODULES_CUSTOM5_FIELDSET_LABEL" />

<field name="custom5" default="0" type="radio" label="JJ_SOCIAL_SLIDER_CUSTOM5" description="JJ_SOCIAL_SLIDER_CUSTOM5_DESC">
<option value="0">JJ_OFF</option>
Expand All @@ -230,7 +230,7 @@
<option value="top">JJ_SOCIAL_SLIDER_TOP</option>
<option value="bottom">JJ_SOCIAL_SLIDER_BOTTOM</option>
</field>
<field name="top" type="text" default="10" label="JJ_SOCIAL_SLIDER_TOP" description="JJ_SOCIAL_SLIDER_TOP_DESC" />
<field name="top" type="text" default="10" label="JJ_SOCIAL_SLIDER_TOP" description="JJ_SOCIAL_SLIDER_TOP_BOTTOM_MARGIN_DESC" />
<field name="disable" type="list" default="0" label="JJ_SOCIAL_SLIDER_DISABLE" description="JJ_SOCIAL_SLIDER_DISABLE_DESC">
<option value="0">JJ_SOCIAL_SLIDER_NO_DISABLE</option>
<option value="1">JJ_SOCIAL_SLIDER_MOB_ONLY</option>
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 . '>' . JText::_('JJ_SOCIAL_SLIDER_VIA_' . $uppercase . '') . '</a></li>';
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>';
}
else
{
echo '<li class="' . $key . '"><a href="' . $params->get($key . '_link') . '"' . $target . '>' . $params->get($key . '_text') . '</a></li>';
echo '<li class="' . $key . '"><a href="' . $params->get($key . '_link') . '"' . $target . '><span class="jj_social_text">' . $params->get($key . '_text') . '</span></a></li>';
}
}
}
Expand Down

0 comments on commit f660f2f

Please sign in to comment.