rtMedia for WordPress, BuddyPress and bbPress - Version 2.15

Version Description

  • Fixes bugs in Admin settings
Download this release

Release Info

Developer saurabhshukla
Plugin Icon 128x128 rtMedia for WordPress, BuddyPress and bbPress
Version 2.15
Comparing to
See all releases

Code changes from version 2.14 to 2.15

Files changed (12) hide show
  1. app/admin/BPMediaAdmin.php +54 -46
  2. app/admin/BPMediaFormHandler.php +1 -8
  3. app/assets/css/admin.css +1 -5
  4. app/assets/css/main.css +5 -4
  5. app/assets/js/admin.js +11 -5
  6. app/assets/js/jquery.sliderTabs.min.js +1 -1
  7. app/helper/BPMediaAddon.php +36 -11
  8. app/helper/BPMediaSupport.php +1 -1
  9. app/helper/rtForm.php +7 -7
  10. app/services/BPMediaEncoding.php +1 -1
  11. index.php +1 -1
  12. readme.txt +6 -3
app/admin/BPMediaAdmin.php CHANGED
@@ -63,37 +63,42 @@ if (!class_exists('BPMediaAdmin')) {
63
  * @param type $hook
64
  */
65
  public function ui($hook) {
66
- $admin_ajax = admin_url('admin-ajax.php');
67
-
68
- wp_enqueue_script('bootstrap-switch', BP_MEDIA_URL . 'app/assets/js/bootstrap-switch.js', array('jquery'), BP_MEDIA_VERSION);
69
- if (!wp_script_is("jquery-effects-core"))
70
- wp_enqueue_script("jquery-effects-core");
71
- wp_enqueue_script('slider-tabs', BP_MEDIA_URL . 'app/assets/js/jquery.sliderTabs.min.js', array('jquery-effects-core'), BP_MEDIA_VERSION,true);
72
- wp_enqueue_script('power-tip', BP_MEDIA_URL . 'app/assets/js/jquery.powertip.min.js', array('jquery'), BP_MEDIA_VERSION);
73
- wp_enqueue_script('bp-media-admin', BP_MEDIA_URL . 'app/assets/js/admin.js', array('slider-tabs','jquery-ui-dialog'), BP_MEDIA_VERSION,true);
74
- wp_localize_script('bp-media-admin', 'bp_media_admin_ajax', $admin_ajax);
75
- wp_localize_script('bp-media-admin', 'bp_media_admin_url', admin_url());
76
- $bp_media_admin_strings = array(
77
- 'no_refresh' => __('Please do not refresh this page.', 'buddypress-media'),
78
- 'something_went_wrong' => __('Something went wronng. Please <a href onclick="location.reload();">refresh</a> page.', 'buddypress-media'),
79
- 'are_you_sure' => __('This will subscribe you to the free plan.', 'buddypress-media'),
80
- 'disable_encoding' => __('Are you sure you want to disable the encoding service? Make sure you note your api key before disabling it incase you want to activate it in future.', 'buddypress-media')
81
- );
82
- wp_localize_script('bp-media-admin', 'bp_media_admin_strings', $bp_media_admin_strings);
83
- wp_localize_script('bp-media-admin', 'settings_url', add_query_arg(
84
- array('page' => 'bp-media-settings'), (is_multisite() ? network_admin_url('admin.php') : admin_url('admin.php'))
85
- ) . '#privacy_enabled');
86
- wp_localize_script('bp-media-admin', 'settings_bp_album_import_url', add_query_arg(
87
- array('page' => 'bp-media-settings'), (is_multisite() ? network_admin_url('admin.php') : admin_url('admin.php'))
88
- ));
89
- wp_enqueue_style('font-awesome', BP_MEDIA_URL . 'app/assets/css/font-awesome.min.css', '', BP_MEDIA_VERSION);
90
- wp_enqueue_style('bootstrap-switch', BP_MEDIA_URL . 'app/assets/css/bootstrap-switch.css', '', BP_MEDIA_VERSION);
91
- wp_enqueue_style('slider-tabs', BP_MEDIA_URL . 'app/assets/css/jquery.sliderTabs.min.css', '', BP_MEDIA_VERSION);
92
- wp_enqueue_style('power-tip', BP_MEDIA_URL . 'app/assets/css/jquery.powertip.min.css', '', BP_MEDIA_VERSION);
93
- wp_enqueue_style('grid-foundation', BP_MEDIA_URL . 'app/assets/css/grid-foundation.css', '', BP_MEDIA_VERSION);
94
- wp_enqueue_style('bp-media-main', BP_MEDIA_URL . 'app/assets/css/main.css', '', BP_MEDIA_VERSION);
95
- wp_enqueue_style('bp-media-admin', BP_MEDIA_URL . 'app/assets/css/admin.css', '', BP_MEDIA_VERSION);
96
- wp_enqueue_style('wp-jquery-ui-dialog');
 
 
 
 
 
97
  }
98
 
99
  /**
@@ -193,21 +198,28 @@ if (!class_exists('BPMediaAdmin')) {
193
  ?>
194
  <div class="bp-media-metabox-holder">
195
 
196
-
197
- <?php do_settings_sections($page); ?>
 
 
 
 
 
 
 
198
  <div class="rt-link alignright"><?php _e('By', 'buddypress-media'); ?> <a href="http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media" title="<?php _e('Empowering The Web With WordPress', 'buddypress-media'); ?>"><img src="<?php echo BP_MEDIA_URL; ?>app/assets/img/rtcamp-logo.png"></a></div>
199
  </div><?php
 
200
  }
201
  ?>
202
 
203
 
204
  </div><!-- .bp-media-settings-boxes -->
205
- <div class="metabox-holder bp-media-metabox-holder columns large-2">
206
  <?php $this->admin_sidebar(); ?>
207
  </div>
208
  </div><!-- .metabox-holder -->
209
  </div><!-- .bp-media-admin --><?php
210
- do_action('bp_media_admin_page_append', $page);
211
  }
212
 
213
  /**
@@ -453,18 +465,14 @@ if (!class_exists('BPMediaAdmin')) {
453
 
454
  $message = sprintf(__('I use @buddypressmedia http://goo.gl/8Upmv on %s', 'buddypress-media'), home_url());
455
  $addons = '<div id="social" class="row">
456
- <label class="columns large-6 large-offset-2" for="bp-media-add-linkback"><input' . checked(bp_get_option('bp_media_add_linkback', false), true, false) . ' type="checkbox" name="bp-media-add-linkback" value="1" id="bp-media-add-linkback"/> ' . __('Add link to footer', 'buddypress-media') . '</label>
457
- <div class="row">
458
- <div class="columns large-4 pull-left"><iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Frtcamp.com%2Fbuddypress-media%2F&amp;send=false&amp;layout=button_count&amp;width=72&amp;show_faces=false&amp;font&amp;colorscheme=light&amp;action=like&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:72px; height:21px; margin-top: 5px;" allowTransparency="true"></iframe></div>
459
- <div class="columns large-4 pull-right"><a href="https://www.facebook.com/sharer/sharer.php?u=http://rtcamp.com/buddypress-media/" class="button" target="_blank"> <i class="icon-facebook"></i> ' . __('Share', 'buddypress-media') . '</a></div>
460
- </div>
461
- <div class="row">
462
- <div class="columns large-4 pull-left"><iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=buddypressmedia&show_count=false" style="width:109px; height:21px; margin-top: 5px;"></iframe></div>
463
- <div class="columns large-4 pull-right"><a href="http://twitter.com/home/?status=' . $message . '" class="button button-tweet" target= "_blank"><i class="icon-twitter"></i> ' . __('Tweet', 'buddypress-media') . '</a></div>
464
- </div>
465
  <div class="row">
466
- <div class="columns large-4 pull-left"><a href="http://wordpress.org/support/view/plugin-reviews/buddypress-media?rate=5#postform" class="button bpm-wp-button" target= "_blank"><span class="bpm-wp-icon">&nbsp;</span> ' . __('Review', 'buddypress-media') . '</a></div>
467
- <div class="columns large-4 pull-right"><a href="' . sprintf('%s', 'http://feeds.feedburner.com/rtcamp/') . '" title="' . __('Subscribe to our feeds', 'buddypress-media') . '" class="button"><i class="bp-media-rss icon-rss"></i> ' . __('Feeds', 'buddypress-media') . '</a></div>
 
 
 
 
468
  </div>
469
  </div>';
470
  //<li><a href="' . sprintf('%s', 'http://www.facebook.com/rtCamp.solutions/') . '" title="' . __('Become a fan on Facebook', 'buddypress-media') . '" class="bp-media-facebook bp-media-social">' . __('Facebook', 'buddypress-media') . '</a></li>
63
  * @param type $hook
64
  */
65
  public function ui($hook) {
66
+
67
+ $admin_pages = array('toplevel_page_bp-media-settings', 'buddypress-media_page_bp-media-addons', 'buddypress-media_page_bp-media-support', 'buddypress-media_page_bp-media-importer');
68
+
69
+ if(in_array($hook, $admin_pages)) {
70
+
71
+ $admin_ajax = admin_url('admin-ajax.php');
72
+
73
+ wp_enqueue_script('bootstrap-switch', BP_MEDIA_URL . 'app/assets/js/bootstrap-switch.js', array('jquery'), BP_MEDIA_VERSION);
74
+ wp_enqueue_script('slider-tabs', BP_MEDIA_URL . 'app/assets/js/jquery.sliderTabs.min.js', array('jquery', 'jquery-effects-core'), BP_MEDIA_VERSION);
75
+ wp_enqueue_script('power-tip', BP_MEDIA_URL . 'app/assets/js/jquery.powertip.min.js', array('jquery'), BP_MEDIA_VERSION);
76
+ wp_enqueue_script('bp-media-admin', BP_MEDIA_URL . 'app/assets/js/admin.js', array('jquery-ui-dialog'), BP_MEDIA_VERSION);
77
+ wp_localize_script('bp-media-admin', 'bp_media_admin_ajax', $admin_ajax);
78
+ wp_localize_script('bp-media-admin', 'bp_media_admin_url', admin_url());
79
+ wp_localize_script('bp-media-admin', 'bp_media_admin_url', admin_url());
80
+ $bp_media_admin_strings = array(
81
+ 'no_refresh' => __('Please do not refresh this page.', 'buddypress-media'),
82
+ 'something_went_wrong' => __('Something went wronng. Please <a href onclick="location.reload();">refresh</a> page.', 'buddypress-media'),
83
+ 'are_you_sure' => __('This will subscribe you to the free plan.', 'buddypress-media'),
84
+ 'disable_encoding' => __('Are you sure you want to disable the encoding service? Make sure you note your api key before disabling it incase you want to activate it in future.', 'buddypress-media')
85
+ );
86
+ wp_localize_script('bp-media-admin', 'bp_media_admin_strings', $bp_media_admin_strings);
87
+ wp_localize_script('bp-media-admin', 'settings_url', add_query_arg(
88
+ array('page' => 'bp-media-settings'), (is_multisite() ? network_admin_url('admin.php') : admin_url('admin.php'))
89
+ ) . '#privacy_enabled');
90
+ wp_localize_script('bp-media-admin', 'settings_bp_album_import_url', add_query_arg(
91
+ array('page' => 'bp-media-settings'), (is_multisite() ? network_admin_url('admin.php') : admin_url('admin.php'))
92
+ ));
93
+ wp_enqueue_style('font-awesome', BP_MEDIA_URL . 'app/assets/css/font-awesome.min.css', '', BP_MEDIA_VERSION);
94
+ wp_enqueue_style('bootstrap-switch', BP_MEDIA_URL . 'app/assets/css/bootstrap-switch.css', '', BP_MEDIA_VERSION);
95
+ wp_enqueue_style('slider-tabs', BP_MEDIA_URL . 'app/assets/css/jquery.sliderTabs.min.css', '', BP_MEDIA_VERSION);
96
+ wp_enqueue_style('power-tip', BP_MEDIA_URL . 'app/assets/css/jquery.powertip.min.css', '', BP_MEDIA_VERSION);
97
+ wp_enqueue_style('grid-foundation', BP_MEDIA_URL . 'app/assets/css/grid-foundation.css', '', BP_MEDIA_VERSION);
98
+ wp_enqueue_style('bp-media-main', BP_MEDIA_URL . 'app/assets/css/main.css', '', BP_MEDIA_VERSION);
99
+ wp_enqueue_style('bp-media-admin', BP_MEDIA_URL . 'app/assets/css/admin.css', '', BP_MEDIA_VERSION);
100
+ wp_enqueue_style('wp-jquery-ui-dialog');
101
+ }
102
  }
103
 
104
  /**
198
  ?>
199
  <div class="bp-media-metabox-holder">
200
 
201
+ <?php
202
+ if( $page == 'bp-media-addons' )
203
+ BPMediaAddon::render_addons ($page);
204
+ else
205
+ do_settings_sections($page);
206
+ ?>
207
+ <?php
208
+ do_action('bp_media_admin_page_insert', $page);
209
+ ?>
210
  <div class="rt-link alignright"><?php _e('By', 'buddypress-media'); ?> <a href="http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media" title="<?php _e('Empowering The Web With WordPress', 'buddypress-media'); ?>"><img src="<?php echo BP_MEDIA_URL; ?>app/assets/img/rtcamp-logo.png"></a></div>
211
  </div><?php
212
+ do_action('bp_media_admin_page_append', $page);
213
  }
214
  ?>
215
 
216
 
217
  </div><!-- .bp-media-settings-boxes -->
218
+ <div class="metabox-holder bp-media-metabox-holder columns large-3">
219
  <?php $this->admin_sidebar(); ?>
220
  </div>
221
  </div><!-- .metabox-holder -->
222
  </div><!-- .bp-media-admin --><?php
 
223
  }
224
 
225
  /**
465
 
466
  $message = sprintf(__('I use @buddypressmedia http://goo.gl/8Upmv on %s', 'buddypress-media'), home_url());
467
  $addons = '<div id="social" class="row">
468
+ <label class="columns large-6 large-offset-3" for="bp-media-add-linkback"><input' . checked(bp_get_option('bp_media_add_linkback', false), true, false) . ' type="checkbox" name="bp-media-add-linkback" value="1" id="bp-media-add-linkback"/> ' . __('Add link to footer', 'buddypress-media') . '</label>
 
 
 
 
 
 
 
 
469
  <div class="row">
470
+ <div class="columns large-6"><iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Frtcamp.com%2Fbuddypress-media%2F&amp;send=false&amp;layout=button_count&amp;width=72&amp;show_faces=false&amp;font&amp;colorscheme=light&amp;action=like&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:76px; height:21px; margin-top: 5px;" allowTransparency="true"></iframe></div>
471
+ <div class="columns large-6"><a href="https://www.facebook.com/sharer/sharer.php?u=http://rtcamp.com/buddypress-media/" class="button" target="_blank"> <i class="icon-facebook"></i> ' . __('Share', 'buddypress-media') . '</a></div>
472
+ <div class="columns large-6"><iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=buddypressmedia&show_count=false" style="width:62px; height:21px; margin-top: 5px;"></iframe></div>
473
+ <div class="columns large-6"><a href="http://twitter.com/home/?status=' . $message . '" class="button button-tweet" target= "_blank"><i class="icon-twitter"></i> ' . __('Tweet', 'buddypress-media') . '</a></div>
474
+ <div class="columns large-6"><a href="http://wordpress.org/support/view/plugin-reviews/buddypress-media?rate=5#postform" class="button bpm-wp-button" target= "_blank"><span class="bpm-wp-icon">&nbsp;</span> ' . __('Review', 'buddypress-media') . '</a></div>
475
+ <div class="columns large-6"><a href="' . sprintf('%s', 'http://feeds.feedburner.com/rtcamp/') . '" title="' . __('Subscribe to our feeds', 'buddypress-media') . '" class="button"><i class="bp-media-rss icon-rss"></i> ' . __('Feeds', 'buddypress-media') . '</a></div>
476
  </div>
477
  </div>';
478
  //<li><a href="' . sprintf('%s', 'http://www.facebook.com/rtCamp.solutions/') . '" title="' . __('Become a fan on Facebook', 'buddypress-media') . '" class="bp-media-facebook bp-media-social">' . __('Facebook', 'buddypress-media') . '</a></li>
app/admin/BPMediaFormHandler.php CHANGED
@@ -244,19 +244,15 @@ class BPMediaFormHandler {
244
  echo '<div class="rt-table large-12">';
245
 
246
  //header
247
- $tooltip_ids = '';
248
  echo '<div class="row rt-header">';
249
  foreach ($headers as $val) {
250
  if( isset($val['desc']) && !empty($val['desc']) ) {
251
- echo '<h4 id="' . $val['id'] . '" class="columns ' . $val['class'] . '" title="' . $val['desc'] . '"><abbr>' . $val['title'] . '</abbr></h4>';
252
- $tooltip_ids .= '#' . $val['id'] . ',';
253
  }
254
  else
255
  echo '<h4 " class="columns ' . $val['class'] . '">' . $val['title'] . '</h4>';
256
  }
257
  echo '</div>';
258
-
259
- $tooltip_ids = substr($tooltip_ids, 0, strlen($tooltip_ids)-1);
260
 
261
  //body
262
  $even = 0;
@@ -282,9 +278,6 @@ class BPMediaFormHandler {
282
  }
283
  ?>
284
  </div>
285
- <script type="text/javascript">
286
- var tooltip_ids = '<?php echo $tooltip_ids;?>';
287
- </script>
288
  <?php
289
  }
290
 
244
  echo '<div class="rt-table large-12">';
245
 
246
  //header
 
247
  echo '<div class="row rt-header">';
248
  foreach ($headers as $val) {
249
  if( isset($val['desc']) && !empty($val['desc']) ) {
250
+ echo '<h4 id="' . $val['id'] . '" class="bpm-show-tooltip columns ' . $val['class'] . '" title="' . $val['desc'] . '"><abbr>' . $val['title'] . '</abbr></h4>';
 
251
  }
252
  else
253
  echo '<h4 " class="columns ' . $val['class'] . '">' . $val['title'] . '</h4>';
254
  }
255
  echo '</div>';
 
 
256
 
257
  //body
258
  $even = 0;
278
  }
279
  ?>
280
  </div>
 
 
 
281
  <?php
282
  }
283
 
app/assets/css/admin.css CHANGED
@@ -68,11 +68,7 @@ abbr {
68
  font-style: italic;
69
  }
70
 
71
- /* line 67, ../sass/admin.scss */
72
- .bpm-wp-button {
73
- height: 27px !important;
74
- }
75
- /* line 71, ../sass/admin.scss */
76
  .bpm-wp-button .bpm-wp-icon {
77
  background-image: url(../img/wpmini-grey.png);
78
  width: 20px;
68
  font-style: italic;
69
  }
70
 
71
+ /* line 69, ../sass/admin.scss */
 
 
 
 
72
  .bpm-wp-button .bpm-wp-icon {
73
  background-image: url(../img/wpmini-grey.png);
74
  width: 20px;
app/assets/css/main.css CHANGED
@@ -23,7 +23,8 @@ div#icon-buddypress-media { background: url('../img/bpm-icon-32.png'); backgroun
23
  #adminmenu li.current.toplevel_page_bp-media-settings .wp-menu-image a{background-position: center 1px;}
24
  #adminmenu li.toplevel_page_bp-media-settings .wp-menu-image a img{display:none;}
25
  #bp-media-settings-boxes{margin:10px;}
26
- #debug-info{clear:left;border:1px solid #CCC; overflow: hidden; padding: 10px; margin-top: 10px; -webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px; float: left; width: 588px;}
 
27
  .nav-tab-wrapper a#bp-media{background:url('../img/bpm-icon-32.png') transparent no-repeat; padding-left:32px;}
28
  .nav-tab-wrapper a#bp-media:hover,.nav-tab-wrapper a#bp-media.nav-tab-active{background-position:left -96px;}
29
  .metabox-holder .postbox#latest-news .inside ul li{list-style: disc inside;}
@@ -32,15 +33,15 @@ div#icon-buddypress-media { background: url('../img/bpm-icon-32.png'); backgroun
32
  #branding{min-height: 25px;}
33
  #branding .inside{min-height: 25px;}
34
  #branding #logo{text-align:center;padding: 10px 0;display:block;}
35
- #social{display:block;text-align:center;margin:0;clear: both;}
36
  #branding #mc-embedded-subscribe-form{float: left;width: 100%;}
37
  #branding label{float: right;}
38
  #branding #mc-embedded-subscribe{float: right;padding: 0 3px;}
39
  #branding #mce-EMAIL{float: left;}
40
- #social li{display:inline; vertical-align: middle;}
41
  #spread-the-word .button{display:inline-block; margin: 5px 0px;}
42
  #spread-the-word label{display:block;}
43
- #spread-the-word .inside{text-align: center;}
44
  #spread-the-word .button-tweet, #bpmedia-bpalbumimporter .button-import-tweet{background: #33ACE6; border-color: #3399DD #3399DD #2288CC; color: #FFFFFF !important; text-shadow: -1px -1px 0 #3399DD;}
45
  #spread-the-word .button-tweet:hover, #bpmedia-bpalbumimporter .button-import-tweet:hover{background: #3399DD;border-color: #2288CC;box-shadow: 0 0 4px rgba(82, 168, 236, 0.75);}
46
  #spread-the-word .button-rating{background: #8A8A8A; border-color: #222; color: #FFFFFF !important; text-shadow: -1px -1px 0 #444;}
23
  #adminmenu li.current.toplevel_page_bp-media-settings .wp-menu-image a{background-position: center 1px;}
24
  #adminmenu li.toplevel_page_bp-media-settings .wp-menu-image a img{display:none;}
25
  #bp-media-settings-boxes{margin:10px;}
26
+ #debug-info{clear:left;border:none; overflow: hidden; padding: 10px; margin: 10px 0 20px 0; -webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px; }
27
+ #debug-info th, #debug-info td{ border: 1px #e5e5e5 solid; border-left:none; border-right:none;}
28
  .nav-tab-wrapper a#bp-media{background:url('../img/bpm-icon-32.png') transparent no-repeat; padding-left:32px;}
29
  .nav-tab-wrapper a#bp-media:hover,.nav-tab-wrapper a#bp-media.nav-tab-active{background-position:left -96px;}
30
  .metabox-holder .postbox#latest-news .inside ul li{list-style: disc inside;}
33
  #branding{min-height: 25px;}
34
  #branding .inside{min-height: 25px;}
35
  #branding #logo{text-align:center;padding: 10px 0;display:block;}
36
+ #social{display:block;margin:0;clear: both;}
37
  #branding #mc-embedded-subscribe-form{float: left;width: 100%;}
38
  #branding label{float: right;}
39
  #branding #mc-embedded-subscribe{float: right;padding: 0 3px;}
40
  #branding #mce-EMAIL{float: left;}
41
+ #social .row .large-6{display:inline; vertical-align: middle; padding:0; text-align:center;}
42
  #spread-the-word .button{display:inline-block; margin: 5px 0px;}
43
  #spread-the-word label{display:block;}
44
+ #spread-the-word .inside{}
45
  #spread-the-word .button-tweet, #bpmedia-bpalbumimporter .button-import-tweet{background: #33ACE6; border-color: #3399DD #3399DD #2288CC; color: #FFFFFF !important; text-shadow: -1px -1px 0 #3399DD;}
46
  #spread-the-word .button-tweet:hover, #bpmedia-bpalbumimporter .button-import-tweet:hover{background: #3399DD;border-color: #2288CC;box-shadow: 0 0 4px rgba(82, 168, 236, 0.75);}
47
  #spread-the-word .button-rating{background: #8A8A8A; border-color: #222; color: #FFFFFF !important; text-shadow: -1px -1px 0 #444;}
app/assets/js/admin.js CHANGED
@@ -470,7 +470,11 @@ jQuery(document).ready(function($){
470
  });
471
 
472
 
473
- jQuery("#bpm-settings-tabs,#bpm-addons").sliderTabs();
 
 
 
 
474
 
475
  if(jQuery('#privacy_enabled').is(":checked")) {
476
  jQuery(".privacy-driven-disable label input").prop("disabled",false);
@@ -491,9 +495,11 @@ jQuery(document).ready(function($){
491
 
492
  jQuery("[data-toggle='switch']").wrap('<div class="rt-switch" />').parent().bootstrapSwitch();
493
 
494
- if(tooltip_ids != undefined) {
495
- jQuery(tooltip_ids).powerTip({
496
- followMouse: true
497
- });
 
 
498
  }
499
  });
470
  });
471
 
472
 
473
+ jQuery("#bpm-settings-tabs,#bpm-addons").sliderTabs({
474
+ autoplay: false,
475
+ mousewheel: false,
476
+ defaultTab: 1
477
+ });
478
 
479
  if(jQuery('#privacy_enabled').is(":checked")) {
480
  jQuery(".privacy-driven-disable label input").prop("disabled",false);
495
 
496
  jQuery("[data-toggle='switch']").wrap('<div class="rt-switch" />').parent().bootstrapSwitch();
497
 
498
+ try {
499
+ jQuery('bpm-show-tooltip').powerTip({
500
+ followMouse: true
501
+ });
502
+ } catch(e) {
503
+ // no tooltip is defined
504
  }
505
  });
