Shortcodes Ultimate - Version 3.2.0

Version Description

Upgrade normally via your Wordpress admin -> Plugins panel.

Download this release

Release Info

Developer gn_themes
Plugin Icon 128x128 Shortcodes Ultimate
Version 3.2.0
Comparing to
See all releases

Code changes from version 3.1.2 to 3.2.0

Files changed (16) hide show
  1. css/generator.css +13 -0
  2. css/style.css +43 -0
  3. images/demo/tweets.png +0 -0
  4. images/generator/colorpicker.png +0 -0
  5. images/generator/settings.png +0 -0
  6. images/generator/support.png +0 -0
  7. images/tweet-style-1.png +0 -0
  8. images/tweet-style-2.png +0 -0
  9. js/generator.js +3 -2
  10. languages/shortcodes-ultimate-ru_RU.mo +0 -0
  11. languages/shortcodes-ultimate-ru_RU.po +84 -15
  12. lib/available.php +47 -1
  13. lib/shortcodes.php +22 -0
  14. lib/twitter.php +107 -0
  15. readme.txt +11 -8
  16. shortcodes-ultimate.php +12 -5
css/generator.css CHANGED
@@ -18,10 +18,23 @@
18
  border: 1px dashed #ccc;
19
  }
20
 
 
 
 
 
 
21
  #su-generator-select {
22
  padding: 5px;
23
  }
24
 
 
 
 
 
 
 
 
 
25
  #su-generator-settings label {
26
  float: left;
27
  display: block;
18
  border: 1px dashed #ccc;
19
  }
20
 
21
+ #su-generator-header {
22
+ height: 30px;
23
+ margin-bottom: 20px;
24
+ }
25
+
26
  #su-generator-select {
27
  padding: 5px;
28
  }
29
 
30
+ #su-generator-tools {
31
+ float: right;
32
+ padding-top: 5px;
33
+ }
34
+ #su-generator-tools a {
35
+ margin-left: 10px;
36
+ }
37
+
38
  #su-generator-settings label {
39
  float: left;
40
  display: block;
css/style.css CHANGED
@@ -498,4 +498,47 @@
498
  border-top: 1px solid #8DC3EB;
499
  border-bottom: 1px solid #8DC3EB;
500
  background: #D9EEFF;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
501
  }
498
  border-top: 1px solid #8DC3EB;
499
  border-bottom: 1px solid #8DC3EB;
500
  background: #D9EEFF;
501
+ }
502
+
503
+ /* Tweets */
504
+ .su-tweets {
505
+ margin: 0 0 1.5em 0;
506
+ }
507
+ .su-tweet {}
508
+ .su-tweet-time {
509
+ display: block;
510
+ margin-top: 0.3em;
511
+ font-size: 0.9em;
512
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
513
+ filter: alpha(opacity=50);
514
+ -moz-opacity: 0.5;
515
+ -khtml-opacity: 0.5;
516
+ opacity: 0.5;
517
+ }
518
+ .su-tweets-style-1 .su-tweet {
519
+ margin: 0 0 0.7em 0;
520
+ padding: 0 0 0.7em 30px;
521
+ border-bottom: 1px dotted #ccc;
522
+ background: 0 2px url(../images/tweet-style-1.png) no-repeat;
523
+ }
524
+ .su-tweets-style-1 .su-tweet-last {
525
+ margin: 0;
526
+ padding: 0 0 0.7em 30px;
527
+ border-bottom: none;
528
+ }
529
+ .su-tweets-style-2 .su-tweet {
530
+ margin: 0 0 0.7em 0;
531
+ padding: 0.7em 0.7em 0.7em 34px;
532
+ border: 1px solid #555;
533
+ background: #333 0.4em 0.8em url(../images/tweet-style-2.png) no-repeat;
534
+ color: #fff;
535
+ border-radius: 5px;
536
+ -moz-border-radius: 5px;
537
+ -webkit-border-radius: 5px;
538
+ }
539
+ .su-tweets-style-2 .su-tweet:hover {
540
+ background: #444 0.4em 0.8em url(../images/tweet-style-2.png) no-repeat;
541
+ }
542
+ .su-tweets-style-2 .su-tweet a {
543
+ color: #fff;
544
  }
