Merge pull request #17 from JoomJunk/development

Merge Version 1.3.2 into master

changelog.php

@@ -15,10 +15,13 @@
 - -> Removed
 ! -> Note
 
+Version 1.3.2
++ Ability to support RTL templates improved with dedicated option
+
 Version 1.3.1
 # Bug fix for some users unable to open LastFM and Google+ tabs
 ^ PHPCS fixes to Joomla Standards
-+ Max-width and target parameters added
++ Max-width parameters added
 + Add parameter for new tab or same page
 
 Version 1.3.0

mod_social_slider/assets/style.css

@@ -16,6 +16,7 @@ ul#jj_sl_navigation {
 ul#jj_sl_navigation li {
 	padding: 1px 0px 1px 0px;
     overflow:hidden;
+	direction: ltr;
 }
 
 ul#jj_sl_navigation li a {
@@ -72,4 +73,4 @@ ul#jj_sl_navigation .rss a:hover{
 }
 ul#jj_sl_navigation .vimeo a:hover{
     background-color: #1BB7EA;
-}
+}

mod_social_slider/fields/jquery.php

@@ -1,20 +1,19 @@
 <?php
 /**
- * @package     JoomJunk.Shoutbox
- *
- * @copyright   Copyright (C) 2011 - 2013 JoomJunk. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
+* @package    JJ_Social_Slider
+* @author     JoomJunk <[email protected]>
+* @copyright  Copyright (C) 2011 - 2013 JoomJunk. All Rights Reserved
+* @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
+*/
 
 defined('_JEXEC') or die('Restricted access');
 
 /**
  * Form Field class for JoomJunk.
  * Provides radio button inputs for the jQuery insertation in Joomla 2.5 only
  *
- * @package     JoomJunk.Shoutbox
- * @subpackage  Form
- * @since       2.0
+ * @package     JJ_Social_Slider
+ * @since       1.3.0
  */
 class JFormFieldjQuery extends JFormField
 {
@@ -117,4 +116,4 @@ protected function getOptions()
 
 		return $options;
 	}
-}
+}

mod_social_slider/language/en-GB/en-GB.mod_social_slider.ini

@@ -116,9 +116,10 @@ JJ_SOCIAL_SLIDER_CUSTOM5_LINK_DESC="Type in the link to your Custom 5 page. Don'
 JJ_SOCIAL_SLIDER_SLIDE_COLOUR="Slide Colour #"
 JJ_SOCIAL_SLIDER_SLIDE_COLOUR_DESC="Type in the slide colour (hex)"
 JJ_SOCIAL_SLIDER_POSITION="Position"
-JJ_SOCIAL_SLIDER_POSITION_DESC="Select whether you would like the module to appear on the left or right hand side of the page"
+JJ_SOCIAL_SLIDER_POSITION_DESC="Select whether you would like the module to appear on the left or right hand side of the page. If RTL Support is selected then the module will appear on the right if an RTL langauge is used and on the left if an LTR langauge is used"
 JJ_SOCIAL_SLIDER_LEFT="Left"
 JJ_SOCIAL_SLIDER_RIGHT="Right"
+JJ_SOCIAL_SLIDER_LANGUAGE_DEFINED="RTL Support On"
 JJ_SOCIAL_SLIDER_TOP="Top Positioning (px)"
 JJ_SOCIAL_SLIDER_TOP_DESC="Choose how far away from the top you would like the module to be positioned in pixels"
 JJ_SOCIAL_SLIDER_DISABLE="Disable on specific screen sizes"
@@ -195,4 +196,4 @@ JJ_SOCIAL_SLIDER_CUSTOM3_IMAGE_DESC="Type in the name of the image + the image f
 JJ_SOCIAL_SLIDER_CUSTOM4_IMAGE="Image"
 JJ_SOCIAL_SLIDER_CUSTOM4_IMAGE_DESC="Type in the name of the image + the image format. For example icon.png"
 JJ_SOCIAL_SLIDER_CUSTOM5_IMAGE="Image"