app/assets/js/jquery.sliderTabs.min.js CHANGED
@@ -1 +1 @@
1
- (function(e){e.sliderTabs=function(t,n){var r=this;var i={autoplay:false,tabArrowWidth:35,classes:{leftTabArrow:"",panel:"",panelActive:"",panelsContainer:"",rightTabArrow:"",tab:"",tabActive:"",tabsList:""},defaultTab:1,height:null,indicators:false,mousewheel:true,position:"top",panelArrows:false,panelArrowsShowOnHover:false,tabs:true,tabHeight:30,tabArrows:true,tabSlideLength:100,tabSlideSpeed:200,transition:"slide",transitionEasing:"easeOutCubic",transitionSpeed:500,width:null};var s=e(t),o,u,a,f,l,c,h,p,d,v;var m=false,g=true;var y,b;r.selectedTab=i.defaultTab;r.init=function(){y=r.settings=e.extend({},i,n);s.addClass("ui-slider-tabs");a=s.children("div").addClass("ui-slider-tab-content").remove();u=s.children("ul").addClass("ui-slider-tabs-list").remove();u.children("li").remove().appendTo(u);r.count=u.children("li").length;l=e("<div class='ui-slider-tabs-list-wrapper'>");f=e("<div class='ui-slider-tabs-list-container'>").append(u).appendTo(l);f.find("li").css("height",y.tabHeight+2);f.find("li a").css("height",y.tabHeight+2);h=e("<a href='#' class='ui-slider-left-arrow'><div></div></a>").css({width:y.tabArrowWidth,height:y.tabHeight+2}).appendTo(f).click(function(e){r.slideTabs("right",y.tabSlideLength);return false});p=e("<a href='#' class='ui-slider-right-arrow'><div></div></a>").css({width:y.tabArrowWidth,height:y.tabHeight+2}).appendTo(f).click(function(e){r.slideTabs("left",y.tabSlideLength);return false});c=e("<div class='ui-slider-tabs-content-container'>").append(a);if(y.position=="bottom")s.append(c).append(l.addClass("bottom"));else s.append(l).append(c);if(y.width)s.width(parseInt(y.width));if(y.height)c.height(parseInt(y.height)-y.tabHeight);if(y.indicators)r.showIndicators();r.selectTab(y.defaultTab);r.slideTabs("left",0);S();A();s.delegate(".ui-slider-tabs-list li a","click",function(){if(!e(this).parent().hasClass("selected")&&!m){r.selectTab(e(this).parent())}return false});if(o)o.delegate(".ui-slider-tabs-indicator","click",function(){if(!e(this).hasClass("selected")&&!m)r.selectTab(e(this).index()+1)});e.each(y.classes,function(e,t){switch(e){case"leftTabArrow":h.addClass(t);break;case"rightTabArrow":p.addClass(t);break;case"panel":a.addClass(t);break;case"panelsContainer":c.addClass(t);break;case"tab":u.find("li").addClass(t);break;case"tabsList":u.addClass(t);break;default:break}});if(y.panelArrows)k();if(y.panelArrowsShowOnHover){if(d)d.addClass("showOnHover");if(v)v.addClass("showOnHover")}c.resize(k);l.resize(function(){L();A()});setInterval(function(){var e=c.children(".selected");if(e.outerHeight()>c.outerHeight()&&g)C(e)},100);L();if(!y.tabs)l.hide();if(y.autoplay)setInterval(r.next,y.autoplay);s.bind("mousewheel",function(e,t,n,i){if(t>0)r.next();else if(t<0)r.prev();return false})};r.selectTab=function(e){g=false;var t=typeof e==="number"?u.children("li:nth-child("+e+")"):e;var n=t.find("a").attr("href").substr(1);var i=c.children("#"+n);r.selectedTab=typeof e==="number"?e:e.index()+1;C(i);m=true;var s=u.find(".selected").index()<t.index()?"left":"right";t.siblings().removeClass("selected");if(y.classes.tabActive!="")t.siblings().removeClass(y.classes.tabActive);t.addClass("selected").addClass(y.classes.tabActive);T(c.children(".ui-slider-tab-content:visible"),s);N(i);E(t);w()};r.next=function(){if(!m){if(r.count===r.selectedTab)r.selectTab(1);else r.selectTab(r.selectedTab+1)}};r.prev=function(){if(!m){if(r.selectedTab===1)r.selectTab(r.count);else r.selectTab(r.selectedTab-1)}};r.slideTabs=function(e,t){var n=parseInt(u.css("margin-left"));var r=n;h.removeClass("edge");p.removeClass("edge");if(e=="right")r+=t;else if(e=="left")r-=t;if(r>=0){r=0;h.addClass("edge")}else if(r<=b){r=b;p.addClass("edge")}u.animate({"margin-left":r},y.tabSlideSpeed)};r.showIndicators=function(){if(!o){o=e("<div class='ui-slider-tabs-indicator-container'>");for(var t=0;t<a.length;t++){o.append("<div class='ui-slider-tabs-indicator'></div>")}c.append(o)}else o.show()};r.hideIndicators=function(){if(o)o.hide()};r.showTabArrows=function(){if(!y.tabArrows)return;h.show();p.show();f.css("margin","0 "+y.tabArrowWidth+"px")};r.hideTabArrows=function(){h.hide();p.hide();f.css("margin","0")};r.showPanelArrows=function(){if(d)d.show();if(v)v.show()};r.hidePanelArrows=function(){if(d)d.hide();if(v)v.hide()};var w=function(){if(y.indicators&&o){var e=o.children("div:nth-child("+r.selectedTab+")");e.siblings().removeClass("selected");e.addClass("selected")}};var E=function(e){var t=e.offset(),n=f.offset(),i=t.left-n.left,s=n.left+f.outerWidth()-(t.left+e.outerWidth());if(i<0)r.slideTabs("right",-i);else if(s<0)r.slideTabs("left",-s)};var S=function(){if(y.transition=="slide")u.children("li").each(function(t,n){var r=u.children(".selected").index(),i=e(n).index();var s=c.children("#"+e(n).find("a").attr("href").substr(1));if(r<i)s.css({left:c.width()+"px"});else if(r>i)s.css({left:"-"+c.width()+"px"});else s.addClass(y.classes.panelActive)});if(y.transition=="fade")u.children("li").each(function(t,n){var r=u.children(".selected").index(),i=e(n).index();var s=c.children("#"+e(n).find("a").attr("href").substr(1));if(r!=i)s.css({opacity:0});else s.addClass(y.classes.panelActive)})};var x=function(e){return{hide:{slideleft:{left:"-"+e+"px"},slideright:{left:e+"px"},fade:{opacity:0}},show:{slide:{left:0},fade:{opacity:1}}}};var T=function(e,t){if(y.transition=="slide")var n="slide"+t;else var n=y.transition;e.animate(x(c.width())["hide"][n],y.transitionSpeed,y.transitionEasing,function(){e.hide();e.removeClass("selected");m=false;S()})};var N=function(e){e.show();e.addClass(y.classes.panelActive).addClass("selected");e.animate(x(c.width())["show"][y.transition],y.transitionSpeed,y.transitionEasing,function(){m=false;g=true;S()})};var C=function(e){if(!y.height)c.animate({height:O(e)},200)};var k=function(){if(y.panelArrows){if(!d&&!v){d=e("<div class='ui-slider-tabs-leftPanelArrow'>").click(function(){r.prev()});v=e("<div class='ui-slider-tabs-rightPanelArrow'>").click(function(){r.next()});d.appendTo(c);v.appendTo(c)}v.css({top:c.height()/2-v.outerHeight()/2});d.css({top:c.height()/2-d.outerHeight()/2})}};var L=function(){var t=0;u.children().each(function(n,r){t+=e(r).outerWidth(true)});u.width(t+50);if(f.width()<t&&y.tabArrows){r.showTabArrows();b=f.width()-t}else r.hideTabArrows()};var A=function(){a.width(c.width()-(a.outerWidth()-a.width()))};var O=function(e){var t={display:e.css("display"),left:e.css("left"),position:e.css("position")};e.css({display:"normal",left:-5e3,position:"absolute"});var n=e.outerHeight();e.css(t);return n};r.init()};e.fn.sliderTabs=function(t){return this.each(function(){var n=e(this),r=n.data("sliderTabs");if(!r){r=new e.sliderTabs(this,t);n.data("sliderTabs",r);return r}if(r.methods[t]){return r.methods[t].apply(this,Array.prototype.slice.call(arguments,1))}})}})(jQuery);(function(e){function r(t){var n=t||window.event,r=[].slice.call(arguments,1),i=0,s=true,o=0,u=0;t=e.event.fix(n);t.type="mousewheel";if(n.wheelDelta){i=n.wheelDelta/120}if(n.detail){i=-n.detail/3}u=i;if(n.axis!==undefined&&n.axis===n.HORIZONTAL_AXIS){u=0;o=-1*i}if(n.wheelDeltaY!==undefined){u=n.wheelDeltaY/120}if(n.wheelDeltaX!==undefined){o=-1*n.wheelDeltaX/120}r.unshift(t,i,o,u);return(e.event.dispatch||e.event.handle).apply(this,r)}var t=["DOMMouseScroll","mousewheel"];if(e.event.fixHooks){for(var n=t.length;n;){e.event.fixHooks[t[--n]]=e.event.mouseHooks}}e.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var e=t.length;e;){this.addEventListener(t[--e],r,false)}}else{this.onmousewheel=r}},teardown:function(){if(this.removeEventListener){for(var e=t.length;e;){this.removeEventListener(t[--e],r,false)}}else{this.onmousewheel=null}}};e.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})})(jQuery);(function(e,t,n){function c(){s=t[o](function(){r.each(function(){var t=e(this),n=t.width(),r=t.height(),i=e.data(this,a);if(n!==i.w||r!==i.h){t.trigger(u,[i.w=n,i.h=r])}});c()},i[f])}var r=e([]),i=e.resize=e.extend(e.resize,{}),s,o="setTimeout",u="resize",a=u+"-special-event",f="delay",l="throttleWindow";i[f]=250;i[l]=true;e.event.special[u]={setup:function(){if(!i[l]&&this[o]){return false}var t=e(this);r=r.add(t);e.data(this,a,{w:t.width(),h:t.height()});if(r.length===1){c()}},teardown:function(){if(!i[l]&&this[o]){return false}var t=e(this);r=r.not(t);t.removeData(a);if(!r.length){clearTimeout(s)}},add:function(t){function s(t,i,s){var o=e(this),u=e.data(this,a);u.w=i!==n?i:o.width();u.h=s!==n?s:o.height();r.apply(this,arguments)}if(!i[l]&&this[o]){return false}var r;if(e.isFunction(t)){r=t;return s}else{r=t.handler;t.handler=s}}}})(jQuery,this)
1
+ (function(e){e.sliderTabs=function(t,n){var r=this;var i={autoplay:false,tabArrowWidth:35,classes:{leftTabArrow:"",panel:"",panelActive:"",panelsContainer:"",rightTabArrow:"",tab:"",tabActive:"",tabsList:""},defaultTab:1,height:null,indicators:false,mousewheel:true,position:"top",panelArrows:false,panelArrowsShowOnHover:false,tabs:true,tabHeight:30,tabArrows:true,tabSlideLength:100,tabSlideSpeed:200,transition:"slide",transitionEasing:"easeOutCubic",transitionSpeed:500,width:null};var s=e(t),o,u,a,f,l,c,h,p,d,v;var m=false,g=true;var y,b;r.selectedTab=i.defaultTab;r.init=function(){y=r.settings=e.extend({},i,n);s.addClass("ui-slider-tabs");a=s.children("div").addClass("ui-slider-tab-content").remove();u=s.children("ul").addClass("ui-slider-tabs-list").remove();u.children("li").remove().appendTo(u);r.count=u.children("li").length;l=e("<div class='ui-slider-tabs-list-wrapper'>");f=e("<div class='ui-slider-tabs-list-container'>").append(u).appendTo(l);f.find("li").css("height",y.tabHeight+2);f.find("li a").css("height",y.tabHeight+2);h=e("<a href='#' class='ui-slider-left-arrow'><div></div></a>").css({width:y.tabArrowWidth,height:y.tabHeight+2}).appendTo(f).click(function(e){r.slideTabs("right",y.tabSlideLength);return false});p=e("<a href='#' class='ui-slider-right-arrow'><div></div></a>").css({width:y.tabArrowWidth,height:y.tabHeight+2}).appendTo(f).click(function(e){r.slideTabs("left",y.tabSlideLength);return false});c=e("<div class='ui-slider-tabs-content-container'>").append(a);if(y.position=="bottom")s.append(c).append(l.addClass("bottom"));else s.append(l).append(c);if(y.width)s.width(parseInt(y.width));if(y.height)c.height(parseInt(y.height)-y.tabHeight);if(y.indicators)r.showIndicators();r.selectTab(y.defaultTab);r.slideTabs("left",0);S();A();s.delegate(".ui-slider-tabs-list li a","click",function(){if(!e(this).parent().hasClass("selected")&&!m){r.selectTab(e(this).parent())}return false});if(o)o.delegate(".ui-slider-tabs-indicator","click",function(){if(!e(this).hasClass("selected")&&!m)r.selectTab(e(this).index()+1)});e.each(y.classes,function(e,t){switch(e){case"leftTabArrow":h.addClass(t);break;case"rightTabArrow":p.addClass(t);break;case"panel":a.addClass(t);break;case"panelsContainer":c.addClass(t);break;case"tab":u.find("li").addClass(t);break;case"tabsList":u.addClass(t);break;default:break}});if(y.panelArrows)k();if(y.panelArrowsShowOnHover){if(d)d.addClass("showOnHover");if(v)v.addClass("showOnHover")}c.resize(k);l.resize(function(){L();A()});setInterval(function(){var e=c.children(".selected");if(e.outerHeight()>c.outerHeight()&&g)C(e)},100);L();if(!y.tabs)l.hide();if(y.autoplay)setInterval(r.next,y.autoplay);if(y.mousewheel)s.bind("mousewheel",function(e,t,n,i){if(t>0)r.next();else if(t<0)r.prev();return false})};r.selectTab=function(e){g=false;var t=typeof e==="number"?u.children("li:nth-child("+e+")"):e;var n=t.find("a").attr("href").substr(1);var i=c.children("#"+n);r.selectedTab=typeof e==="number"?e:e.index()+1;C(i);m=true;var s=u.find(".selected").index()<t.index()?"left":"right";t.siblings().removeClass("selected");if(y.classes.tabActive!="")t.siblings().removeClass(y.classes.tabActive);t.addClass("selected").addClass(y.classes.tabActive);T(c.children(".ui-slider-tab-content:visible"),s);N(i);E(t);w()};r.next=function(){if(!m){if(r.count===r.selectedTab)r.selectTab(1);else r.selectTab(r.selectedTab+1)}};r.prev=function(){if(!m){if(r.selectedTab===1)r.selectTab(r.count);else r.selectTab(r.selectedTab-1)}};r.slideTabs=function(e,t){var n=parseInt(u.css("margin-left"));var r=n;h.removeClass("edge");p.removeClass("edge");if(e=="right")r+=t;else if(e=="left")r-=t;if(r>=0){r=0;h.addClass("edge")}else if(r<=b){r=b;p.addClass("edge")}u.animate({"margin-left":r},y.tabSlideSpeed)};r.showIndicators=function(){if(!o){o=e("<div class='ui-slider-tabs-indicator-container'>");for(var t=0;t<a.length;t++){o.append("<div class='ui-slider-tabs-indicator'></div>")}c.append(o)}else o.show()};r.hideIndicators=function(){if(o)o.hide()};r.showTabArrows=function(){if(!y.tabArrows)return;h.show();p.show();f.css("margin","0 "+y.tabArrowWidth+"px")};r.hideTabArrows=function(){h.hide();p.hide();f.css("margin","0")};r.showPanelArrows=function(){if(d)d.show();if(v)v.show()};r.hidePanelArrows=function(){if(d)d.hide();if(v)v.hide()};var w=function(){if(y.indicators&&o){var e=o.children("div:nth-child("+r.selectedTab+")");e.siblings().removeClass("selected");e.addClass("selected")}};var E=function(e){var t=e.offset(),n=f.offset(),i=t.left-n.left,s=n.left+f.outerWidth()-(t.left+e.outerWidth());if(i<0)r.slideTabs("right",-i);else if(s<0)r.slideTabs("left",-s)};var S=function(){if(y.transition=="slide")u.children("li").each(function(t,n){var r=u.children(".selected").index(),i=e(n).index();var s=c.children("#"+e(n).find("a").attr("href").substr(1));if(r<i)s.css({left:c.width()+"px"});else if(r>i)s.css({left:"-"+c.width()+"px"});else s.addClass(y.classes.panelActive)});if(y.transition=="fade")u.children("li").each(function(t,n){var r=u.children(".selected").index(),i=e(n).index();var s=c.children("#"+e(n).find("a").attr("href").substr(1));if(r!=i)s.css({opacity:0});else s.addClass(y.classes.panelActive)})};var x=function(e){return{hide:{slideleft:{left:"-"+e+"px"},slideright:{left:e+"px"},fade:{opacity:0}},show:{slide:{left:0},fade:{opacity:1}}}};var T=function(e,t){if(y.transition=="slide")var n="slide"+t;else var n=y.transition;e.animate(x(c.width())["hide"][n],y.transitionSpeed,y.transitionEasing,function(){e.hide();e.removeClass("selected");m=false;S()})};var N=function(e){e.show();e.addClass(y.classes.panelActive).addClass("selected");e.animate(x(c.width())["show"][y.transition],y.transitionSpeed,y.transitionEasing,function(){m=false;g=true;S()})};var C=function(e){if(!y.height)c.animate({height:O(e)},200)};var k=function(){if(y.panelArrows){if(!d&&!v){d=e("<div class='ui-slider-tabs-leftPanelArrow'>").click(function(){r.prev()});v=e("<div class='ui-slider-tabs-rightPanelArrow'>").click(function(){r.next()});d.appendTo(c);v.appendTo(c)}v.css({top:c.height()/2-v.outerHeight()/2});d.css({top:c.height()/2-d.outerHeight()/2})}};var L=function(){var t=0;u.children().each(function(n,r){t+=e(r).outerWidth(true)});u.width(t+50);if(f.width()<t&&y.tabArrows){r.showTabArrows();b=f.width()-t}else r.hideTabArrows()};var A=function(){a.width(c.width()-(a.outerWidth()-a.width()))};var O=function(e){var t={display:e.css("display"),left:e.css("left"),position:e.css("position")};e.css({display:"normal",left:-5e3,position:"absolute"});var n=e.outerHeight();e.css(t);return n};r.init()};e.fn.sliderTabs=function(t){return this.each(function(){var n=e(this),r=n.data("sliderTabs");if(!r){r=new e.sliderTabs(this,t);n.data("sliderTabs",r);return r}if(r.methods[t]){return r.methods[t].apply(this,Array.prototype.slice.call(arguments,1))}})}})(jQuery);(function(e){function r(t){var n=t||window.event,r=[].slice.call(arguments,1),i=0,s=true,o=0,u=0;t=e.event.fix(n);t.type="mousewheel";if(n.wheelDelta){i=n.wheelDelta/120}if(n.detail){i=-n.detail/3}u=i;if(n.axis!==undefined&&n.axis===n.HORIZONTAL_AXIS){u=0;o=-1*i}if(n.wheelDeltaY!==undefined){u=n.wheelDeltaY/120}if(n.wheelDeltaX!==undefined){o=-1*n.wheelDeltaX/120}r.unshift(t,i,o,u);return(e.event.dispatch||e.event.handle).apply(this,r)}var t=["DOMMouseScroll","mousewheel"];if(e.event.fixHooks){for(var n=t.length;n;){e.event.fixHooks[t[--n]]=e.event.mouseHooks}}e.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var e=t.length;e;){this.addEventListener(t[--e],r,false)}}else{this.onmousewheel=r}},teardown:function(){if(this.removeEventListener){for(var e=t.length;e;){this.removeEventListener(t[--e],r,false)}}else{this.onmousewheel=null}}};e.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})})(jQuery);(function(e,t,n){function c(){s=t[o](function(){r.each(function(){var t=e(this),n=t.width(),r=t.height(),i=e.data(this,a);if(n!==i.w||r!==i.h){t.trigger(u,[i.w=n,i.h=r])}});c()},i[f])}var r=e([]),i=e.resize=e.extend(e.resize,{}),s,o="setTimeout",u="resize",a=u+"-special-event",f="delay",l="throttleWindow";i[f]=250;i[l]=true;e.event.special[u]={setup:function(){if(!i[l]&&this[o]){return false}var t=e(this);r=r.add(t);e.data(this,a,{w:t.width(),h:t.height()});if(r.length===1){c()}},teardown:function(){if(!i[l]&&this[o]){return false}var t=e(this);r=r.not(t);t.removeData(a);if(!r.length){clearTimeout(s)}},add:function(t){function s(t,i,s){var o=e(this),u=e.data(this,a);u.w=i!==n?i:o.width();u.h=s!==n?s:o.height();r.apply(this,arguments)}if(!i[l]&&this[o]){return false}var r;if(e.isFunction(t)){r=t;return s}else{r=t.handler;t.handler=s}}}})(jQuery,this)
app/helper/BPMediaAddon.php CHANGED
@@ -23,6 +23,26 @@ if (!class_exists('BPMediaAddon')) {
23
  . '</a>';
24
  }
