Collapse-O-Matic - Version 1.5.8

Version Description

  • load scripts only if shortcode is in use defaults to false - load all the time
  • added option to choose where all scripts will load: header or footer
Download this release

Release Info

Developer baden03
Plugin Icon 128x128 Collapse-O-Matic
Version 1.5.8
Comparing to
See all releases

Code changes from version 1.5.7 to 1.5.8

Files changed (4) hide show
  1. collapse-o-matic.php +40 -7
  2. languages/colomat-me.mo +0 -0
  3. languages/colomat-me.po +156 -0
  4. readme.txt +13 -5
collapse-o-matic.php CHANGED
@@ -5,7 +5,7 @@ Text Domain: colomat
5
  Domain Path: /languages
6
  Plugin URI: http://plugins.twinpictures.de/plugins/collapse-o-matic/
7
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
8
- Version: 1.5.7
9
  Author: twinpictures, baden03
10
  Author URI: http://twinpictures.de/
11
  License: GPL2
@@ -23,7 +23,7 @@ class WP_Collapse_O_Matic {
23
  * Current version
24
  * @var string
25
  */
26
- var $version = '1.5.7';
27
 
28
  /**
29
  * Used as prefix for options entry
@@ -46,7 +46,8 @@ class WP_Collapse_O_Matic {
46
  'duration' => 'fast',
47
  'slideEffect' => 'slideFade',
48
  'custom_css' => '',
49
- 'script_check' => 1
 
50
  );
51
 
52
  /**
@@ -66,8 +67,12 @@ class WP_Collapse_O_Matic {
66
  add_action( 'admin_menu', array( $this, 'admin_menu' ) );
67
  add_action( 'plugin_action_links_' . plugin_basename(__FILE__), array( $this, 'plugin_actions' ) );
68
  add_action( 'admin_init', array( $this, 'admin_init' ) );
69
- add_action( 'wp_footer', array( $this, 'colomat_js_vars' ) );
70
-
 
 
 
 
71
  add_shortcode('expand', array($this, 'shortcode'));
72
 
73
  //add expandsub shortcodes
@@ -97,7 +102,11 @@ class WP_Collapse_O_Matic {
97
  */
98
  function collapsTronicInit() {
99
  //collapse script
100
- wp_register_script('collapseomatic-js', plugins_url('js/collapse.js', __FILE__), array('jquery'), '1.5.7', true);
 
 
 
 
101
  if( empty($this->options['script_check']) ){
102
  wp_enqueue_script('collapseomatic-js');
103
  }
@@ -380,12 +389,36 @@ class WP_Collapse_O_Matic {
380
  </tr>
381
 
382
  <tr>
383
- <th><?php _e( 'Shortcode Loads Scripts', 'colomat' ) ?></th>
384
  <td><label><input type="checkbox" id="<?php echo $this->options_name ?>[script_check]" name="<?php echo $this->options_name ?>[script_check]" value="1" <?php echo checked( $options['script_check'], 1 ); ?> /> <?php _e('Only load scripts with shortcode.', 'colomat'); ?>
385
  <br /><span class="description"><?php _e('Only load Collapse-O-Matic scripts if [expand] shortcode is used.', 'colomat'); ?></span></label>
386
  </td>
387
  </tr>
388
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
389
  <tr>
390
  <th><strong><?php _e( 'Level Up!', 'colomat' ) ?></strong></th>
391
  <td><?php printf(__( '%sCollapse-Pro-Matic%s is our preimum plugin that offers additional attributes and features for <i>ultimate</i> flexibility.', 'colomat' ), '<a href="http://plugins.twinpictures.de/premium-plugins/collapse-pro-matic/">', '</a>'); ?>
5
  Domain Path: /languages
6
  Plugin URI: http://plugins.twinpictures.de/plugins/collapse-o-matic/
7
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
8
+ Version: 1.5.8
9
  Author: twinpictures, baden03
10
  Author URI: http://twinpictures.de/
11
  License: GPL2
23
  * Current version
24
  * @var string
25
  */
26
+ var $version = '1.5.8';
27
 
28
  /**
29
  * Used as prefix for options entry
46
  'duration' => 'fast',
47
  'slideEffect' => 'slideFade',
48
  'custom_css' => '',
49
+ 'script_check' => '',
50
+ 'script_location' => 'footer'
51
  );
52
 
53
  /**
67
  add_action( 'admin_menu', array( $this, 'admin_menu' ) );
68
  add_action( 'plugin_action_links_' . plugin_basename(__FILE__), array( $this, 'plugin_actions' ) );
69
  add_action( 'admin_init', array( $this, 'admin_init' ) );
70
+ if($this->options['script_location'] == 'footer' ){
71
+ add_action( 'wp_footer', array( $this, 'colomat_js_vars' ) );
72
+ }
73
+ else{
74
+ add_action('wp_head', array( $this, 'colomat_js_vars' ) );
75
+ }
76
  add_shortcode('expand', array($this, 'shortcode'));
77
 
78
  //add expandsub shortcodes
102
  */
103
  function collapsTronicInit() {
104
  //collapse script
105
+ $load_in_footer = false;
106
+ if($this->options['script_location'] == 'footer' ){
107
+ $load_in_footer = true;
108
+ }
109
+ wp_register_script('collapseomatic-js', plugins_url('js/collapse.js', __FILE__), array('jquery'), '1.5.7', $load_in_footer);
110
  if( empty($this->options['script_check']) ){
111
  wp_enqueue_script('collapseomatic-js');
112
  }
389
  </tr>
390
 
391
  <tr>
392
+ <th><?php _e( 'Shortcode Loads Scripts', 'colomat' ) ?>:</th>
393
  <td><label><input type="checkbox" id="<?php echo $this->options_name ?>[script_check]" name="<?php echo $this->options_name ?>[script_check]" value="1" <?php echo checked( $options['script_check'], 1 ); ?> /> <?php _e('Only load scripts with shortcode.', 'colomat'); ?>
394
  <br /><span class="description"><?php _e('Only load Collapse-O-Matic scripts if [expand] shortcode is used.', 'colomat'); ?></span></label>
395
  </td>
396
  </tr>
397
 
398
+ <tr>
399
+ <th><?php _e( 'Script Load Location', 'colomat' ) ?>:</th>
400
+ <td><label><select id="<?php echo $this->options_name ?>[script_location]" name="<?php echo $this->options_name ?>[script_location]">
401
+ <?php
402
+ if(empty($options['script_location'])){
403
+ $options['script_location'] = 'footer';
404
+ }
405
+ $sl_array = array(
406
+ __('Header', 'colomat') => 'header',
407
+ __('Footer', 'colomat') => 'footer'
408
+ );
409
+ foreach( $sl_array as $key => $value){
410
+ $selected = '';
411
+ if($options['script_location'] == $value){
412
+ $selected = 'SELECTED';
413
+ }
414
+ echo '<option value="'.$value.'" '.$selected.'>'.$key.'</option>';
415
+ }
416
+ ?>
417
+ </select>
418
+ <br /><span class="description"><?php _e('Where should the script be loaded, in the Header or the Footer?', 'colomat'); ?></span></label>
419
+ </td>
420
+ </tr>
421
+
422
  <tr>
423
  <th><strong><?php _e( 'Level Up!', 'colomat' ) ?></strong></th>
424
  <td><?php printf(__( '%sCollapse-Pro-Matic%s is our preimum plugin that offers additional attributes and features for <i>ultimate</i> flexibility.', 'colomat' ), '<a href="http://plugins.twinpictures.de/premium-plugins/collapse-pro-matic/">', '</a>'); ?>
languages/colomat-me.mo ADDED
Binary file
languages/colomat-me.po ADDED
@@ -0,0 +1,156 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ # Translation of Collapse-O-Matic in Montenegrin
2
+ # This file is distributed under the same license as the Collapse-O-Matic package.
3
+ msgid ""
4
+ msgstr ""
5
+ "PO-Revision-Date: 2014-04-14 14:36+0100\n"
6
+ "MIME-Version: 1.0\n"
7
+ "Content-Type: text/plain; charset=UTF-8\n"
8
+ "Content-Transfer-Encoding: 8bit\n"
9
+ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
10
+ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
11
+ "X-Generator: Poedit 1.6.4\n"
12
+ "Project-Id-Version: Collapse-O-Matic\n"
13
+ "POT-Creation-Date: \n"
14
+ "Last-Translator: Twinpictues <info@twinpictures.de>\n"
15
+ "Language-Team: Twinpictures <info@twinpictures.de>\n"
16
+ "Language: me\n"
17
+
18
+ #: collapse-o-matic.php:383
19
+ msgid "Shortcode Loads Scripts"
20
+ msgstr ""
21
+
22
+ #: collapse-o-matic.php:384
23
+ msgid "Only load scripts with shortcode."
24
+ msgstr ""
25
+
26
+ #: collapse-o-matic.php:385
27
+ msgid "Only load Collapse-O-Matic scripts if [expand] shortcode is used."
28
+ msgstr ""
29
+
30
+ #: collapse-o-matic.php:391
31
+ msgid ""
32
+ "%sCollapse-Pro-Matic%s is our preimum plugin that offers additional "
33
+ "attributes and features for <i>ultimate</i> flexibility."
34
+ msgstr ""
35
+
36
+ #: collapse-o-matic.php:416
37
+ msgid "%sFree%s Opensource Support"
38
+ msgstr ""
39
+
40
+ #: collapse-o-matic.php:417
41
+ msgid ""
42
+ "If this plugin %s, please consider %sreviewing it at WordPress.org%s to help "
43
+ "others."
44
+ msgstr ""
45
+
46
+ #: collapse-o-matic.php:277
47
+ msgid "Settings"
48
+ msgstr ""
49
+
50
+ #: collapse-o-matic.php:328
51
+ msgid ""
52
+ "Select Light for sites with lighter backgrounds. Select Dark for sites with "
53
+ "darker backgrounds."
54
+ msgstr ""
55
+
56
+ #: collapse-o-matic.php:376
57
+ msgid "Custom Style"
58
+ msgstr ""
59
+
60
+ #: collapse-o-matic.php:378
61
+ msgid "Custom CSS style for <em>ultimate flexibility</em>"
62
+ msgstr ""
63
+
64
+ #: collapse-o-matic.php:309
65
+ msgid "Style"
66
+ msgstr "Stil"
67
+
68
+ #: collapse-o-matic.php:316
69
+ msgid "Light"
70
+ msgstr "Svetlo"
71
+
72
+ #: collapse-o-matic.php:317
73
+ msgid "Dark"
74
+ msgstr "Tamno"
75
+
76
+ #: collapse-o-matic.php:297 collapse-o-matic.php:409
77
+ msgid "Click to toggle"
78
+ msgstr "Klik za toggle"
79
+
80
+ #: collapse-o-matic.php:298
81
+ msgid "Default Collapse-O-Matic Settings"
82
+ msgstr "Default Collapse-O-Matic Settings"
83
+
84
+ #: collapse-o-matic.php:333
85
+ msgid "Tag Attribute"
86
+ msgstr "Tag atributa"
87
+
88
+ #: collapse-o-matic.php:335
89
+ msgid ""
90
+ "HTML tag use to wrap the trigger text. See %sTag Attribute%s in the "
91
+ "documentation for more info."
92
+ msgstr ""
93
+ "HTML tagove upotrebiti za zamotavanje tekst okidača . Pogledajte % Stag "
94
+ "Atribut % s dokumentaciju za više informacija ."
95
+
96
+ #: collapse-o-matic.php:345
97
+ msgid "Collapse/Expand Duration"
98
+ msgstr "Collapse/Expand Duration"
99
+
100
+ #: collapse-o-matic.php:347
101
+ msgid ""
102
+ "A string or number determining how long the animation will run. See "
103
+ "%sDuration%s in the documentation for more info."
104
+ msgstr ""
105
+ "String ili broj određivanja koliko će dugo trajati animacija . Pogledajte % "
106
+ "sDuration % s dokumentaciju za više informacija ."
107
+
108
+ #: collapse-o-matic.php:352
109
+ msgid "Animation Effect"
110
+ msgstr "Animation Effect"
111
+
112
+ #: collapse-o-matic.php:359
113
+ msgid "Slide Only"
114
+ msgstr "Samo slajduj"
115
+
116
+ #: collapse-o-matic.php:360
117
+ msgid "Slide & Fade"
118
+ msgstr "Slajduj & Ukloni"
119
+
120
+ #: collapse-o-matic.php:371
121
+ msgid ""
122
+ "Animation effect to use while collapsing and expanding. See %sAnimation "
123
+ "Effect%s in the documentation for more info."
124
+ msgstr ""
125
+ "Efekat Animacija koristiti kod kolapsa i proširenje . Pogledajte % "
126
+ "sAnimation Effect % s dokumentaciju za više informacija ."
127
+
128
+ #: collapse-o-matic.php:390
129
+ msgid "Level Up!"
130
+ msgstr "Podigni na veći nivo!"
131
+
132
+ #: collapse-o-matic.php:398
133
+ msgid "Save Changes"
134
+ msgstr "Sačuvaj promene"
135
+
136
+ #: collapse-o-matic.php:410
137
+ msgid "About"
138
+ msgstr "o"
139
+
140
+ #: collapse-o-matic.php:413
141
+ msgid ""
142
+ "Remove clutter, save space. Display and hide additional content in a SEO "
143
+ "friendly way. Wrap any content&mdash;including other shortcodes&mdash;into a "
144
+ "lovely jQuery expanding and collapsing element."
145
+ msgstr ""
146
+ "Uklonite gužvu , uštede prostora . Prikazati i sakriti dodatnih sadržaja na "
147
+ "SEO prijateljski način . Umotajte svaki sadržashortcodes&mdash; kratke "
148
+ "brojeve - u divnom jQuery širenja i rušenja elemenata ."
149
+
150
+ #: collapse-o-matic.php:415
151
+ msgid ""
152
+ "%sDetailed documentation%s, complete with working demonstrations of all "
153
+ "shortcode attributes, is available for your instructional enjoyment."
154
+ msgstr ""
155
+ " %sDetaljna dokumentacija , zajedno sa radnim demonstracijama svih shortcode "
156
+ "atributa , je dostupna za vaše nastavno uživanje ."
readme.txt CHANGED
@@ -2,10 +2,10 @@
2
 
3
  Contributors: twinpictures, baden03
4
  Donate link: http://plugins.twinpictures.de/plugins/collapse-o-matic/
5
- Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more
6
  Requires at least: 3.5
7
- Tested up to: 3.8
8
- Stable tag: 1.5.7
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -21,13 +21,13 @@ Collapse-O-Matic adds an `[expand title="trigger text"]hidden content[/expand]`
21
  1. Activate the Plug-in
22
  1. Add a the shortcode to your post like so: `[expand title="Displayed Title Goes Here"]Hidden content goes here[/expand]`
23
  1. Test that the this plug-in meets your demanding needs.
24
- 1. Tweak the CSS to match your flavor.
25
  1. Rate the plug-in and verify if it works at wordpress.org.
26
  1. Leave a comment regarding bugs, feature request, cocktail recipes at http://wordpress.org/tags/jquery-collapse-o-matic/
27
 
28
  == Frequently Asked Questions ==
29
 
30
- = Where can I translate this plugin into my favorite langauge? =
31
  <a href='http://translate.twinpictures.de/projects/colomat'>Community translation for Collapse-O-Matic</a> has been set up. All are <a href='http://translate.twinpictures.de/wordpress/wp-login.php?action=register'>welcome to join</a>.
32
 
33
  = I am a Social Netwookiee, might Twinpictures have a Facebook page? =
@@ -50,6 +50,10 @@ No. Not even close.
50
 
51
  == Changelog ==
52
 
 
 
 
 
53
  = 1.5.7 =
54
  * option to only load scripts if shortcode is in use
55
  * script now loaded in footer
@@ -230,6 +234,10 @@ Fixed auto-expand of urls with id-anchors
230
 
231
  == Upgrade Notice ==
232
 
 
 
 
 
233
  = 1.5.7 =
234
  * option to only load scripts if shortcode is in use
235
  * script loads in footer
2
 
3
  Contributors: twinpictures, baden03
4
  Donate link: http://plugins.twinpictures.de/plugins/collapse-o-matic/
5
+ Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
6
  Requires at least: 3.5
7
+ Tested up to: 3.9
8
+ Stable tag: 1.5.8
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
21
  1. Activate the Plug-in
22
  1. Add a the shortcode to your post like so: `[expand title="Displayed Title Goes Here"]Hidden content goes here[/expand]`
23
  1. Test that the this plug-in meets your demanding needs.
24
+ 1. Tweak the CSS to match your flavour.
25
  1. Rate the plug-in and verify if it works at wordpress.org.
26
  1. Leave a comment regarding bugs, feature request, cocktail recipes at http://wordpress.org/tags/jquery-collapse-o-matic/
27
 
28
  == Frequently Asked Questions ==
29
 
30
+ = Where can I translate this plugin into my favourite language? =
31
  <a href='http://translate.twinpictures.de/projects/colomat'>Community translation for Collapse-O-Matic</a> has been set up. All are <a href='http://translate.twinpictures.de/wordpress/wp-login.php?action=register'>welcome to join</a>.
32
 
33
  = I am a Social Netwookiee, might Twinpictures have a Facebook page? =
50
 
51
  == Changelog ==
52
 
53
+ = 1.5.8 =
54
+ * load scripts only if shortcode is in use defaults to false - load all the time
55
+ * added option to choose where all scripts will load: header or footer
56
+
57
  = 1.5.7 =
58
  * option to only load scripts if shortcode is in use
59
  * script now loaded in footer
234
 
235
  == Upgrade Notice ==
236
 
237
+ = 1.5.8 =
238
+ * scripts always load by default
239
+ * can choose if script loads in header or footer
240
+
241
  = 1.5.7 =
242
  * option to only load scripts if shortcode is in use
243
  * script loads in footer