-JJ_SOCIAL_SLIDER_CUSTOM5_IMAGE_DESC="Type in the name of the image + the image format. For example icon.png"
+JJ_SOCIAL_SLIDER_CUSTOM5_IMAGE_DESC="Type in the name of the image + the image format. For example icon.png"

mod_social_slider/mod_social_slider.php

@@ -9,6 +9,24 @@
 // No direct access
 defined('_JEXEC') or die('Restricted access');
 
+if ($params->get('position', 'left') == 'rtl')
+{
+	$RTL = JFactory::getLanguage()->isRTL();
+
+	if ($RTL)
+	{
+		$position = 'right';
+	}
+	else
+	{
+		$position = 'left';
+	}
+}
+else
+{
+	$position = $params->get('position', 'left');
+}
+
 $document = JFactory::getDocument();
 
 if ($params->get('jquery_css') == 0)
@@ -40,7 +58,7 @@
 
 $style1 = 'ul#jj_sl_navigation li a {'
 		. 'background-color:#' . $params->get('slide_colour') . ';'
-		. 'text-align:' . $params->get('position') . ';'
+		. 'text-align:' . $position . ';'
 		. '}';
 $document->addStyleDeclaration($style1);
 
@@ -60,7 +78,7 @@
 	$document->addStyleDeclaration($mobile_tablet);
 }
 
-if ($params->get('position') == "left")
+if ($position == "left")
 {
 	if ($params->get('jquery_css') == 0)
 	{
@@ -96,7 +114,7 @@ function () {
 	}
 
 	$style = 'ul#jj_sl_navigation { '
-		. $params->get('position') . ':0px;'
+		. $position . ':0px;'
 		. 'top:' . $params->get('top') . 'px;'
 		. '}'
 		. 'ul#jj_sl_navigation li:hover { '
@@ -187,7 +205,7 @@ function () {
 		. 'background-image: url(' . JURI::root() . 'modules/mod_social_slider/assets/icons/' . $params->get('custom5_image') . ');'
 		. '}';
 }
-elseif ($params->get('position') == "right")
+elseif ($position == "right")
 {
 	if ($params->get('jquery_css') == 0)
 	{
@@ -206,7 +224,7 @@ function () {
 			});
 		})(jQuery);
 		';
-		$css = 'ul#jj_sl_navigation li {left: 140px;position: relative;}';
+		$css = 'ul#jj_sl_navigation li {position: relative;} ul#jj_sl_navigation{right: -140px;}';
 		$document->addScriptDeclaration($js_right);
 	}
 
@@ -225,7 +243,7 @@ function () {
 	}
 
 $style = 'ul#jj_sl_navigation { '
-			. $params->get('position') . ':0px;'
+			. $position . ':0px;'
 			. 'top:' . $params->get('top') . 'px;'
 			. '}'
 			. 'ul#jj_sl_navigation li:hover { '

mod_social_slider/mod_social_slider.xml

@@ -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.3.1</version>
+	<version>1.3.2</version>
 	<description>JJ_SOCIAL_SLIDER_DESC</description>
 
 	<files>
@@ -209,6 +209,7 @@
 				<field name="position" type="list" default="left" label="JJ_SOCIAL_SLIDER_POSITION" description="JJ_SOCIAL_SLIDER_POSITION_DESC">
 					<option value="left">JJ_SOCIAL_SLIDER_LEFT</option>
 					<option value="right">JJ_SOCIAL_SLIDER_RIGHT</option>
+					<option value="rtl">JJ_SOCIAL_SLIDER_LANGUAGE_DEFINED</option>
 				</field>
 				<field name="top" type="text" default="10" label="JJ_SOCIAL_SLIDER_TOP" description="JJ_SOCIAL_SLIDER_TOP_DESC" />		
 				<field name="disable" type="list" default="0" label="JJ_SOCIAL_SLIDER_DISABLE" description="JJ_SOCIAL_SLIDER_DISABLE_DESC">