TemplatesNext ToolKit - Version 1.1.6

Version Description

Download this release

Release Info

Developer marsian
Plugin Icon 128x128 TemplatesNext ToolKit
Version 1.1.6
Comparing to
See all releases

Code changes from version 1.1.5 to 1.1.6

Files changed (6) hide show
  1. css/tx-style.css +8 -2
  2. js/tx-script.js +32 -5
  3. readme.txt +5 -2
  4. shortcodes.php +3 -1
  5. tx-shortcodes.js +11 -2
  6. tx-toolkit.php +1 -1
css/tx-style.css CHANGED
@@ -1401,13 +1401,19 @@
1401
  clear: both;
1402
  }
1403
 
1404
- .nx-wide .tx-fullwidthrow .tx-fullwidthinner:after {
 
1405
  content: "";
1406
  display: table;
1407
  clear: both;
1408
  background-color: #f00;
1409
  }
1410
-
 
 
 
 
 
1411
  @media (max-width: 999px) {
1412
  .folio-col-1 {
1413
  display: block;
1401
  clear: both;
1402
  }
1403
 
1404
+ .nx-wide .tx-fullwidthrow .tx-fullwidthinner:after,
1405
+ .nx-boxed .tx-fullwidthrow .tx-fullwidthinner:after {
1406
  content: "";
1407
  display: table;
1408
  clear: both;
1409
  background-color: #f00;
1410
  }
1411
+ /*
1412
+ .nx-boxed .tx-fullwidthrow .tx-fullwidthinner {
1413
+ margin-left: -32px;
1414
+ margin-right: 32px;
1415
+ }
1416
+ */
1417
  @media (max-width: 999px) {
1418
  .folio-col-1 {
1419
  display: block;
js/tx-script.js CHANGED
@@ -12,7 +12,7 @@ jQuery(document).ready(function ($) {
12
  windowwidth = $window.width();
13
 
14
 
15
- //client carousel
16
  $('.tx-testimonials').each(function () {
17
  $(this).owlCarousel({
18
  autoPlay : 8000,
@@ -115,6 +115,7 @@ jQuery(document).ready(function ($) {
115
  navigationText: ['<span class="genericon genericon-leftarrow"></span>','<span class="genericon genericon-rightarrow"></span>'],
116
  addClassActive: true,
117
  theme : "tx-owl-theme",
 
118
  pagination : true
119
  });
120
  });
@@ -159,7 +160,8 @@ jQuery(document).ready(function ($) {
159
  var fwheight = $(this).children('div').outerHeight();
160
  var extrawidth = (sitewidth-maxwidth)/2+32;
161
 
162
- if(sitewidth > 1200)
 
163
  {
164
  _this.wrapInner( "<div class='tx-fullwidthinner'></div>" );
165
 
@@ -195,7 +197,7 @@ jQuery(document).ready(function ($) {
195
  _this.children('.tx-fullwidthinner').children().unwrap();
196
  }
197
  _this.css({"height":"auto","overflow":"hidden"});
198
- console.log("should be here");
199
  }
200
 
201
  });
@@ -205,13 +207,38 @@ jQuery(document).ready(function ($) {
205
 
206
  // forcing wide
207
  $('.tx-fullwidthrow').each(function () {
208
- if( $('body.tx-boxed').length < 1 && $('.has-left-sidebar').length < 1 && $('.has-right-sidebar').length < 1 )
 
209
  {
210
  $(this).widify();
211
  }
212
  });
213
 
214
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
215
 
216
 
217
  });
12
  windowwidth = $window.width();
13
 
14
 
15
+ //Testimonials carousel
16
  $('.tx-testimonials').each(function () {
17
  $(this).owlCarousel({
18
  autoPlay : 8000,
115
  navigationText: ['<span class="genericon genericon-leftarrow"></span>','<span class="genericon genericon-rightarrow"></span>'],
116
  addClassActive: true,
117
  theme : "tx-owl-theme",
118
+ transitionStyle : "fadeUp",
119
  pagination : true
120
  });
121
  });
160
  var fwheight = $(this).children('div').outerHeight();
161
  var extrawidth = (sitewidth-maxwidth)/2+32;
162
 
163
+
164
+ if(sitewidth >= 1200)
165
  {
166
  _this.wrapInner( "<div class='tx-fullwidthinner'></div>" );
167
 
197
  _this.children('.tx-fullwidthinner').children().unwrap();
198
  }
199
  _this.css({"height":"auto","overflow":"hidden"});
200
+ //console.log("should be here");
201
  }
202
 
203
  });
207
 
208
  // forcing wide
209
  $('.tx-fullwidthrow').each(function () {
210
+ //if( $('body.tx-boxed').length < 1 && $('.has-left-sidebar').length < 1 && $('.has-right-sidebar').length < 1 )
211
+ if( $('.has-left-sidebar').length < 1 && $('.has-right-sidebar').length < 1 )
212
  {
213
  $(this).widify();
214
  }
215
  });
216
 
217
+ if ( $('.other-slider').length > 0 )
218
+ {
219
+ var slider_parallax = $('.other-slider').children('.tx-slider').data('parallax');
220
+ var slidetop2 = parseInt($('.other-slider').offset().top);
221
+ console.log('parallax : '+slider_parallax);
222
+ if( $( window ).width() > 999 && slider_parallax == "yes" )
223
+ {
224
+ $(window).scroll(function(){
225
+ var newvalue2 = parseInt($(this).scrollTop()*0.70)-100;
226
+
227
+ if ($(this).scrollTop() > slidetop2)
228
+ {
229
+ $('.other-slider img').css('margin-top', newvalue2+'px');
230
+ }
231
+
232
+ if ($(this).scrollTop() <= slidetop2)
233
+ {
234
+ var slideheight2 = $('.other-slider .active img').height();
235
+ $('.other-slider img').css('margin-top', 0+'px');
236
+ $('.other-slider .owl-wrapper-outer').css('max-height', slideheight2+'px');
237
+ }
238
+ //console.log('margin-top : '+newvalue+'px, ' + 'SlideTop : ' +slidetop+'px, ' + 'Scrolltop : ' +$(this).scrollTop()+'px');
239
+ });
240
+ }
241
+ }
242
 
243
 
244
  });
readme.txt CHANGED
@@ -3,8 +3,8 @@
3
  Contributors: marsian
4
  Tags: shortcode, shortcodes, columns, column, section, sections, portfolio, testimonial, border, borders, button, buttons, masonry, posts, post_type, font awesome, icons, fontawesome
5
  Requires at least: 3.6
6
- Tested up to: 4.3
7
- Stable tag: 1.1.4
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -24,6 +24,9 @@ Install the plugin into the `/wp-content/plugins/` folder, and activate it.
24
 
25
 
26
  == Changelog ==
 
 
 
27
 
28
  = 1.1.4 =
29
  * Support for portfolio category filter
3
  Contributors: marsian
4
  Tags: shortcode, shortcodes, columns, column, section, sections, portfolio, testimonial, border, borders, button, buttons, masonry, posts, post_type, font awesome, icons, fontawesome
5
  Requires at least: 3.6
6
+ Tested up to: 4.4
7
+ Stable tag: 1.1.6
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
24
 
25
 
26
  == Changelog ==
27
+ = 1.1.5 =
28
+ * Added Parallax Effect for slider
29
+ * CSS changes
30
 
31
  = 1.1.4 =
32
  * Support for portfolio category filter
shortcodes.php CHANGED
@@ -544,6 +544,7 @@ function tx_slider_function($atts, $content = null) {
544
  'items' => 10,
545
  'category' => '',
546
  'delay' => 8000,
 
547
  'class' => '',
548
  ), $atts);
549
 
@@ -558,9 +559,10 @@ function tx_slider_function($atts, $content = null) {
558
  $posts_per_page = intval( $atts['items'] );
559
  $tx_class = $atts['class'];
560
  $tx_delay = $atts['delay'];
 
561
 
562
 
563
- $return_string .= '<div class="tx-slider" data-delay="'.$tx_delay.'">';
564
 
565
 
566
  wp_reset_query();
544
  'items' => 10,
545
  'category' => '',
546
  'delay' => 8000,
547
+ 'parallax' => 'yes',
548
  'class' => '',
549
  ), $atts);
550
 
559
  $posts_per_page = intval( $atts['items'] );
560
  $tx_class = $atts['class'];
561
  $tx_delay = $atts['delay'];
562
+ $tx_parallax = $atts['parallax'];
563
 
564
 
565
+ $return_string .= '<div class="tx-slider" data-delay="'.$tx_delay.'" data-parallax="'.$tx_parallax.'">';
566
 
567
 
568
  wp_reset_query();
tx-shortcodes.js CHANGED
@@ -959,7 +959,15 @@
959
  <td><input type="number" min="1000" max="16000" name="delay" step="500" id="slider-delay" value="8000" /><br />\
960
  <small>Duration between slides in miliseconds</small>\
961
  </tr>\
962
- </table>\
 
 
 
 
 
 
 
 
963
  <div class="nx-sh-cancel">\
964
  <input type="button" id="slider-submit" class="button-primary" value="Insert Slider" name="submit" />\
965
  <input type="button" id="modal-close" class="modal-close button-primary" value="Cancel" name="Cancel" />\
@@ -977,8 +985,9 @@
977
  var category = table.find('#slider-category').val();
978
  var slider_items = table.find('#slider-items').val();
979
  var slider_delay = table.find('#slider-delay').val();
 
980
 
981
- var shortcode = '[tx_slider style="'+style+'" category="'+category+'" delay="'+slider_delay+'" items="'+slider_items+'"]<br/>';
982
 
983
  // inserts the shortcode into the active editor
984
  tinyMCE.activeEditor.execCommand('mceInsertContent', 0, shortcode);
959
  <td><input type="number" min="1000" max="16000" name="delay" step="500" id="slider-delay" value="8000" /><br />\
960
  <small>Duration between slides in miliseconds</small>\
961
  </tr>\
962
+ <tr>\
963
+ <th><label for="slider-parallax">Parallax</label></th>\
964
+ <td><select name="parallax" id="slider-parallax">\
965
+ <option value="yes">Yes</option>\
966
+ <option value="no">No</option>\
967
+ </select><br />\
968
+ <small>Turn on parallax effect (only works with header slider through page/post meta &quot;Other Slider Plugin Shortcode&quot; )</small>\
969
+ </tr>\
970
+ </table>\
971
  <div class="nx-sh-cancel">\
972
  <input type="button" id="slider-submit" class="button-primary" value="Insert Slider" name="submit" />\
973
  <input type="button" id="modal-close" class="modal-close button-primary" value="Cancel" name="Cancel" />\
985
  var category = table.find('#slider-category').val();
986
  var slider_items = table.find('#slider-items').val();
987
  var slider_delay = table.find('#slider-delay').val();
988
+ var slider_parallax = table.find('#slider-parallax').val();
989
 
990
+ var shortcode = '[tx_slider style="'+style+'" category="'+category+'" delay="'+slider_delay+'" parallax="'+slider_parallax+'" items="'+slider_items+'"]<br/>';
991
 
992
  // inserts the shortcode into the active editor
993
  tinyMCE.activeEditor.execCommand('mceInsertContent', 0, shortcode);
tx-toolkit.php CHANGED
@@ -3,7 +3,7 @@
3
  /*
4
  Plugin Name: TemplatesNext ToolKit
5
  Description: Custom Portfolio and Shortcode functionality for TemplatesNext Wordpress Themes
6
- Version: 1.1.4
7
  Author: TemplatesNext
8
  Author URI: http://templatesnext.org/
9
  License: GPLv2 or later
3
  /*
4
  Plugin Name: TemplatesNext ToolKit
5
  Description: Custom Portfolio and Shortcode functionality for TemplatesNext Wordpress Themes
6
+ Version: 1.1.6
7
  Author: TemplatesNext
8
  Author URI: http://templatesnext.org/
9
  License: GPLv2 or later