25
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
26
  public function get_addons() {
27
 
28
  $tabs = array();
@@ -39,12 +59,12 @@ if (!class_exists('BPMediaAddon')) {
39
  'href' => '#bpm-services',
40
  'callback' => array($bp_media_admin->bp_media_encoding, 'encoding_service_intro')
41
  );
42
- $tabs[] = array(
43
  'title' => 'Themes',
44
  'name' => __('Themes', 'buddypress-media'),
45
  'href' => '#bpm-themes',
46
  'callback' => array($this, 'themes_content')
47
- );
48
 
49
  ?>
50
  <div id="bpm-addons">
@@ -114,14 +134,19 @@ if (!class_exists('BPMediaAddon')) {
114
  );
115
  $addons = apply_filters('bp_media_addons', $addons);
116
 
117
- foreach ($addons as $key => $addon) {
118
- $this->addon($addon);
119
- if ( $key == 1 ) {
120
- echo '<h3>';
121
- _e('BuddyPress Media Addons for Audio/Video');
122
- echo '</h3>';
123
- }
124
- }
 
 
 
 
 
125
  }
126
 
127
  public function services_content($args = '') {
@@ -130,7 +155,7 @@ if (!class_exists('BPMediaAddon')) {
130
  $objEncoding->encoding_service_intro();
131
  }
132
 
133
- public function themes_content($param) {
134
  echo '<h3>Coming Soon !!</h3>';
135
  }
136
 
23
  . '</a>';
24
  }