images/demo/tweets.png ADDED
Binary file
images/generator/colorpicker.png ADDED
Binary file
images/generator/settings.png ADDED
Binary file
images/generator/support.png ADDED
Binary file
images/tweet-style-1.png ADDED
Binary file
images/tweet-style-2.png ADDED
Binary file
js/generator.js CHANGED
@@ -12,7 +12,8 @@ jQuery(document).ready(function($) {
12
  // Insert shortcode
13
  $('#su-generator-insert').live('click', function() {
14
  var queried_shortcode = $('#su-generator-select').find(':selected').val();
15
- $('#su-generator-result').val('[' + queried_shortcode);
 
16
  $('#su-generator-settings .su-generator-attr').each(function() {
17
  if ( $(this).val() !== '' ) {
18
  $('#su-generator-result').val( $('#su-generator-result').val() + ' ' + $(this).attr('name') + '="' + $(this).val() + '"' );
@@ -22,7 +23,7 @@ jQuery(document).ready(function($) {
22
 
23
  // wrap shortcode
24
  if ( $('#su-generator-content').val() != 'false' ) {
25
- $('#su-generator-result').val($('#su-generator-result').val() + $('#su-generator-content').val() + '[/' + queried_shortcode + ']');
26
  }
27
  window.send_to_editor(jQuery('#su-generator-result').val());
28
  return false;
12
  // Insert shortcode
13
  $('#su-generator-insert').live('click', function() {
14
  var queried_shortcode = $('#su-generator-select').find(':selected').val();
15
+ var su_compatibility_mode_prefix = $('#su-compatibility-mode-prefix').val();
16
+ $('#su-generator-result').val('[' + su_compatibility_mode_prefix + queried_shortcode);
17
  $('#su-generator-settings .su-generator-attr').each(function() {
18
  if ( $(this).val() !== '' ) {
19
  $('#su-generator-result').val( $('#su-generator-result').val() + ' ' + $(this).attr('name') + '="' + $(this).val() + '"' );
23
 
24
  // wrap shortcode
25
  if ( $('#su-generator-content').val() != 'false' ) {
26
+ $('#su-generator-result').val($('#su-generator-result').val() + $('#su-generator-content').val() + '[/' + su_compatibility_mode_prefix + queried_shortcode + ']');
27
  }
28
  window.send_to_editor(jQuery('#su-generator-result').val());
29
  return false;
languages/shortcodes-ultimate-ru_RU.mo CHANGED
Binary file
languages/shortcodes-ultimate-ru_RU.po CHANGED
@@ -2,8 +2,8 @@ msgid ""
2
  msgstr ""
3
  "Project-Id-Version: gn_themes\n"
4
  "Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2011-08-09 21:58+0300\n"
6
- "PO-Revision-Date: 2011-08-09 21:58+0300\n"
7
  "Last-Translator: Vladimir Anokhin <ano.vladimir@gmail.com>\n"
8
  "Language-Team: \n"
9
  "MIME-Version: 1.0\n"
@@ -14,42 +14,52 @@ msgstr ""
14
  "X-Poedit-SourceCharset: utf-8\n"
15
  "X-Poedit-SearchPath-0: .\n"
16
 
17
- #: shortcodes-ultimate.php:179
18
  #: lib/admin.php:26
19
  msgid "Shortcodes Ultimate"
20
  msgstr "Шорткоды"
21
 
22
- #: shortcodes-ultimate.php:179
23
  msgid "Vladimir Anokhin"
24
  msgstr "Владимир Анохин"
25
 
26
- #: shortcodes-ultimate.php:179
27
  msgid "Provides support for many easy to use shortcodes"
28
  msgstr "Предоставляет поддержку множества полезных шорткодов"
29
 
30
- #: shortcodes-ultimate.php:265
 
31
  #: lib/admin.php:35
32
  msgid "Settings"
33
  msgstr "Настройки"
34
 
35
- #: shortcodes-ultimate.php:278
36
  #: lib/admin.php:62
37
  msgid "Settings saved"
38
  msgstr "Настройки сохранены"
39
 
40
- #: shortcodes-ultimate.php:283
41
  #: lib/admin.php:123
42
  msgid "Custom CSS saved"
43
  msgstr "Произвольные стили сохранены"
44
 
45
- #: shortcodes-ultimate.php:291
46
  msgid "Insert shortcode"
47
  msgstr "Вставка шорткода"
48
 
49
- #: shortcodes-ultimate.php:305
50
  msgid "Select shortcode"
51
  msgstr "Выберите шорткод"
52
 
 
 
 
 
 
 
 
 
 
53
  #: lib/admin.php:7
54
  #: lib/admin.php:37
55
  msgid "Shortcodes"
@@ -81,10 +91,6 @@ msgstr "Инструкции"
81
  msgid "FREE Support"
82
  msgstr "БЕСПЛАТНАЯ поддержка"
83
 
84
- #: lib/admin.php:44
85
- msgid "Support forum"
86
- msgstr "Форум поддержки"
87
-
88
  #: lib/admin.php:45
89
  msgid "Twitter"
90
  msgstr "Твиттер разработчика"
@@ -509,10 +515,13 @@ msgid "Parent page ID"
509
  msgstr "ID родительской страницы"
510
 
511
  #: lib/available.php:521
512
- #: lib/available.php:539
513
  msgid "Page childrens"
514
  msgstr "Потомки страницы"
515
 
 
 
 
 
516
  #: lib/available.php:561
517
  msgid "Column width"
518
  msgstr "Ширина колонки"
@@ -638,6 +647,26 @@ msgstr "Ссылки элементов"
638
  msgid "jCarousel by attached to post images"
639
  msgstr "jCarousel из изображений записи"
640
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
641
  #: lib/generator.php:48
642
  msgid "Content"
643
  msgstr "Содержимое"
@@ -679,6 +708,46 @@ msgstr "Это содержимое только для участников."
679
  msgid "Please login"
680
  msgstr "Пожалуйста войдите"
681
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
682
  #~ msgid "You can define custom styles for each columns set"
683
  #~ msgstr "Вы можете определить особые стили для каждого набора колонок"
684
 
2
  msgstr ""
3
  "Project-Id-Version: gn_themes\n"
4
  "Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2011-08-10 23:34+0300\n"
6
+ "PO-Revision-Date: 2011-08-10 23:35+0300\n"
7
  "Last-Translator: Vladimir Anokhin <ano.vladimir@gmail.com>\n"
8
  "Language-Team: \n"
9
  "MIME-Version: 1.0\n"
14
  "X-Poedit-SourceCharset: utf-8\n"
15
  "X-Poedit-SearchPath-0: .\n"
16
 
17
+ #: shortcodes-ultimate.php:183
18
  #: lib/admin.php:26
19
  msgid "Shortcodes Ultimate"
20
  msgstr "Шорткоды"
21
 
22
+ #: shortcodes-ultimate.php:183
23
  msgid "Vladimir Anokhin"
24
  msgstr "Владимир Анохин"
25
 
26
+ #: shortcodes-ultimate.php:183
27
  msgid "Provides support for many easy to use shortcodes"
28
  msgstr "Предоставляет поддержку множества полезных шорткодов"
29
 
30
+ #: shortcodes-ultimate.php:269
31
+ #: shortcodes-ultimate.php:320
32
  #: lib/admin.php:35
33
  msgid "Settings"
34
  msgstr "Настройки"
35
 
36
+ #: shortcodes-ultimate.php:282
37
  #: lib/admin.php:62
38
  msgid "Settings saved"
39
  msgstr "Настройки сохранены"
40
 
41
+ #: shortcodes-ultimate.php:287
42
  #: lib/admin.php:123
43
  msgid "Custom CSS saved"
44
  msgstr "Произвольные стили сохранены"
45
 
46
+ #: shortcodes-ultimate.php:295
47
  msgid "Insert shortcode"
48
  msgstr "Вставка шорткода"
49
 
50
+ #: shortcodes-ultimate.php:310
51
  msgid "Select shortcode"
52
  msgstr "Выберите шорткод"
53
 
54
+ #: shortcodes-ultimate.php:321
55
+ msgid "Color picker"
56
+ msgstr "Подбор цвета"
57
+
58
+ #: shortcodes-ultimate.php:322
59
+ #: lib/admin.php:44
60
+ msgid "Support forum"
61
+ msgstr "Форум поддержки"
62
+
63
  #: lib/admin.php:7
64
  #: lib/admin.php:37
65
  msgid "Shortcodes"
91
  msgid "FREE Support"
92
  msgstr "БЕСПЛАТНАЯ поддержка"
93
 
 
 
 
 
94
  #: lib/admin.php:45
95
  msgid "Twitter"
96
  msgstr "Твиттер разработчика"
515
  msgstr "ID родительской страницы"
516
 
517
  #: lib/available.php:521
 
518
  msgid "Page childrens"
519
  msgstr "Потомки страницы"
520
 
521
+ #: lib/available.php:539
522
+ msgid "Page siblings"
523
+ msgstr "Братья страницы"
524
+
525
  #: lib/available.php:561
526
  msgid "Column width"
527
  msgstr "Ширина колонки"
647
  msgid "jCarousel by attached to post images"
648
  msgstr "jCarousel из изображений записи"
649
 
650
+ #: lib/available.php:806
651
+ msgid "Twitter username"
652
+ msgstr "Имя пользователя"
653
+
654
+ #: lib/available.php:822
655
+ msgid "Number of tweets to show"
656
+ msgstr "Количество твитов для показа"
657
+
658
+ #: lib/available.php:830
659
+ msgid "Tweets style"
660
+ msgstr "Стиль твитов"
661
+
662
+ #: lib/available.php:838
663
+ msgid "Show relative time"
664
+ msgstr "Показывать время"
665
+
666
+ #: lib/available.php:842
667
+ msgid "Recent tweets"
668
+ msgstr "Последние твиты"
669
+
670
  #: lib/generator.php:48
671
  msgid "Content"
672
  msgstr "Содержимое"
708
  msgid "Please login"
709
  msgstr "Пожалуйста войдите"
710
 
711
+ #: lib/twitter.php:9
712
+ msgid "year"
713
+ msgstr "год"
714
+
715
+ #: lib/twitter.php:10
716
+ msgid "month"
717
+ msgstr "месяц"
718
+
719
+ #: lib/twitter.php:11
720
+ msgid "week"
721
+ msgstr "неделя"
722
+
723
+ #: lib/twitter.php:12
724
+ msgid "day"
725
+ msgstr "день"
726
+
727
+ #: lib/twitter.php:13
728
+ msgid "hour"
729
+ msgstr "час"
730
+
731
+ #: lib/twitter.php:14
732
+ msgid "minute"
733
+ msgstr "минута"
734
+
735
+ #: lib/twitter.php:28
736
+ #: lib/twitter.php:36
737
+ msgid "s"
738
+ msgstr "с"
739
+
740
+ #: lib/twitter.php:73
741
+ msgid "username not specified"
742
+ msgstr "имя пользователя не задано"
743
+
744
+ #: lib/twitter.php:76
745
+ msgid "no public messages"
746
+ msgstr "нет публичных твитов"
747
+
748
+ #~ msgid "Support"
749
+ #~ msgstr "Форум поддержки"
750
+
751
  #~ msgid "You can define custom styles for each columns set"
752
  #~ msgstr "Вы можете определить особые стили для каждого набора колонок"
753
 
lib/available.php CHANGED
@@ -794,7 +794,53 @@
794
  ),
795
  'usage' => '[jcarousel]<br/>[jcarousel width="600" height="130" link="file" items="5" bg="#EEEEEE" speed="400"]',
796
  'desc' => __( 'jCarousel by attached to post images', 'shortcodes-ultimate' )
797
- )
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
798
  );
799
 
800
  if ( $shortcode )
794
  ),
795
  'usage' => '[jcarousel]<br/>[jcarousel width="600" height="130" link="file" items="5" bg="#EEEEEE" speed="400"]',
796
  'desc' => __( 'jCarousel by attached to post images', 'shortcodes-ultimate' )
797
+ ),
798
+ # tweets
799
+ 'tweets' => array(
800
+ 'name' => 'Tweets',
801
+ 'type' => 'single',
802
+ 'atts' => array(
803
+ 'username' => array(
804
+ 'values' => array( ),
805
+ 'default' => 'twitter',
806
+ 'desc' => __( 'Twitter username', 'shortcodes-ultimate' )
807
+ ),
808
+ 'limit' => array(
809
+ 'values' => array(
810
+ '1',
811
+ '2',
812
+ '3',
813
+ '4',
814
+ '5',
815
+ '6',
816
+ '7',
817
+ '8',
818
+ '9',
819
+ '10'
820
+ ),
821
+ 'default' => '3',
822
+ 'desc' => __( 'Number of tweets to show', 'shortcodes-ultimate' )
823
+ ),
824
+ 'style' => array(
825
+ 'values' => array(
826
+ '1',
827
+ '2'
828
+ ),
829
+ 'default' => '1',
830
+ 'desc' => __( 'Tweets style', 'shortcodes-ultimate' )
831
+ ),
832
+ 'show_time' => array(
833
+ 'values' => array(
834
+ '0',
835
+ '1'
836
+ ),
837
+ 'default' => '1',
838
+ 'desc' => __( 'Show relative time', 'shortcodes-ultimate' )
839
+ )
840
+ ),
841
+ 'usage' => '[tweets username="gn_themes" limit="3" style="1" format="teaser"]',
842
+ 'desc' => __( 'Recent tweets', 'shortcodes-ultimate' )
843
+ ),
844
  );
845
 
846
  if ( $shortcode )
lib/shortcodes.php CHANGED
@@ -802,4 +802,26 @@
802
  return $return;
803
  }
804
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
805
  ?>
802
  return $return;
803
  }
804
 
805
+ /**
806
+ * Shortcode: tweets
807
+ *
808
+ * @param array $atts Shortcode attributes
809
+ * @param string $content
810
+ * @return string Output html
811
+ */
812
+ function su_tweets_shortcode( $atts, $content = null ) {
813
+ extract( shortcode_atts( array(
814
+ 'username' => 'twitter',
815
+ 'limit' => 3,
816
+ 'style' => 1,
817
+ 'show_time' => 1
818
+ ), $atts ) );
819
+
820
+ $return = '<div class="su-tweets su-tweets-style-' . $style . '">';
821
+ $return .= su_get_tweets( $username, $limit, $show_time );
822
+ $return .= '</div>';
823
+
824
+ return $return;
825
+ }
826
+
827
  ?>
lib/twitter.php ADDED
@@ -0,0 +1,107 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /**
4
+ * Tweet relative time (like: 5 seconds ago)
5
+ */
6
+ function su_relative_time( $original, $do_more = 0 ) {
7
+ // array of time period chunks
8
+ $chunks = array(
9
+ array( 60 * 60 * 24 * 365, __( 'year', 'shortcodes-ultimate' ) ),
10
+ array( 60 * 60 * 24 * 30, __( 'month', 'shortcodes-ultimate' ) ),
11
+ array( 60 * 60 * 24 * 7, __( 'week', 'shortcodes-ultimate' ) ),
12
+ array( 60 * 60 * 24, __( 'day', 'shortcodes-ultimate' ) ),
13
+ array( 60 * 60, __( 'hour', 'shortcodes-ultimate' ) ),
14
+ array( 60, __( 'minute', 'shortcodes-ultimate' ) ),
15
+ );
16
+
17
+ $today = time();
18
+ $since = $today - $original;
19
+
20
+ for ( $i = 0, $j = count( $chunks ); $i < $j; $i++ ) {
21
+ $seconds = $chunks[$i][0];
22
+ $name = $chunks[$i][1];
23
+
24
+ if ( ($count = floor( $since / $seconds )) != 0 )
25
+ break;
26
+ }
27
+
28
+ $return = ($count == 1) ? '1 ' . $name : "$count {$name}" . __( 's', 'shortcodes-ultimate' );
29
+
30
+ if ( $i + 1 < $j ) {
31
+ $seconds2 = $chunks[$i + 1][0];
32
+ $name2 = $chunks[$i + 1][1];
33
+
34
+ // add second item if it's greater than 0
35
+ if ( (($count2 = floor( ($since - ($seconds * $count)) / $seconds2 )) != 0) && $do_more )
36
+ $return .= ( $count2 == 1) ? ', 1 ' . $name2 : ", $count2 {$name2}" . __( 's', 'shortcodes-ultimate' );
37
+ }
38
+ return $return;
39
+ }
40
+
41
+ define( 'MAGPIE_CACHE_ON', 1 ); //2.7 Cache Bug
42
+ define( 'MAGPIE_CACHE_AGE', 900 );
43
+ define( 'MAGPIE_INPUT_ENCODING', 'UTF-8' );
44
+ define( 'MAGPIE_OUTPUT_ENCODING', 'UTF-8' );
45
+
46
+ /**
47
+ * Add hyperlinks to tweets
48
+ */
49
+ function su_add_hyperlinks( $text ) {
50
+ // Props to Allen Shaw & webmancers.com
51
+ // match protocol://address/path/file.extension?some=variable&another=asf%
52
+ $text = preg_replace( '/\b([a-zA-Z]+:\/\/[\w_.\-]+\.[a-zA-Z]{2,6}[\/\w\-~.?=&%#+$*!]*)\b/i', "<a href=\"$1\" class=\"twitter-link\">$1</a>", $text );
53
+ // match www.something.domain/path/file.extension?some=variable&another=asf%
54
+ $text = preg_replace( '/\b(?<!:\/\/)(www\.[\w_.\-]+\.[a-zA-Z]{2,6}[\/\w\-~.?=&%#+$*!]*)\b/i', "<a href=\"http://$1\" class=\"twitter-link\">$1</a>", $text );
55
+
56
+ // match name@address
57
+ $text = preg_replace( "/\b([a-zA-Z][a-zA-Z0-9\_\.\-]*[a-zA-Z]*\@[a-zA-Z][a-zA-Z0-9\_\.\-]*[a-zA-Z]{2,6})\b/i", "<a href=\"mailto://$1\" class=\"twitter-link\">$1</a>", $text );
58
+ //mach #trendingtopics. Props to Michael Voigt
59
+ $text = preg_replace( '/([\.|\,|\:|\¡|\¿|\>|\{|\(]?)#{1}(\w*)([\.|\,|\:|\!|\?|\>|\}|\)]?)\s/i', "$1<a href=\"http://twitter.com/#search?q=$2\" class=\"twitter-link\">#$2</a>$3 ", $text );
60
+ return $text;
61
+ }
62
+
63
+ /**
64
+ * Get tweets by username
65
+ */
66
+ function su_get_tweets( $username, $limit, $show_time ) {
67
+
68
+ include_once( ABSPATH . WPINC . '/rss.php' );
69
+
70
+ $messages = fetch_rss( 'http://twitter.com/statuses/user_timeline/' . $username . '.rss' );
71
+
72
+ if ( $username == '' ) {
73
+ $return = '<p class="su-error"><strong>Tweets:</strong> ' . __( 'username not specified', 'shortcodes-ultimate' ) . '&hellip;</p>';
74
+ } else {
75
+ if ( empty( $messages->items ) ) {
76
+ $return = '<p class="su-error"><strong>Tweets:</strong> ' . __( 'no public messages', 'shortcodes-ultimate' ) . '&hellip;</p>';
77
+ } else {
78
+ $i = 0;
79
+
80
+ foreach ( $messages->items as $message ) {
81
+ $msg = substr( strstr( $message['description'], ': ' ), 2, strlen( $message['description'] ) ) . " ";
82
+ if ( $encode_utf8 )
83
+ $msg = utf8_encode( $msg );
84
+ $link = $message['link'];
85
+ $time = $message['pubdate'];
86
+
87
+ $relative_time = ( $show_time ) ? '<span class="su-tweet-time">' . su_relative_time( strtotime( $time ) ) . '</span>' : '';
88
+
89
+ $last_tweet_class = ( $i >= ( $limit - 1 ) ) ? ' su-tweet-last' : '';
90
+
91
+ $return .= '<div class="su-tweet' . $last_tweet_class . '">';
92
+ $return .= '<a href="http://twitter.com/' . $username . '" class="su-tweet-username">@' . $username . '</a>: ';
93
+ $return .= su_add_hyperlinks( $msg );
94
+ $return .= $relative_time;
95
+ $return .= '</div>';
96
+
97
+ $i++;
98
+ if ( $i >= $limit )
99
+ break;
100
+ }
101
+ }
102
+ }
103
+
104
+ return $return;
105
+ }
106
+
107
+ ?>
readme.txt CHANGED
@@ -4,21 +4,24 @@ Donate link: http://ilovecode.ru/donate/
4
  Tags: shortcode, shortcodes, short code, shortcodes, tab, tabs, button, buttons, jquery, box, boxes, toggle, spoiler, column, columns, services, service, pullquote, list, lists, frame, images, image, links, fancy, fancy link, fancy links, fancy buttons, jquery tabs, accordeon, slider, nivo, nivo slider, plugin, admin, photoshop, gallery, bloginfo, list pages, sub pages, navigation, siblings pages, children pages, permalink, permalinks, feed, document, member, members, documents, jcarousel, rss
5
  Requires at least: 3.0
6
  Tested up to: 3.2.9
7
- Stable tag: 3.1.2
8
 
9
  Provides support for multiple useful shortcodes
10
 
11
 
12
  == Description ==
13
 
14
- With this plugin you can easily add buttons, dividers, spacers, boxes, notes and much more. See screenshots for more information.
15
 
16
- = New in version 3 =
17
- * Long-awaited button for WYSIWIG editor (search it near Upload/Insert buttons)
18
- * Insert shortcode button for QuickPress (at dashboard home)
19
- * New shortcode: private (private notes for editors)
20
- * Patched and secure timthumb.php
21
- * Spanish translation
 
 
 
22
 
23
  = Got a bug? =
24
  * Forum - http://wordpress.org/tags/shortcodes-ultimate?forum_id=10
4
  Tags: shortcode, shortcodes, short code, shortcodes, tab, tabs, button, buttons, jquery, box, boxes, toggle, spoiler, column, columns, services, service, pullquote, list, lists, frame, images, image, links, fancy, fancy link, fancy links, fancy buttons, jquery tabs, accordeon, slider, nivo, nivo slider, plugin, admin, photoshop, gallery, bloginfo, list pages, sub pages, navigation, siblings pages, children pages, permalink, permalinks, feed, document, member, members, documents, jcarousel, rss
5
  Requires at least: 3.0
6
  Tested up to: 3.2.9
7
+ Stable tag: 3.2.0
8
 
9
  Provides support for multiple useful shortcodes
10
 
11
 
12
  == Description ==
13
 
14
+ With this plugin you can easily create buttons, boxes, different sliders and much, much more. Turn your free theme to premiun in just a few clicks. Using Shortcodes Ultimate you can quickly and easily retrieve many premium themes features and display it on your site. See screenshots for more information.
15
 
16
+ = Features =
17
+ * 30+ amazing shortcodes
18
+ * Handy shortcodes manager
19
+ * Custom CSS editor with syntax highlight
20
+ * Frequently updates
21
+
22
+ = New in this version =
23
+ * New shortcode: tweets
24
+ * New toolbar in insert shortcode popup window
25
 
26
  = Got a bug? =
27
  * Forum - http://wordpress.org/tags/shortcodes-ultimate?forum_id=10
shortcodes-ultimate.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  Plugin Name: Shortcodes Ultimate
4
  Plugin URI: http://ilovecode.ru/?p=122
5
- Version: 3.1.2
6
  Author: Vladimir Anokhin
7
  Author URI: http://ilovecode.ru/
8
  Description: Provides support for many easy to use shortcodes
@@ -25,6 +25,7 @@
25
  require_once( dirname( __FILE__ ) . '/lib/color.php' );
26
  require_once( dirname( __FILE__ ) . '/lib/csv.php' );
27
  require_once( dirname( __FILE__ ) . '/lib/media.php' );
 
28
  require_once( dirname( __FILE__ ) . '/lib/shortcodes.php' );
29
 
30
  // Enable shortcodes in text widgets
@@ -294,7 +295,7 @@
294
  echo '<a href="#TB_inline?width=640&height=800&inlineId=su-generator-wrap" class="thickbox" title="' . __( 'Insert shortcode', 'shortcodes-ultimate' ) . '"><img src="' . su_plugin_url() . '/images/admin/media-icon.png" alt="" /></a>';
295
  }
296
 
297
- add_action( 'media_buttons', 'su_add_generator_button', 20 );
298
 
299
  /**
300
  * Generator popup box
@@ -304,10 +305,10 @@
304
  <div id="su-generator-wrap" style="display:none">
305
  <div id="su-generator">
306
  <div id="su-generator-shell">
307
- <p>
308
  <select id="su-generator-select">
309
  <option value="raw"><?php _e( 'Select shortcode', 'shortcodes-ultimate' ); ?></option>
310
- <?
311
  foreach ( su_shortcodes() as $name => $shortcode ) {
312
  ?>
313
  <option value="<?php echo $name; ?>"><?php echo $shortcode['desc']; ?></option>
@@ -315,9 +316,15 @@
315
  }
316
  ?>
317
  </select>
318
- </p>
 
 
 
 
 
319
  <div id="su-generator-settings"></div>
320
  <input type="hidden" name="su-generator-url" id="su-generator-url" value="<?php echo su_plugin_url(); ?>" />
 
321
  </div>
322
  </div>
323
  </div>
2
  /*
3
  Plugin Name: Shortcodes Ultimate
4
  Plugin URI: http://ilovecode.ru/?p=122
5
+ Version: 3.2.0
6
  Author: Vladimir Anokhin
7
  Author URI: http://ilovecode.ru/
8
  Description: Provides support for many easy to use shortcodes
25
  require_once( dirname( __FILE__ ) . '/lib/color.php' );
26
  require_once( dirname( __FILE__ ) . '/lib/csv.php' );
27
  require_once( dirname( __FILE__ ) . '/lib/media.php' );
28
+ require_once( dirname( __FILE__ ) . '/lib/twitter.php' );
29
  require_once( dirname( __FILE__ ) . '/lib/shortcodes.php' );
30
 
31
  // Enable shortcodes in text widgets
295
  echo '<a href="#TB_inline?width=640&height=800&inlineId=su-generator-wrap" class="thickbox" title="' . __( 'Insert shortcode', 'shortcodes-ultimate' ) . '"><img src="' . su_plugin_url() . '/images/admin/media-icon.png" alt="" /></a>';
296
  }
297
 
298
+ add_action( 'media_buttons', 'su_add_generator_button', 100 );
299
 
300
  /**
301
  * Generator popup box
305
  <div id="su-generator-wrap" style="display:none">
306
  <div id="su-generator">
307
  <div id="su-generator-shell">
308
+ <div id="su-generator-header">
309
  <select id="su-generator-select">
310
  <option value="raw"><?php _e( 'Select shortcode', 'shortcodes-ultimate' ); ?></option>
311
+ <?php
312
  foreach ( su_shortcodes() as $name => $shortcode ) {
313
  ?>
314
  <option value="<?php echo $name; ?>"><?php echo $shortcode['desc']; ?></option>
316
  }
317
  ?>
318
  </select>
319
+ <div id="su-generator-tools">
320
+ <a href="<?php echo admin_url( 'options-general.php?page=shortcodes-ultimate' ); ?>" target="_blank" title="<?php _e( 'Settings', 'shortcodes-ultimate' ); ?>"><img src="<?php echo su_plugin_url(); ?>/images/generator/settings.png" alt="" /></a>
321
+ <a href="http://www.colorpicker.com/" target="_blank" title="<?php _e( 'Color picker', 'shortcodes-ultimate' ); ?>"><img src="<?php echo su_plugin_url(); ?>/images/generator/colorpicker.png" alt="" /></a>
322
+ <a href="http://wordpress.org/tags/shortcodes-ultimate?forum_id=10" target="_blank" title="<?php _e( 'Support forum', 'shortcodes-ultimate' ); ?>"><img src="<?php echo su_plugin_url(); ?>/images/generator/support.png" alt="" /></a>
323
+ </div>
324
+ </div>
325
  <div id="su-generator-settings"></div>
326
  <input type="hidden" name="su-generator-url" id="su-generator-url" value="<?php echo su_plugin_url(); ?>" />
327
+ <input type="hidden" name="su-compatibility-mode-prefix" id="su-compatibility-mode-prefix" value="<?php echo su_compatibility_mode_prefix(); ?>" />
328
  </div>
329
  </div>
330
  </div>