Collapse-O-Matic - Version 1.7.14

Version Description

  • tried to fixed spacing issue by forcing elwraptag as a div, but this will effect inline expands. Will need to add elwraptag as an option.
  • fully tested with WordPress 5.8.1
  • migrated plugins home over to pluginoven.com
Download this release

Release Info

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

Code changes from version 1.7.13 to 1.7.14

Files changed (5) hide show
  1. README.md +5 -5
  2. collapse-o-matic.php +67 -60
  3. dark_style.css +1 -1
  4. light_style.css +1 -1
  5. readme.txt +11 -11
README.md CHANGED
@@ -3,14 +3,14 @@
3
  * Donate link: https://plugins.twinpictures.de/plugins/collapse-o-matic/
4
  * 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
5
  * Requires at least: 4.7
6
- * Tested up to: 5.6.0
7
- * Stable tag: 1.7.13
8
- * Requires PHP: 7.0
9
  * License: GPLv2 or later
10
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
11
 
12
  ##Description
13
- Collapse-O-Matic adds an `[expand title="trigger text"]hidden content[/expand]` shortcode that will wrap any content, including other shortcodes, into a lovely jQuery expanding and collapsing div. A <a href='https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options and attribute demos</a> are available, as well as <a href='https://wordpress.org/support/plugin/jquery-collapse-o-matic'>free community</a> support.
14
 
15
  #Installation
16
  1. Old-school: upload the `collapse-o-matic` folder to the `/wp-content/plug-ins/` directory via FTP. Hipster: Ironically add collapse-o-matic via the WordPress Plug-ins menu.
@@ -32,7 +32,7 @@ Collapse-O-Matic adds an `[expand title="trigger text"]hidden content[/expand]`
32
  * Ah yes! <a href='https://twitter.com/#!/twinpictures'>@Twinpictures</a> does the twitter tweeting around here.
33
 
34
  <b>How does one use the shortcode, exactly?</b>
35
- * A <a href='https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options</a> has been provided to answer this exact question.
36
 
37
  <b>Is Galato the same as Ice Cream?</b>
38
  * No. Not even close.
3
  * Donate link: https://plugins.twinpictures.de/plugins/collapse-o-matic/
4
  * 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
5
  * Requires at least: 4.7
6
+ * Tested up to: 5.7.0
7
+ * Stable tag: 1.7.14a
8
+ * Requires PHP: 7.2
9
  * License: GPLv2 or later
10
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
11
 
12
  ##Description
13
+ Collapse-O-Matic adds an `[expand title="trigger text"]hidden content[/expand]` shortcode that will wrap any content, including other shortcodes, into a lovely jQuery expanding and collapsing div. A <a href='https://pluginoven.com/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options and attribute demos</a> are available, as well as <a href='https://pluginoven.com/plugins/collapse-o-matic/documentation/'>free community</a> support.
14
 
15
  #Installation
16
  1. Old-school: upload the `collapse-o-matic` folder to the `/wp-content/plug-ins/` directory via FTP. Hipster: Ironically add collapse-o-matic via the WordPress Plug-ins menu.
32
  * Ah yes! <a href='https://twitter.com/#!/twinpictures'>@Twinpictures</a> does the twitter tweeting around here.
33
 
34
  <b>How does one use the shortcode, exactly?</b>
35
+ * A <a href='https://pluginoven.com/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options</a> has been provided to answer this exact question.
36
 
37
  <b>Is Galato the same as Ice Cream?</b>
38
  * No. Not even close.
collapse-o-matic.php CHANGED
@@ -2,9 +2,9 @@
2
  /*
3
  Plugin Name: Collapse-O-Matic
4
  Text Domain: jquery-collapse-o-matic
5
- Plugin URI: https://plugins.twinpictures.de/plugins/collapse-o-matic/
6
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
7
- Version: 1.7.13
8
  Author: twinpictures, baden03
9
  Author URI: https://twinpictures.de/
10
  License: GPL2
@@ -17,7 +17,7 @@ License: GPL2
17
  */
18
 
19
  if(!defined('PLUGIN_OVEN_URL')){
20
- define( 'PLUGIN_OVEN_URL', 'https://plugins.twinpictures.de' );
21
  }