25
 
26
+ public static function render_addons($page = '') {
27
+ global $wp_settings_sections, $wp_settings_fields;
28
+
29
+ if ( ! isset( $wp_settings_sections ) || !isset( $wp_settings_sections[$page] ) )
30
+ return;
31
+
32
+ foreach ( (array) $wp_settings_sections[$page] as $section ) {
33
+
34
+ if ( $section['callback'] )
35
+ call_user_func( $section['callback'], $section );
36
+
37
+ if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
38
+ continue;
39
+
40
+ echo '<table class="form-table">';
41
+ do_settings_fields( $page, $section['id'] );
42
+ echo '</table>';
43
+ }
44
+ }
45
+
46
  public function get_addons() {
47
 
48
  $tabs = array();
59
  'href' => '#bpm-services',
60
  'callback' => array($bp_media_admin->bp_media_encoding, 'encoding_service_intro')
61
  );
62
+ /* $tabs[] = array(
63
  'title' => 'Themes',
64
  'name' => __('Themes', 'buddypress-media'),
65
  'href' => '#bpm-themes',
66
  'callback' => array($this, 'themes_content')
67
+ );*/
68
 
69
  ?>
70
  <div id="bpm-addons">
134
  );
135
  $addons = apply_filters('bp_media_addons', $addons);
