Fixed problem with initial animation and columns count option

DSPEED · May 30, 2013 · 23c8d43 · 23c8d43
1 parent 08ccf8a
commit 23c8d43
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/mod_news_pro_gk5/language/en-GB.mod_news_pro_gk5.ini b/mod_news_pro_gk5/language/en-GB.mod_news_pro_gk5.ini
@@ -486,3 +486,5 @@ MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_URL="URL for the link"
 MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_URL_DESC="This option specify the link displayed at the bottom after loading all items."
 MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_TEXT1="More work"
 MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_TEXT2="See more"
+MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_INITIAL_ANIM="Creativity initial anim"
+MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_INITIAL_ANIM_DESC="Enable this option only on the Creativity template!"
diff --git a/mod_news_pro_gk5/language/pl-PL.mod_news_pro_gk5.ini b/mod_news_pro_gk5/language/pl-PL.mod_news_pro_gk5.ini
@@ -485,4 +485,6 @@ MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_DESC="Jeżeli posiadasz tylko jedną
 MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_URL="URL dla linka"
 MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_URL_DESC="Opcja ta określa URL linka pod zdjęciami po załadowaniu wszystkich zdjęć."
 MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_TEXT1="Więcej prac"
-MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_TEXT2="Zobacz więcej"
+MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_LINK_TEXT2="Zobacz więcej"
+MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_INITIAL_ANIM="Creativity - animacja początkowa"
+MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_INITIAL_ANIM_DESC="Należy tą opcję zachować włączoną tylko w szablonie Creativity!"
diff --git a/mod_news_pro_gk5/mod_news_pro_gk5.xml b/mod_news_pro_gk5/mod_news_pro_gk5.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="module" version="2.5.0" client="site" method="upgrade">
 	<name>News Show Pro GK5</name>
-	<creationDate>28/05/2013</creationDate>
+	<creationDate>30/05/2013</creationDate>
 	<author>Gavick.com</author>
 	<copyright>(C) 2009-2013 Gavick.com</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
 	<authorEmail>info@gavick.com</authorEmail>
 	<authorUrl>www.gavick.com</authorUrl>
-	<version>1.1.4</version>
+	<version>1.1.5</version>
 	<description>
 	<![CDATA[
 		<style type='text/css'>
@@ -19,7 +19,7 @@
 			span.readonly p.license { border-top: 1px solid #eee; font-size: 11px; margin: 30px 26px 0; padding: 6px 0; }
 		</style>
 		<span class='readonly'>
-			<h1>News Show Pro GK5 <small>ver. 1.1.4</small></h1>
+			<h1>News Show Pro GK5 <small>ver. 1.1.5</small></h1>
 			<p>GK5 is new generation of our extensions dedicated to Joomla 2.5+.</p>
 			<p>Basing on experiences gathered, we created probably the best tool to present articles for Joomla! Huge amount of options and possibilities of formatting causes News Show Pro GK5 is a complex tool in making www pages content attractive. News Show Pro is appropriate while preparing simple structures with an individual article, the same as, complex arrangements including few articles and a list of links.</p> 
 			<p class='homepage'><a href='http://www.gavick.com/news-show-pro-gk5.html' target='_blank'>Learn more at the NSP GK5 project website.</a></p>
@@ -294,6 +294,11 @@
 			</fieldset>
 
 			<fieldset name="NSP_PORTAL_MODE_PORTFOLIO">
+				<field name="portal_mode_portfolio_initial_anim" type="list" class="gk_switch" default="0" label="MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_INITIAL_ANIM" description="MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_INITIAL_ANIM_DESC">
+				        <option value="0">MOD_NEWS_PRO_GK5_DISABLED</option>
+				        <option value="1">MOD_NEWS_PRO_GK5_ENABLED</option>
+				</field>
+
 				<field name="portal_mode_portfolio_cols" type="text" default="3" size="5" label="MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_COLS" description="MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_COLS_DESC" />
 
 				<field name="portal_mode_portfolio_rows" type="text" default="3" size="5" label="MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_ROWS" description="MOD_NEWS_PRO_GK5_PORTAL_MODE_PORTFOLIO_ROWS_DESC" />

diff --git a/mod_news_pro_gk5/portal_modes/portfolio/controller.php b/mod_news_pro_gk5/portal_modes/portfolio/controller.php
@@ -25,9 +25,9 @@ function output() {
 		// amount
 		$amount = 0;	
 		// main wrapper
-		echo '<div class="gkNspPM gkNspPM-Portfolio" data-cols="'.$this->parent->config['portal_mode_portfolio_cols'].'" data-rows="'.$this->parent->config['portal_mode_portfolio_rows'].'">';
+		echo '<div class="gkNspPM gkNspPM-Portfolio'.(($parent->config['portal_mode_portfolio_initial_anim'] == '0') ? ' noInitialAnim' : '').'" data-cols="'.$this->parent->config['portal_mode_portfolio_cols'].'" data-rows="'.$this->parent->config['portal_mode_portfolio_rows'].'">';
 		// images wrapper
-		echo '<div class="gkImagesWrapper gkImagesCols'.$this->parent->config['portal_mode_news_gallery_cols'].' animate_queue">';
+		echo '<div class="gkImagesWrapper gkImagesCols'.$this->parent->config['portal_mode_portfolio_cols'].' animate_queue">';
 		// JSON data array
 		$jsondata = array();
 		// render images		

diff --git a/mod_news_pro_gk5/portal_modes/portfolio/style.css b/mod_news_pro_gk5/portal_modes/portfolio/style.css
@@ -56,6 +56,14 @@
 	display: block;
 }
 
+.gkNspPM-Portfolio.noInitialAnim .gkImagesWrapper > a {
+	-webkit-transform: scale(1.0);
+	-moz-transform: scale(1.0);
+	-ms-transform: scale(1.0);
+	-o-transform: scale(1.0);
+	transform: scale(1.0);
+}
+
 .gkNspPM-Portfolio .gkImagesWrapper > a.show {
 	-webkit-transform: scale(1.0);
 	-moz-transform: scale(1.0);