22
  if(!defined('PLUGIN_OVEN_CC')){
23
  define( 'PLUGIN_OVEN_CC', 'Collapse Commander' );
@@ -29,7 +29,7 @@ class WP_Collapse_O_Matic {
29
  * Current version
30
  * @var string
31
  */
32
- var $version = '1.7.13';
33
 
34
  /**
35
  * Used as prefix for options entry
@@ -185,40 +185,40 @@ class WP_Collapse_O_Matic {
185
  //find a random number, if no id is assigned
186
  $ran = uniqid();
187
  extract(shortcode_atts(array(
188
- 'title' => '',
189
- 'cid' => $options['cid'],
190
- 'template_id' => '',
191
- 'swaptitle' => '',
192
- 'alt' => '',
193
- 'swapalt' => '',
194
- 'notitle' => $options['notitle'],
195
- 'id' => 'id'.$ran,
196
- 'tag' => $options['tag'],
197
- 'trigclass' => $options['trigclass'],
198
- 'targtag' => $options['targtag'],
199
- 'targclass' => $options['targclass'],
200
- 'targpos' => '',
201
- 'trigpos' => 'above',
202
- 'rel' => '',
203
- 'group' => '',
204
- 'togglegroup' => '',
205
- 'expanded' => '',
206
- 'excerpt' => '',
207
- 'swapexcerpt' => false,
208
- 'excerptpos' => 'below-trigger',
209
- 'excerpttag' => 'div',
210
- 'excerptclass' => '',
211
- 'findme' => '',
212
- 'scrollonclose' => '',
213
- 'startwrap' => '',
214
- 'endwrap' => '',
215
- 'elwraptag' => '',
216
- 'elwrapclass' => '',
217
- 'filter' => $options['filter_content'],
218
- 'tabindex' => $options['tabindex'],
219
- 'animation_effect' => '',
220
- 'duration' => '',
221
- ), $atts, 'expand'));
222
 
223
  //collapse commander
224
  if( !empty($cid) && is_plugin_active( 'collapse-commander/collapse-commander.php') ){
@@ -238,13 +238,13 @@ class WP_Collapse_O_Matic {
238
  }
239
  }
240
  wp_reset_postdata();
 
241
 
242
- if(!empty($triggertext)){
243
- $title = $triggertext;
244
- }
245
- if(!empty($highlander) && !empty($rel)){
246
- $rel .= '-highlander';
247
- }
248
  }
249
 
250
  //content filtering
@@ -256,6 +256,13 @@ class WP_Collapse_O_Matic {
256
  $content = str_replace( ']]>', ']]&gt;', $content );
257
  }
258
 
 
 
 
 
 
 
 
259
  $ewo = '';
260
  $ewc = '';
261
 
@@ -280,8 +287,8 @@ class WP_Collapse_O_Matic {
280
  if(empty($targtag)){
281
  $targtag = 'div';
282
  }
283
-
284
- if($elwraptag){
285
  $ewclass = '';
286
  if($elwrapclass){
287
  $ewclass = 'class="'.$elwrapclass.'"';
@@ -291,6 +298,7 @@ class WP_Collapse_O_Matic {
291
  }
292
 
293
  $eDiv = '';
 
294
  if($content){
295
  $inline_class = '';
296
  $collapse_class = 'collapseomatic_content ';
@@ -300,7 +308,6 @@ class WP_Collapse_O_Matic {
300
  }
301
  $eDiv = '<'.$targtag.' id="target-'.$id.'" class="'.$collapse_class.$inline_class.$targclass.'">'.$content.'</'.$targtag.'>';
302
  }
303
-
304
  if($excerpt){
305
  $excerpt = str_replace($placeholder_arr, $swapout_arr, $excerpt);
306
  $excerpt = do_shortcode($excerpt);
@@ -532,13 +539,13 @@ class WP_Collapse_O_Matic {
532
  <tr>
533
  <th><?php _e( 'CID Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
534
  <td><label><input type="text" id="<?php echo $this->options_name ?>[cid]" name="<?php echo $this->options_name ?>[cid]" value="<?php echo $options['cid']; ?>" />
535
- <br /><span class="description"><?php printf( __('Default %sCollapse Commander%s ID', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/premium-plugins/collapse-commander/" target="_blank">', '</a>'); ?></span></label>
536
  </td>
537
  </tr>
538
  <?php else: ?>
539
  <tr>
540
  <th><?php _e( 'Collapse Management', 'colpromat' ) ?></th>
541
- <td><?php printf(__( '%sCollapse Commander%s is an add-on plugin that introduces an advanced management interface to better organize expand elements and simplify expand shortcodes.', 'colpromat' ), '<a href="https://plugins.twinpictures.de/premium-plugins/collapse-commander/">', '</a>'); ?>
542
  </td>
543
  </tr>
544
  <?php endif; ?>
@@ -546,35 +553,35 @@ class WP_Collapse_O_Matic {
546
  <tr>
547
  <th><?php _e( 'Tag Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
548
  <td><label><input type="text" id="<?php echo $this->options_name ?>[tag]" name="<?php echo $this->options_name ?>[tag]" value="<?php echo $options['tag']; ?>" />
549
- <br /><span class="description"><?php printf(__('HTML tag use to wrap the trigger text. See %sTag Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/#tag" target="_blank">', '</a>'); ?></span></label>
550
  </td>
551
  </tr>
552
 
553
  <tr>
554
  <th><?php _e( 'Trigclass Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
555
  <td><label><input type="text" id="<?php echo $this->options_name ?>[trigclass]" name="<?php echo $this->options_name ?>[trigclass]" value="<?php echo $options['trigclass']; ?>" />
556
- <br /><span class="description"><?php printf(__('Default class assigned to the trigger element. See %sTrigclass Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/#trigclass" target="_blank">', '</a>'); ?></span></label>
557
  </td>
558
  </tr>
559
 
560
  <tr>
561
  <th><?php _e( 'Tabindex Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
562
  <td><label><input type="text" id="<?php echo $this->options_name ?>[tabindex]" name="<?php echo $this->options_name ?>[tabindex]" value="<?php echo $options['tabindex']; ?>" />
563
- <br /><span class="description"><?php printf(__('Default tabindex value to be assigned to the trigger element. See %sTabindex Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/#tabindex" target="_blank">', '</a>'); ?></span></label>
564
  </td>
565
  </tr>
566
 
567
  <tr>
568
  <th><?php _e( 'Targtag Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
569
  <td><label><input type="text" id="<?php echo $this->options_name ?>[targtag]" name="<?php echo $this->options_name ?>[targtag]" value="<?php echo $options['targtag']; ?>" />
570
- <br /><span class="description"><?php printf(__('HTML tag use for the target element. See %sTargtag Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/#targtag" target="_blank">', '</a>'); ?></span></label>
571
  </td>
572
  </tr>
573
 
574
  <tr>
575
  <th><?php _e( 'Targclass Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
576
  <td><label><input type="text" id="<?php echo $this->options_name ?>[targclass]" name="<?php echo $this->options_name ?>[targclass]" value="<?php echo $options['targclass']; ?>" />
577
- <br /><span class="description"><?php printf(__('Default class assigned to the target element. See %sTargclass Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/#targclass" target="_blank">', '</a>'); ?></span></label>
578
  </td>
579
  </tr>
580
 
@@ -708,13 +715,13 @@ class WP_Collapse_O_Matic {
708
  <?php if( !is_plugin_active( 'collapse-commander/collapse-commander.php' ) ) : ?>
709
  <tr>
710
  <th><strong><?php _e( 'Take Command!', 'jquery-collapse-o-matic' ) ?></strong></th>
711
- <td><?php printf(__( '%sCollapse Commander%s is an add-on plugin that introduces an advanced management interface to better organize expand elements and simplify expand shortcodes.', 'jquery-collapse-o-matic' ), '<a href="https://plugins.twinpictures.de/premium-plugins/collapse-commander/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-commander&utm_campaign=collapse-o-matic-commander">', '</a>'); ?>
712
  </td>
713
  </tr>
714
  <?php endif; ?>
715
  <tr>
716
  <th><strong><?php _e( 'Level Up!', 'jquery-collapse-o-matic' ) ?></strong></th>
717
- <td><?php printf(__( '%sCollapse-Pro-Matic%s is our premium plugin that offers additional attributes and features for <i>ultimate</i> flexibility, in addition to a very %shigh level of personal support%s.', 'jquery-collapse-o-matic' ), '<a href="https://plugins.twinpictures.de/premium-plugins/collapse-pro-matic/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-pro-matic&utm_campaign=collapse-o-matic-pro">', '</a>', '<a href="https://plugins.twinpictures.de/testimonial/collapse-pro-matic/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-pro-matic&utm_campaign=collapse-o-matic-support">', '</a>'); ?>
718
  </td>
719
  </tr>
720
  </table>
@@ -739,10 +746,10 @@ class WP_Collapse_O_Matic {
739
  <p><?php _e( 'Remove clutter, save space. Display and hide additional content in a SEO friendly way. Wrap any content&mdash;including other shortcodes&mdash;into a lovely jQuery expanding and collapsing element.', 'jquery-collapse-o-matic') ?></p>
740
  <?php /*<p style="padding: 5px; border: 1px dashed #cccc66; background: #EEE;"><strong>Last Chance for 2015 Prices:</strong> <a href="https://plugins.twinpictures.de/premium-plugins/collapse-pro-matic/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-pro-matic&utm_campaign=collapse-pro-year-end">Update to Collapse-Pro-Matic</a> before January 2016 to take advantage of 2015 pricing.</p> */ ?>
741
  <ul>
742
- <li><?php printf( __( '%sDetailed documentation%s, complete with working demonstrations of all shortcode attributes, is available for your instructional enjoyment.', 'jquery-collapse-o-matic'), '<a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/" target="_blank">', '</a>'); ?></li>
743
  <li><?php printf( __( '%sFree Opensource Support%s', 'jquery-collapse-o-matic'), '<a href="https://wordpress.org/support/plugin/jquery-collapse-o-matic" target="_blank">', '</a>'); ?></li>
744
  <li><?php printf( __( 'If this plugin %s, please consider %sreviewing it at WordPress.org%s to help others.', 'jquery-collapse-o-matic'), $like_it, '<a href="https://wordpress.org/support/view/plugin-reviews/jquery-collapse-o-matic" target="_blank">', '</a>' ) ?></li>
745
- <li><a href="https://wordpress.org/plugins/jquery-collapse-o-matic/" target="_blank">WordPress.org</a> | <a href="https://plugins.twinpictures.de/plugins/collapse-o-matic/" target="_blank">Twinpictues Plugin Oven</a></li>
746
  </ul>
747
  </div>
748
  </div>
@@ -757,7 +764,7 @@ class WP_Collapse_O_Matic {
757
  <div class="postbox">
758
  <h3 class="handle"><?php _e( 'Register Collapse Commander', 'jquery-collapse-o-matic') ?></h3>
759
  <div class="inside">
760
- <p><?php printf( __('To receive plugin updates you must register your plugin. Enter your Collapse Commander licence key below. Licence keys may be viewed and manged by logging into %syour account%s.', 'colpromat'), '<a href="https://plugins.twinpictures.de/your-account/" target="_blank">', '</a>'); ?></p>
761
  <form method="post" action="options.php">
762
  <?php
763
  settings_fields( $this->license_group );
@@ -809,7 +816,7 @@ class WP_Collapse_O_Matic {
809
  <div class="handlediv" title="<?php _e( 'Click to toggle', 'jquery-collapse-o-matic' ) ?>"><br/></div>
810
  <h3 class="hndle">Collapse Commander</h3>
811
  <div class="inside">
812
- <p>A brief and not-exactly-sober overview of <a href="https://plugins.twinpictures.de/premium-plugins/collapse-commander/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-commander&utm_campaign=collapse-o-matic-commander">Collapse Commander</a>, a new add-on plugin for Collapse-O-Matic and Collapse-Pro-Matic that adds and advanded expand shortcode management system.</p>
813
  <iframe width="100%" height="300" src="//www.youtube.com/embed/w9X4nXpAEfo" frameborder="0" allowfullscreen></iframe>
814
  </div>
815
  </div>
2
  /*
3
  Plugin Name: Collapse-O-Matic
4
  Text Domain: jquery-collapse-o-matic
5
+ Plugin URI: https://pluginoven.com/plugins/collapse-o-matic/
6
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
7
+ Version: 1.7.14
8
  Author: twinpictures, baden03
9
  Author URI: https://twinpictures.de/
10
  License: GPL2
17
  */
18
 
19
  if(!defined('PLUGIN_OVEN_URL')){
20
+ define( 'PLUGIN_OVEN_URL', 'https://pluginoven.com/' );
21
  }
22
  if(!defined('PLUGIN_OVEN_CC')){
23
  define( 'PLUGIN_OVEN_CC', 'Collapse Commander' );
29
  * Current version
30
  * @var string
31
  */
32
+ var $version = '1.7.14';
33
 
34
  /**
35
  * Used as prefix for options entry
185
  //find a random number, if no id is assigned
186
  $ran = uniqid();
187
  extract(shortcode_atts(array(
188
+ 'title' => '',
189
+ 'cid' => $options['cid'],
190
+ 'template_id' => '',
191
+ 'swaptitle' => '',
192
+ 'alt' => '',
193
+ 'swapalt' => '',
194
+ 'notitle' => $options['notitle'],
195
+ 'id' => 'id'.$ran,
196
+ 'tag' => $options['tag'],
197
+ 'trigclass' => $options['trigclass'],
198
+ 'targtag' => $options['targtag'],
199
+ 'targclass' => $options['targclass'],
200
+ 'targpos' => '',
201
+ 'trigpos' => 'above',
202
+ 'rel' => '',
203
+ 'group' => '',
204
+ 'togglegroup' => '',
205
+ 'expanded' => '',
206
+ 'excerpt' => '',
207
+ 'swapexcerpt' => false,
208
+ 'excerptpos' => 'below-trigger',
209
+ 'excerpttag' => 'div',
210
+ 'excerptclass' => '',
211
+ 'findme' => '',
212
+ 'scrollonclose' => '',
213
+ 'startwrap' => '',
214
+ 'endwrap' => '',
215
+ 'elwraptag' => '',
216
+ 'elwrapclass' => '',
217
+ 'filter' => $options['filter_content'],
218
+ 'tabindex' => $options['tabindex'],
219
+ 'animation_effect' => '',
220
+ 'duration' => '',
221
+ ), $atts, 'expand'));
222
 
223
  //collapse commander
224
  if( !empty($cid) && is_plugin_active( 'collapse-commander/collapse-commander.php') ){
238
  }
239
  }
240
  wp_reset_postdata();
241
+ }
242
 
243
+ if(!empty($triggertext)){
244
+ $title = $triggertext;
245
+ }
246
+ if(!empty($highlander) && !empty($rel)){
247
+ $rel .= '-highlander';
 
248
  }
249
 
250
  //content filtering
256
  $content = str_replace( ']]>', ']]&gt;', $content );
257
  }
258
 
259
+ if( !empty($cid) && get_edit_post_link($cid) ){
260
+ $content .= '<div class="com_edit_link"><a class="post-edit-link" href="'.get_edit_post_link($cid).'">'.__('Edit').'</a></div>';
261
+ }
262
+
263
+ //id does not allow spaces
264
+ $id = preg_replace('/\s+/', '_', $id);
265
+
266
  $ewo = '';
267
  $ewc = '';
268
 
287
  if(empty($targtag)){
288
  $targtag = 'div';
289
  }
290
+
291
+ if(!empty($elwraptag)){
292
  $ewclass = '';
293
  if($elwrapclass){
294
  $ewclass = 'class="'.$elwrapclass.'"';
298
  }
299
 
300
  $eDiv = '';
301
+
302
  if($content){
303
  $inline_class = '';
304
  $collapse_class = 'collapseomatic_content ';
308
  }
309
  $eDiv = '<'.$targtag.' id="target-'.$id.'" class="'.$collapse_class.$inline_class.$targclass.'">'.$content.'</'.$targtag.'>';
310
  }
 
311
  if($excerpt){
312
  $excerpt = str_replace($placeholder_arr, $swapout_arr, $excerpt);
313
  $excerpt = do_shortcode($excerpt);
539
  <tr>
540
  <th><?php _e( 'CID Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
541
  <td><label><input type="text" id="<?php echo $this->options_name ?>[cid]" name="<?php echo $this->options_name ?>[cid]" value="<?php echo $options['cid']; ?>" />
542
+ <br /><span class="description"><?php printf( __('Default %sCollapse Commander%s ID', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/premium-plugins/collapse-commander/" target="_blank">', '</a>'); ?></span></label>
543
  </td>
544
  </tr>
545
  <?php else: ?>
546
  <tr>
547
  <th><?php _e( 'Collapse Management', 'colpromat' ) ?></th>
548
+ <td><?php printf(__( '%sCollapse Commander%s is an add-on plugin that introduces an advanced management interface to better organize expand elements and simplify expand shortcodes.', 'colpromat' ), '<a href="https://pluginoven.com/premium-plugins/collapse-commander/">', '</a>'); ?>
549
  </td>
550
  </tr>
551
  <?php endif; ?>
553
  <tr>
554
  <th><?php _e( 'Tag Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
555
  <td><label><input type="text" id="<?php echo $this->options_name ?>[tag]" name="<?php echo $this->options_name ?>[tag]" value="<?php echo $options['tag']; ?>" />
556
+ <br /><span class="description"><?php printf(__('HTML tag use to wrap the trigger text. See %sTag Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/plugins/collapse-o-matic/documentation/shortcode/#tag-attribute" target="_blank">', '</a>'); ?></span></label>
557
  </td>
558
  </tr>
559
 
560
  <tr>
561
  <th><?php _e( 'Trigclass Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
562
  <td><label><input type="text" id="<?php echo $this->options_name ?>[trigclass]" name="<?php echo $this->options_name ?>[trigclass]" value="<?php echo $options['trigclass']; ?>" />
563
+ <br /><span class="description"><?php printf(__('Default class assigned to the trigger element. See %sTrigclass Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/plugins/collapse-o-matic/documentation/shortcode/#trigclass-attribute" target="_blank">', '</a>'); ?></span></label>
564
  </td>
565
  </tr>
566
 
567
  <tr>
568
  <th><?php _e( 'Tabindex Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
569
  <td><label><input type="text" id="<?php echo $this->options_name ?>[tabindex]" name="<?php echo $this->options_name ?>[tabindex]" value="<?php echo $options['tabindex']; ?>" />
570
+ <br /><span class="description"><?php printf(__('Default tabindex value to be assigned to the trigger element. See %sTabindex Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/plugins/collapse-o-matic/documentation/shortcode/#tabindex-attribute" target="_blank">', '</a>'); ?></span></label>
571
  </td>
572
  </tr>
573
 
574
  <tr>
575
  <th><?php _e( 'Targtag Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
576
  <td><label><input type="text" id="<?php echo $this->options_name ?>[targtag]" name="<?php echo $this->options_name ?>[targtag]" value="<?php echo $options['targtag']; ?>" />
577
+ <br /><span class="description"><?php printf(__('HTML tag use for the target element. See %sTargtag Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/plugins/collapse-o-matic/documentation/shortcode/#targtag-attribute" target="_blank">', '</a>'); ?></span></label>
578
  </td>
579
  </tr>
580
 
581
  <tr>
582
  <th><?php _e( 'Targclass Attribute', 'jquery-collapse-o-matic' ) ?>:</th>
583
  <td><label><input type="text" id="<?php echo $this->options_name ?>[targclass]" name="<?php echo $this->options_name ?>[targclass]" value="<?php echo $options['targclass']; ?>" />
584
+ <br /><span class="description"><?php printf(__('Default class assigned to the target element. See %sTargclass Attribute%s in the documentation for more info.', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/plugins/collapse-o-matic/documentation/shortcode/#targclass-attribute" target="_blank">', '</a>'); ?></span></label>
585
  </td>
586
  </tr>
587
 
715
  <?php if( !is_plugin_active( 'collapse-commander/collapse-commander.php' ) ) : ?>
716
  <tr>
717
  <th><strong><?php _e( 'Take Command!', 'jquery-collapse-o-matic' ) ?></strong></th>
718
+ <td><?php printf(__( '%sCollapse Commander%s is an add-on plugin that introduces an advanced management interface to better organize expand elements and simplify expand shortcodes.', 'jquery-collapse-o-matic' ), '<a href="https://pluginoven.com/premium-plugins/collapse-commander/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-commander&utm_campaign=collapse-o-matic-commander">', '</a>'); ?>
719
  </td>
720
  </tr>
721
  <?php endif; ?>
722
  <tr>
723
  <th><strong><?php _e( 'Level Up!', 'jquery-collapse-o-matic' ) ?></strong></th>
724
+ <td><?php printf(__( '%sCollapse-Pro-Matic%s is our premium plugin that offers additional attributes and features for <i>ultimate</i> flexibility, in addition to a very %shigh level of personal support%s.', 'jquery-collapse-o-matic' ), '<a href="https://pluginoven.com/premium-plugins/collapse-pro-matic/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-pro-matic&utm_campaign=collapse-o-matic-pro">', '</a>', '<a href="https://pluginoven.com/premium-plugins/collapse-pro-matic/testimonials/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-pro-matic&utm_campaign=collapse-o-matic-support">', '</a>'); ?>
725
  </td>
726
  </tr>
727
  </table>
746
  <p><?php _e( 'Remove clutter, save space. Display and hide additional content in a SEO friendly way. Wrap any content&mdash;including other shortcodes&mdash;into a lovely jQuery expanding and collapsing element.', 'jquery-collapse-o-matic') ?></p>
747
  <?php /*<p style="padding: 5px; border: 1px dashed #cccc66; background: #EEE;"><strong>Last Chance for 2015 Prices:</strong> <a href="https://plugins.twinpictures.de/premium-plugins/collapse-pro-matic/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-pro-matic&utm_campaign=collapse-pro-year-end">Update to Collapse-Pro-Matic</a> before January 2016 to take advantage of 2015 pricing.</p> */ ?>
748
  <ul>
749
+ <li><?php printf( __( '%sDetailed documentation%s, complete with working demonstrations of all shortcode attributes, is available for your instructional enjoyment.', 'jquery-collapse-o-matic'), '<a href="https://pluginoven.com/plugins/collapse-o-matic/documentation/" target="_blank">', '</a>'); ?></li>
750
  <li><?php printf( __( '%sFree Opensource Support%s', 'jquery-collapse-o-matic'), '<a href="https://wordpress.org/support/plugin/jquery-collapse-o-matic" target="_blank">', '</a>'); ?></li>
751
  <li><?php printf( __( 'If this plugin %s, please consider %sreviewing it at WordPress.org%s to help others.', 'jquery-collapse-o-matic'), $like_it, '<a href="https://wordpress.org/support/view/plugin-reviews/jquery-collapse-o-matic" target="_blank">', '</a>' ) ?></li>
752
+ <li><a href="https://wordpress.org/plugins/jquery-collapse-o-matic/" target="_blank">WordPress.org</a> | <a href="https://pluginoven.com/plugins/collapse-o-matic/" target="_blank">Twinpictues Plugin Oven</a></li>
753
  </ul>
754
  </div>
755
  </div>
764
  <div class="postbox">
765
  <h3 class="handle"><?php _e( 'Register Collapse Commander', 'jquery-collapse-o-matic') ?></h3>
766
  <div class="inside">
767
+ <p><?php printf( __('To receive plugin updates you must register your plugin. Enter your Collapse Commander licence key below. Licence keys may be viewed and manged by logging into %syour account%s.', 'colpromat'), '<a href="https://pluginoven.com/my-account/" target="_blank">', '</a>'); ?></p>
768
  <form method="post" action="options.php">
769
  <?php
770
  settings_fields( $this->license_group );
816
  <div class="handlediv" title="<?php _e( 'Click to toggle', 'jquery-collapse-o-matic' ) ?>"><br/></div>
817
  <h3 class="hndle">Collapse Commander</h3>
818
  <div class="inside">
819
+ <p>A brief and not-exactly-sober overview of <a href="https://pluginoven.com/premium-plugins/collapse-commander/?utm_source=collapse-o-matic&utm_medium=plugin-settings-page&utm_content=collapse-commander&utm_campaign=collapse-o-matic-commander">Collapse Commander</a>, a new add-on plugin for Collapse-O-Matic and Collapse-Pro-Matic that adds and advanded expand shortcode management system.</p>
820
  <iframe width="100%" height="300" src="//www.youtube.com/embed/w9X4nXpAEfo" frameborder="0" allowfullscreen></iframe>
821
  </div>
822
  </div>
dark_style.css CHANGED
@@ -8,7 +8,7 @@
8
  outline: 0;
9
  }
10
  .arrowright {
11
- background-position: top right;
12
  padding: 0 16px 10px 0;
13
  }
14
  .noarrow {
8
  outline: 0;
9
  }
10
  .arrowright {
11
+ background-position: right top;
12
  padding: 0 16px 10px 0;
13
  }
14
  .noarrow {
light_style.css CHANGED
@@ -8,7 +8,7 @@
8
  outline: 0;
9
  }
10
  .arrowright {
11
- background-position: top right;
12
  padding: 0 16px 10px 0;
13
  }
14
  .noarrow {
8
  outline: 0;
9
  }
10
  .arrowright {
11
+ background-position: right top;
12
  padding: 0 16px 10px 0;
13
  }
14
  .noarrow {
readme.txt CHANGED
@@ -4,9 +4,9 @@ Contributors: twinpictures, baden03
4
  Donate link: https://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: 4.7
7
- Tested up to: 5.6.0
8
- Stable tag: 1.7.13
9
- Requires PHP: 7.0
10
  License: GPLv2 or later
11
  License URI: https://www.gnu.org/licenses/gpl-2.0.html
12
 
@@ -14,7 +14,7 @@ Remove clutter and save space by placing content inside an expanding/collapsing
14
 
15
  == Description ==
16
 
17
- Collapse-O-Matic adds an `[expand]` shortcode that will wrap any content, including other shortcodes, into an accordion expanding and collapsing element. A <a href='https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options and attribute demos</a> are available, as well as <a href='https://wordpress.org/support/plugin/jquery-collapse-o-matic'>free community</a> support.
18
 
19
  == Installation ==
20
 
@@ -38,7 +38,7 @@ Yes, yes... <a href='https://www.facebook.com/twinpictures'>Twinpictures is on F
38
  Ah yes! <a href='https://twitter.com/#!/twinpictures'>@Twinpictures</a> does the twitter tweeting around here.
39
 
40
  = How does one use the shortcode, exactly? =
41
- A <a href='https://plugins.twinpictures.de/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options</a> has been provided to answer this exact question.
42
 
43
  = Is Galato the same as Ice Cream? =
44
  No. Not even close.
@@ -51,6 +51,11 @@ No. Not even close.
51
 
52
  == Changelog ==
53
 
 
 
 
 
 
54
  = 1.7.13 =
55
  * corrected typos
56
  * cleaned up code
@@ -385,9 +390,4 @@ Fixed auto-expand of urls with id-anchors
385
  * The plug-in came to be.
386
 
387
  == Upgrade Notice ==
388
- * corrected typos
389
- * cleaned up code
390
- * added togglegroup highlander grouping
391
- * fixed issue of rel or group values that consist only of numbers
392
- * findme now supports auto, trigger, target and numeric values
393
- * removed excerpt the_content filtering, added added filters for excerpt and swapexcerpt
4
  Donate link: https://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: 4.7
7
+ Tested up to: 5.9-alpha-51872
8
+ Stable tag: 1.7.14
9
+ Requires PHP: 7.2
10
  License: GPLv2 or later
11
  License URI: https://www.gnu.org/licenses/gpl-2.0.html
12
 
14
 
15
  == Description ==
16
 
17
+ Collapse-O-Matic adds an `[expand]` shortcode that will wrap any content, including other shortcodes, into an accordion expanding and collapsing element. A <a href='https://pluginoven.com/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options and attribute demos</a> are available, as well as <a href='https://wordpress.org/support/plugin/jquery-collapse-o-matic'>free community</a> support.
18
 
19
  == Installation ==
20
 
38
  Ah yes! <a href='https://twitter.com/#!/twinpictures'>@Twinpictures</a> does the twitter tweeting around here.
39
 
40
  = How does one use the shortcode, exactly? =
41
+ A <a href='https://pluginoven.com/plugins/collapse-o-matic/documentation/'>complete listing of shortcode options</a> has been provided to answer this exact question.
42
 
43
  = Is Galato the same as Ice Cream? =
44
  No. Not even close.
51
 
52
  == Changelog ==
53
 
54
+ = 1.7.14 =
55
+ * tried to fixed spacing issue by forcing elwraptag as a div, but this will effect inline expands. Will need to add elwraptag as an option.
56
+ * fully tested with WordPress 5.8.1
57
+ * migrated plugins home over to pluginoven.com
58
+
59
  = 1.7.13 =
60
  * corrected typos
61
  * cleaned up code
390
  * The plug-in came to be.
391
 
392
  == Upgrade Notice ==
393
+ * removed outdated extract method for shortcode atts