136
 
137
+ foreach ($addons as $key => $value) {
138
+
139
+ if($key == 0) {
140
+ echo '<h3>';
141
+ _e('BuddyPress Media Addons for Photos');
142
+ echo '</h3>';
143
+ } else if($key == 2) {
144
+ echo '<h3>';
145
+ _e('BuddyPress Media Addons for Audio/Video');
146
+ echo '</h3>';
147
+ }
148
+ $this->addon($value);
149
+ }
150
  }
151
 
152
  public function services_content($args = '') {
155
  $objEncoding->encoding_service_intro();
156
  }
157
 
158
+ public function themes_content($args = '') {
159
  echo '<h3>Coming Soon !!</h3>';
160
  }
161
 
app/helper/BPMediaSupport.php CHANGED
@@ -13,7 +13,7 @@ if (!class_exists('BPMediaSupport')) {
13
 
14
  public function __construct() {
15
  $this->debug_info();
16
- add_action('bp_media_admin_page_append', array($this, 'debug_info_html'));
17
  }
18
 
19
  public function debug_info() {
13
 
14
  public function __construct() {
15
  $this->debug_info();
16
+ add_action('bp_media_admin_page_insert', array($this, 'debug_info_html'));
17
  }
18
 
19
  public function debug_info() {
app/helper/rtForm.php CHANGED
@@ -309,7 +309,7 @@ if(!class_exists("rtForm")) {
309
  if( isset($attributes['label']) )
310
  $html = $this->enclose_label($element, $html, $attributes['label']);
311
 
312
- if($attributes['show_desc'])
313
  $html .= $this->generate_element_desc($attributes);
314
 
315
  return $html;
@@ -340,7 +340,7 @@ if(!class_exists("rtForm")) {
340
  if( isset($attributes['label']) )
341
  $html = $this->enclose_label($element, $html, $attributes['label']);
342
 
343
- if(isset($attributes['show_desc']))
344
  $html .= $this->generate_element_desc($attributes);
345
 
346
  return $html;
@@ -371,7 +371,7 @@ if(!class_exists("rtForm")) {
371
  if( isset($attributes['label']) )
372
  $html = $this->enclose_label($element, $html, $attributes['label']);
373
 
374
- if($attributes['show_desc'])
375
  $html .= $this->generate_element_desc($attributes);
376
 
377
  return $html;
@@ -401,7 +401,7 @@ if(!class_exists("rtForm")) {
401
  if( isset($attributes['label']) )
402
  $html = $this->enclose_label($element, $html, $attributes['label']);
403
 
404
- if($attributes['show_desc'])
405
  $html .= $this->generate_element_desc($attributes);
406
 
407
  return $html;
@@ -459,7 +459,7 @@ if(!class_exists("rtForm")) {
459
  $meta = $this->parse_multiple_options($element, $attributes);
460
  $html .= $this->container_enclosed_elements($element, $meta['attrib'], $meta['rtForm_options']);
461
 
462
- if($attributes['show_desc'])
463
  $html .= $this->generate_element_desc($attributes);
464
 
465
  $container = '<span ';
@@ -493,7 +493,7 @@ if(!class_exists("rtForm")) {
493
  $meta = $this->parse_multiple_options($element, $attributes);
494
  $html .= $this->container_enclosed_elements($element, $meta['attrib'], $meta['rtForm_options']);
495
 
496
- if($attributes['show_desc'])
497
  $html .= $this->generate_element_desc($attributes);
498
 
499
  $container = '<span ';
@@ -555,7 +555,7 @@ if(!class_exists("rtForm")) {
555
  if( isset($attributes['label']) )
556
  $html = $this->enclose_label($element, $html, $attributes['label']);
557
 
558
- if($attributes['show_desc'])
559
  $html .= $this->generate_element_desc($attributes);
560
 
561
  return $html;
309
  if( isset($attributes['label']) )
310
  $html = $this->enclose_label($element, $html, $attributes['label']);
311
 
312
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
313
  $html .= $this->generate_element_desc($attributes);
314
 
315
  return $html;
340
  if( isset($attributes['label']) )
341
  $html = $this->enclose_label($element, $html, $attributes['label']);
342
 
343
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
344
  $html .= $this->generate_element_desc($attributes);
345
 
346
  return $html;
371
  if( isset($attributes['label']) )
372
  $html = $this->enclose_label($element, $html, $attributes['label']);
373
 
374
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
375
  $html .= $this->generate_element_desc($attributes);
376
 
377
  return $html;
401
  if( isset($attributes['label']) )
402
  $html = $this->enclose_label($element, $html, $attributes['label']);
403
 
404
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
405
  $html .= $this->generate_element_desc($attributes);
406
 
407
  return $html;
459
  $meta = $this->parse_multiple_options($element, $attributes);
460
  $html .= $this->container_enclosed_elements($element, $meta['attrib'], $meta['rtForm_options']);
461
 
462
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
463
  $html .= $this->generate_element_desc($attributes);
464
 
465
  $container = '<span ';
493
  $meta = $this->parse_multiple_options($element, $attributes);
494
  $html .= $this->container_enclosed_elements($element, $meta['attrib'], $meta['rtForm_options']);
495
 
496
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
497
  $html .= $this->generate_element_desc($attributes);
498
 
499
  $container = '<span ';
555
  if( isset($attributes['label']) )
556
  $html = $this->enclose_label($element, $html, $attributes['label']);
557
 
558
+ if( isset($attributes['show_desc']) && $attributes['show_desc'] )
559
  $html .= $this->generate_element_desc($attributes);
560
 
561
  return $html;
app/services/BPMediaEncoding.php CHANGED
@@ -21,7 +21,7 @@ class BPMediaEncoding {
21
  add_action('bp_media_before_default_admin_widgets', array($this, 'usage_widget'));
22
  }
23
  add_action('admin_init', array($this, 'save_api_key'), 1);
24
- add_filter('bp_media_add_admin_bar_item', array($this, 'admin_bar_menu'));
25
  if ($this->api_key) {
26
  $usage_info = bp_get_option('bp-media-encoding-usage');
27
  if ($usage_info) {
21
  add_action('bp_media_before_default_admin_widgets', array($this, 'usage_widget'));
22
  }
23
  add_action('admin_init', array($this, 'save_api_key'), 1);
24
+ // add_filter('bp_media_add_admin_bar_item', array($this, 'admin_bar_menu'));
25
  if ($this->api_key) {
26
  $usage_info = bp_get_option('bp-media-encoding-usage');
27
  if ($usage_info) {
index.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: BuddyPress Media
4
  Plugin URI: http://rtcamp.com/buddypress-media/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
5
  Description: This plugin adds missing media rich features like photos, videos and audio uploading to BuddyPress which are essential if you are building social network, seriously!
6
- Version: 2.14
7
  Author: rtCamp
8
  Text Domain: buddypress-media
9
  Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
3
  Plugin Name: BuddyPress Media
4
  Plugin URI: http://rtcamp.com/buddypress-media/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
5
  Description: This plugin adds missing media rich features like photos, videos and audio uploading to BuddyPress which are essential if you are building social network, seriously!
6
+ Version: 2.15
7
  Author: rtCamp
8
  Text Domain: buddypress-media
9
  Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
readme.txt CHANGED
@@ -6,7 +6,7 @@ License: GPLv2 or later
6
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
7
  Requires at least: WordPress 3.5 + BuddyPress 1.6
8
  Tested up to: WordPress 3.5 + BuddyPress 1.7
9
- Stable tag: 2.14
10
 
11
  Adds Photos, Music, Videos & Albums to BuddyPress. Supports mobile devices (iPhone/iPad, etc) and automatic audio/video conversion.
12
 
@@ -150,6 +150,9 @@ Please visit [BuddyPress Media's Features page](http://rtcamp.com/buddypress-med
150
 
151
  Please visit [BuddyPress Media's Roadmap page](http://rtcamp.com/buddypress-media/roadmap/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "Visit BuddyPress Media's Features page") to get some details about future releases.
152
 
 
 
 
153
  = 2.14 =
154
  * Improves admin ui, preview of things to come.
155
  * Fixes some bugs.
@@ -444,5 +447,5 @@ Please visit [BuddyPress Media's Roadmap page](http://rtcamp.com/buddypress-medi
444
  * HTML5 Video Tag Support (with fallback)
445
 
446
  == Upgrade Notice ==
447
- = 2.14 =
448
- Admin refactor
6
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
7
  Requires at least: WordPress 3.5 + BuddyPress 1.6
8
  Tested up to: WordPress 3.5 + BuddyPress 1.7
9
+ Stable tag: 2.15
10
 
11
  Adds Photos, Music, Videos & Albums to BuddyPress. Supports mobile devices (iPhone/iPad, etc) and automatic audio/video conversion.
12
 
150
 
151
  Please visit [BuddyPress Media's Roadmap page](http://rtcamp.com/buddypress-media/roadmap/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "Visit BuddyPress Media's Features page") to get some details about future releases.
152
 
153
+ = 2.15 =
154
+ * Fixes bugs in Admin settings
155
+
156
  = 2.14 =
157
  * Improves admin ui, preview of things to come.
158
  * Fixes some bugs.
447
  * HTML5 Video Tag Support (with fallback)
448
 
449
  == Upgrade Notice ==
450
+ = 2.15 =
451
+ Bug fixes for admin screen