rtMedia for WordPress, BuddyPress and bbPress - Version 2.10

Version Description

  • Adds album management options (Merge/Move/Delete)
  • Adds shortcode to display media [bpmedia]
  • Adds localization to JS
  • Added partial Arabic and Persion translations
Download this release

Release Info

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

Code changes from version 2.9 to 2.10

app/admin/BPMediaAdmin.php CHANGED
@@ -19,6 +19,10 @@ if (!class_exists('BPMediaAdmin')) {
19
 
20
  public function __construct() {
21
  add_action('init', array($this, 'video_transcoding_survey_response'));
 
 
 
 
22
  $bp_media_feed = new BPMediaFeed();
23
  add_action('wp_ajax_bp_media_fetch_feed', array($bp_media_feed, 'fetch_feed'), 1);
24
  $this->bp_media_support = new BPMediaSupport();
@@ -33,6 +37,7 @@ if (!class_exists('BPMediaAdmin')) {
33
  add_action('wp_ajax_bp_media_bp_album_import_step_favorites', 'BPMediaAlbumimporter::bpmedia_ajax_import_step_favorites', 1);
34
  add_action('wp_ajax_bp_media_bp_album_cleanup', 'BPMediaAlbumimporter::cleanup_after_install');
35
  add_action('wp_ajax_bp_media_convert_videos_form', array($this, 'convert_videos_mailchimp_send'), 1);
 
36
  add_filter('plugin_row_meta', array($this, 'plugin_meta_premium_addon_link'), 1, 4);
37
  if (is_admin()) {
38
  add_action('admin_enqueue_scripts', array($this, 'ui'));
@@ -59,6 +64,11 @@ if (!class_exists('BPMediaAdmin')) {
59
  $admin_ajax = admin_url('admin-ajax.php');
60
  wp_enqueue_script('bp-media-admin', BP_MEDIA_URL . 'app/assets/js/admin.js', '', BP_MEDIA_VERSION);
61
  wp_localize_script('bp-media-admin', 'bp_media_admin_ajax', $admin_ajax);
 
 
 
 
 
62
  wp_localize_script('bp-media-admin', 'settings_url', add_query_arg(
63
  array('page' => 'bp-media-settings'), (is_multisite() ? network_admin_url('admin.php') : admin_url('admin.php'))
64
  ) . '#privacy_enabled');
@@ -80,9 +90,9 @@ if (!class_exists('BPMediaAdmin')) {
80
  if (!BPMediaPrivacy::is_installed()) {
81
  add_submenu_page('bp-media-settings', __('BuddyPress Media Database Update', 'buddypress-media'), __('Update Database', 'buddypress-media'), 'manage_options', 'bp-media-privacy', array($this, 'privacy_page'));
82
  }
83
-
84
  add_submenu_page('bp-media-settings', __('Importer', 'buddypress-media'), __('Importer', 'buddypress-media'), 'manage_options', 'bp-media-importer', array($this, 'bp_importer_page'));
85
-
86
  add_submenu_page('bp-media-settings', __('BuddyPress Media Addons', 'buddypress-media'), __('Addons', 'buddypress-media'), 'manage_options', 'bp-media-addons', array($this, 'addons_page'));
87
  add_submenu_page('bp-media-settings', __('BuddyPress Media Support', 'buddypress-media'), __('Support ', 'buddypress-media'), 'manage_options', 'bp-media-support', array($this, 'support_page'));
88
  if (bp_get_option('bp-media-survey', true)) {
@@ -254,7 +264,7 @@ if (!class_exists('BPMediaAdmin')) {
254
  'class' => ($tab == 'bp-media-convert-videos') ? $active_class : $idle_class . ' last_tab'
255
  );
256
  }
257
-
258
  $tabs[] = array(
259
  'href' => bp_get_admin_url(add_query_arg(array('page' => 'bp-media-importer'), 'admin.php')),
260
  'title' => __('Importer', 'buddypress-media'),
@@ -431,6 +441,93 @@ if (!class_exists('BPMediaAdmin')) {
431
  return $plugin_meta;
432
  }
433
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
434
  }
435
 
436
  }
19
 
20
  public function __construct() {
21
  add_action('init', array($this, 'video_transcoding_survey_response'));
22
+ if (is_multisite()) {
23
+ add_action('network_admin_notices', array($this, 'upload_filetypes_error'));
24
+ add_action('admin_notices', array($this, 'upload_filetypes_error'));
25
+ }
26
  $bp_media_feed = new BPMediaFeed();
27
  add_action('wp_ajax_bp_media_fetch_feed', array($bp_media_feed, 'fetch_feed'), 1);
28
  $this->bp_media_support = new BPMediaSupport();
37
  add_action('wp_ajax_bp_media_bp_album_import_step_favorites', 'BPMediaAlbumimporter::bpmedia_ajax_import_step_favorites', 1);
38
  add_action('wp_ajax_bp_media_bp_album_cleanup', 'BPMediaAlbumimporter::cleanup_after_install');
39
  add_action('wp_ajax_bp_media_convert_videos_form', array($this, 'convert_videos_mailchimp_send'), 1);
40
+ add_action('wp_ajax_bp_media_correct_upload_filetypes', array($this, 'correct_upload_filetypes'), 1);
41
  add_filter('plugin_row_meta', array($this, 'plugin_meta_premium_addon_link'), 1, 4);
42
  if (is_admin()) {
43
  add_action('admin_enqueue_scripts', array($this, 'ui'));
64
  $admin_ajax = admin_url('admin-ajax.php');
65
  wp_enqueue_script('bp-media-admin', BP_MEDIA_URL . 'app/assets/js/admin.js', '', BP_MEDIA_VERSION);
66
  wp_localize_script('bp-media-admin', 'bp_media_admin_ajax', $admin_ajax);
67
+ $bp_media_admin_strings = array(
68
+ 'no_refresh' => __('Please do not refresh this page.', 'buddypress-media'),
69
+ 'something_went_wrong' => __('Something went wronng. Please <a href onclick="location.reload();">refresh</a> page.', 'buddypress-media')
70
+ );
71
+ wp_localize_script('bp-media-admin', 'bp_media_admin_strings', $bp_media_admin_strings);
72
  wp_localize_script('bp-media-admin', 'settings_url', add_query_arg(
73
  array('page' => 'bp-media-settings'), (is_multisite() ? network_admin_url('admin.php') : admin_url('admin.php'))
74
  ) . '#privacy_enabled');
90
  if (!BPMediaPrivacy::is_installed()) {
91
  add_submenu_page('bp-media-settings', __('BuddyPress Media Database Update', 'buddypress-media'), __('Update Database', 'buddypress-media'), 'manage_options', 'bp-media-privacy', array($this, 'privacy_page'));
92
  }
93
+
94
  add_submenu_page('bp-media-settings', __('Importer', 'buddypress-media'), __('Importer', 'buddypress-media'), 'manage_options', 'bp-media-importer', array($this, 'bp_importer_page'));
95
+
96
  add_submenu_page('bp-media-settings', __('BuddyPress Media Addons', 'buddypress-media'), __('Addons', 'buddypress-media'), 'manage_options', 'bp-media-addons', array($this, 'addons_page'));
97
  add_submenu_page('bp-media-settings', __('BuddyPress Media Support', 'buddypress-media'), __('Support ', 'buddypress-media'), 'manage_options', 'bp-media-support', array($this, 'support_page'));
98
  if (bp_get_option('bp-media-survey', true)) {
264
  'class' => ($tab == 'bp-media-convert-videos') ? $active_class : $idle_class . ' last_tab'
265
  );
266
  }
267
+
268
  $tabs[] = array(
269
  'href' => bp_get_admin_url(add_query_arg(array('page' => 'bp-media-importer'), 'admin.php')),
270
  'title' => __('Importer', 'buddypress-media'),
441
  return $plugin_meta;
442
  }
443
 
444
+ public function upload_filetypes_error() {
445
+ global $bp_media;
446
+ $upload_filetypes = get_site_option('upload_filetypes', 'jpg jpeg png gif');
447
+ $upload_filetypes = explode(' ', $upload_filetypes);
448
+ $flag = false;
449
+ if (isset($bp_media->options['images_enabled']) && $bp_media->options['images_enabled']) {
450
+ $not_supported_image = array_diff(array('jpg', 'jpeg', 'png', 'gif'), $upload_filetypes);
451
+ if (!empty($not_supported_image)) {
452
+ echo '<div class="error upload-filetype-network-settings-error">
453
+ <p>
454
+ ' . sprintf(__('You have images enabled on BuddyPress Media but your network allowed filetypes does not allow uploading of %s. Click <a href="%s">here</a> to change your settings manually.', 'buddypress-media'), implode(', ', $not_supported_image), network_admin_url('settings.php#upload_filetypes')) . '
455
+ <br /><strong>' . __('Recommended', 'buddypress-media') . ':</strong> <input type="button" class="button update-network-settings-upload-filetypes" class="button" value="' . __('Update Network Settings Automatically', 'buddypress-media') . '"> <img style="display:none;" src="' . admin_url('images/wpspin_light.gif') . '" />
456
+ </p>
457
+ </div>';
458
+ $flag = true;
459
+ }
460
+ }
461
+ if (isset($bp_media->options['videos_enabled']) && $bp_media->options['videos_enabled']) {
462
+ if (!in_array('mp4', $upload_filetypes)) {
463
+ echo '<div class="error upload-filetype-network-settings-error">
464
+ <p>
465
+ ' . sprintf(__('You have video enabled on BuddyPress Media but your network allowed filetypes does not allow uploading of mp4. Click <a href="%s">here</a> to change your settings manually.', 'buddypress-media'), network_admin_url('settings.php#upload_filetypes')) . '
466
+ <br /><strong>' . __('Recommended', 'buddypress-media') . ':</strong> <input type="button" class="button update-network-settings-upload-filetypes" class="button" value="' . __('Update Network Settings Automatically', 'buddypress-media') . '"> <img style="display:none;" src="' . admin_url('images/wpspin_light.gif') . '" />
467
+ </p>
468
+ </div>';
469
+ $flag = true;
470
+ }
471
+ }
472
+ if (isset($bp_media->options['audio_enabled']) && $bp_media->options['audio_enabled']) {
473
+ if (!in_array('mp3', $upload_filetypes)) {
474
+ echo '<div class="error upload-filetype-network-settings-error"><p>' . sprintf(__('You have audio enabled on BuddyPress Media but your network allowed filetypes does not allow uploading of mp3. Click <a href="%s">here</a> to change your settings manually.', 'buddypress-media'), network_admin_url('settings.php#upload_filetypes')) . '
475
+ <br /><strong>' . __('Recommended', 'buddypress-media') . ':</strong> <input type="button" class="button update-network-settings-upload-filetypes" class="button" value="' . __('Update Network Settings Automatically', 'buddypress-media') . '"> <img style="display:none;" src="' . admin_url('images/wpspin_light.gif') . '" />
476
+ </p>
477
+ </div>';
478
+ $flag = true;
479
+ }
480
+ }
481
+ if ($flag) {
482
+ ?>
483
+ <script type="text/javascript">
484
+ jQuery('.upload-filetype-network-settings-error').on('click','.update-network-settings-upload-filetypes', function(){
485
+ jQuery('.update-network-settings-upload-filetypes').siblings('img').show();
486
+ jQuery('.update-network-settings-upload-filetypes').prop('disabled',true);
487
+ jQuery.post(ajaxurl,{action: 'bp_media_correct_upload_filetypes'}, function(response){
488
+ if(response){
489
+ jQuery('.upload-filetype-network-settings-error:first').after('<div style="display: none;" class="updated bp-media-network-settings-updated-successfully"><p><?php _e('Network settings updated successfully.', 'buddypress-media'); ?></p></div>')
490
+ jQuery('.upload-filetype-network-settings-error').remove();
491
+ jQuery('.bp-media-network-settings-updated-successfully').show();
492
+ }
493
+ });
494
+ }); </script><?php
495
+ }
496
+ }
497
+
498
+ public function correct_upload_filetypes() {
499
+ global $bp_media;
500
+ $upload_filetypes_orig = $upload_filetypes = get_site_option('upload_filetypes', 'jpg jpeg png gif');
501
+ $upload_filetypes = explode(' ', $upload_filetypes);
502
+ if (isset($bp_media->options['images_enabled']) && $bp_media->options['images_enabled']) {
503
+ $not_supported_image = array_diff(array('jpg', 'jpeg', 'png', 'gif'), $upload_filetypes);
504
+ if (!empty($not_supported_image)) {
505
+ $update_image_support = NULL;
506
+ foreach ($not_supported_image as $ns) {
507
+ $update_image_support .= ' ' . $ns;
508
+ }
509
+ if ($update_image_support) {
510
+ $upload_filetypes_orig .= $update_image_support;
511
+ update_site_option('upload_filetypes', $upload_filetypes_orig);
512
+ }
513
+ }
514
+ }
515
+ if (isset($bp_media->options['videos_enabled']) && $bp_media->options['videos_enabled']) {
516
+ if (!in_array('mp4', $upload_filetypes)) {
517
+ $upload_filetypes_orig .= ' mp4';
518
+ update_site_option('upload_filetypes', $upload_filetypes_orig);
519
+ }
520
+ }
521
+ if (isset($bp_media->options['audio_enabled']) && $bp_media->options['audio_enabled']) {
522
+ if (!in_array('mp3', $upload_filetypes)) {
523
+ $upload_filetypes_orig .= ' mp3';
524
+ update_site_option('upload_filetypes', $upload_filetypes_orig);
525
+ }
526
+ }
527
+ echo true;
528
+ die();
529
+ }
530
+
531
  }
532
 
533
  }
app/assets/css/main.css CHANGED
@@ -54,16 +54,16 @@ ul#social li{display:inline;}
54
  /* Addons page Styling */
55
 
56
  a.toplevel_page_bp-media-settings div.wp-menu-image{
57
- background:url('../img/admin-menu.png') 0 -32px no-repeat;
58
  }
59
 
60
  #rt-donate-button, .rt-link img{vertical-align: middle;}
61
  #adminmenu .menu-icon-generic.toplevel_page_bp-media-settings div.wp-menu-image{
62
- background-position: 0 -32px;
63
  }
64
  #adminmenu .menu-icon-generic.wp-has-current-submenu.toplevel_page_bp-media-settings div.wp-menu-image,
65
  #adminmenu .menu-icon-generic.toplevel_page_bp-media-settings:hover div.wp-menu-image{
66
- background-position-y:0;
67
  }
68
 
69
  #bp-media-addons-list_metabox {background: #ffffff}
@@ -97,33 +97,72 @@ div.bp-album-import-accept{ padding: 1px 2px; margin-bottom: 15px; }
97
  .bp-album-importer-wizard { display: none; margin-top: 15px; }
98
  #setting-error-bp-album-importer { line-height: 1.8em; }
99
  .wp-core-ui .btn-warning {
100
- color: #ffffff;
101
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
102
- background-color: #faa732;
103
- *background-color: #f89406;
104
- background-image: -moz-linear-gradient(top, #fbb450, #f89406);
105
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
106
- background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
107
- background-image: -o-linear-gradient(top, #fbb450, #f89406);
108
- background-image: linear-gradient(to bottom, #fbb450, #f89406);
109
- background-repeat: repeat-x;
110
- border-color: #f89406 #f89406 #ad6704;
111
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
112
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
113
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
114
  }
115
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
116
  .wp-core-ui .btn-warning:hover,
117
  .wp-core-ui .btn-warning:focus,
118
  .wp-core-ui .btn-warning:active,
119
  .wp-core-ui .btn-warning.active,
120
  .wp-core-ui .btn-warning.disabled,
121
  .wp-core-ui .btn-warning[disabled] {
122
- color: #ffffff;
123
- background: #f89406;
124
- background-color: #f89406;
125
- *background: #df8505;
126
- *background-color: #df8505;
127
  }
128
 
129
  /* Admin bar Menu */
@@ -147,7 +186,7 @@ div.bp-album-import-accept{ padding: 1px 2px; margin-bottom: 15px; }
147
  .bp-media-support-attachment .add-more-attachment-btn{clear: both;display: inline-block;margin-left: 160px;margin-top: 10px;}
148
  .template_select_label{float: left}
149
  .template_select_container{overflow-x:scroll; width:405px;float: left}
150
- #bp_media_settings_form .support_form_laoder{height: 100px; width: 200px; background: url("../img/loader.gif") no-repeat }
151
  /* Miscellaneous */
152
  #normal-sortables .postbox .bp-media-form .submit{float: none; margin-left: 150px}
153
  .rt-success{background-color: #E1FFDF;border-color: #2ACF2A;}
@@ -158,26 +197,33 @@ img.bp-media-donation-image{display:block;margin: 10px auto;}
158
  .para-blockquote { background: #E5E5E5; padding: 10px; font-style: italic; }
159
  #latest-update img, #members-list .update img, #members-list .update {display:block; overflow: hidden;}
160
  #rtprogressbar {
161
- background-color: #444;
162
- border-radius: 13px;
163
- padding: 3px;
164
  }
165
 
166
  #rtprogressbar div {
167
- background-color: #fb6003;
168
- width: 0;
169
- height: 20px;
170
- border-radius: 10px;
171
  }
172
 
173
 
174
  .bp_media_content img{max-width:100%;}
175
  .bp_media_content .mejs-poster img{max-width: 100%;}
176
- .media.albums .album-edit{display:inline;}
 
 
 
 
177
  .media h3 {display:block;font-size:20px;font-weight:bold;}
178
  ul.bp-media-gallery{overflow: hidden}
179
  .bp_media_description {display:block;margin-top:20px;}
180
- ul.bp-media-gallery.item-list{overflow:visible;margin: 1% 0;width: auto;}
 
 
 
181
  #item-body ul.bp-media-gallery li{float: left;margin: 1% 1% 0;width: 18%;border-bottom: none;padding: 0;position: static;height:auto; display:block;}
182
  ul.bp-media-gallery li img{max-width:150px;width:100%;height:auto;-moz-box-shadow: 1px 1px 10px #a0a0a0;-webkit-box-shadow: 1px 1px 10px #a0a0a0;box-shadow: 1px 1px 10px #a0a0a0;-moz-transition: box-shadow 0.2s linear;-webkit-transition: box-shadow 0.2s linear;transition: box-shadow 0.2s linear;}
183
  ul.bp-media-gallery li img:hover{-moz-box-shadow: 1px 1px 10px #333;-webkit-box-shadow: 1px 1px 10px #333;box-shadow: 1px 1px 10px #333;}
@@ -193,10 +239,12 @@ ul.bp-media-gallery li span img{height: 150px;}
193
  #item-body:after,ul.bp-media-gallery.item-list:after{content: " ";clear: both;display: block;text-indent: -9999em;}
194
  #item-body{position: relative;}
195
 
 
 
196
  #bp-media-activity-upload-ui { width: 50%;}
197
  .bp-media-area-allocate{height: 10px;width: 100%;display: block;}
198
  li #bp-media-upload-ui {padding: 0;max-width: 158px;position: relative;}
199
- #bp-media-upload-ui {margin-top: 10px;}
200
  #bp-media-upload-ui #drag-drop-area{border: 4px dashed #DDD;text-align: center;background: #fafafa;overflow: hidden;padding: 15px 0;}
201
  #bp-media-upload-ui.hover #drag-drop-area {border-color: #83b4d8;}
202
  li #bp-media-upload-ui #drag-drop-area{max-width: 150px;min-height: auto;}
@@ -236,8 +284,8 @@ li #bp-media-uploaded-files{left: 0;position: absolute;top: 155px;}
236
  .bpm-aligncenter{display: inline-block;text-align: center;width: 100%;}
237
  #bp-media-premium-addons ul,#bp-media-premium-addons li{list-style:disc;margin-left:10px;}
238
  .bp-media-single div.bp_media_content{text-align:center;width: auto;
239
- margin: 0 auto;
240
- position: relative;}
241
  .bp-media-single .bp_media_content .mejs-container{margin-left:auto;margin-right:auto;}
242
 
243
  .bp-media-actions{margin:20px 0;}
@@ -260,6 +308,7 @@ position: relative;}
260
  .media-tabs-container .widget-item-listing li h3 a{font-size: 13px;font-weight: normal;word-wrap: break-word; }
261
 
262
  #bp-media-show-more{width: 200px;margin-left: auto;margin-right: auto;display: block;height: 30px;line-height: 30px;font-size: 20px;}
 
263
  #bp-media-upload-ui.activity-component{margin-left: 74px;margin-top: 10px;}
264
  ul#activity-stream li.media.album_updated ul{}
265
  ul#activity-stream li.media.album_updated ul li,ul.bp-media-list-media li{float: left;margin-right:2%}
@@ -273,177 +322,177 @@ body.media {overflow:auto;}
273
  #bp-media-upload-set-privacy .album-set-privacy-label{margin: 0;font-weight: normal;}
274
 
275
  .bp-media-single .delete-activity-single,.bp-media-single .delete-activity{
276
- color: #ff0000;
277
- font-weight:bold;
278
  }
279
  .simplemodal-overlay{
280
- background:#333 none;
281
- z-index: 100000;
282
  }
283
  .simplemodal-container{
284
- background:#fff none;
285
  }
286
  .bp-media-mod-title{
287
- display:none;
288
  }
289
 
290
  .bp-media-ajax-single{
291
- padding:0;
292
  }
293
  .bp-media-ajax-single .lightbox-spinner{
294
- height:24px;
295
- width:24px;
296
- background: url("../img/boxspinner.gif") center center;
297
- left:50%;
298
- top:50%;
299
- position:absolute;
300
  }
301
  .simplemodal-container .simplemodal-close{
302
- background: url("../img/bp-media-modal.png") right bottom no-repeat;
303
- width:22px;
304
- height:22px;
305
- display:block;
306
- position:absolute;
307
- right:0px;
308
- top:0px;
309
- cursor: pointer;
310
  }
311
  .simplemodal-container .simplemodal-close:hover{
312
- background-position: right top;
313
  }
314
  .simplemodal-container a.modal-ctrl{
315
- position:absolute;
316
- height:100%;
317
- height:100px;
318
- width:100px;
319
- top:50%;
320
- margin-top:-50px;
321
- cursor: pointer;
322
  }
323
  .simplemodal-container a.modal-ctrl:hover{
324
- background: #232323 none;
325
  }
326
  .simplemodal-container a.modal-ctrl span.img-icon{
327
- display: block;
328
- height:22px;
329
- width:22px;
330
- margin:39px auto 39px 10px;
331
 
332
- background: url("../img/bp-media-modal.png") left bottom no-repeat;
333
  }
334
  .simplemodal-container a.modal-next span.img-icon{
335
- background-position: center bottom;
336
- margin:39px 10px 39px auto;
337
  }
338
  .simplemodal-container a.modal-prev:hover span.img-icon{
339
- background-position: left top;
340
  }
341
  .simplemodal-container a.modal-next:hover span.img-icon{
342
- background-position: center top;
343
  }
344
  .simplemodal-container a.modal-prev:hover,
345
  .simplemodal-container a.modal-next:hover{
346
- background:url("../img/") no-repeat;
347
  }
348
  .simplemodal-container a.modal-prev{
349
- left: 0px;
350
  }
351
  .simplemodal-container a.modal-next{
352
- right: 0px;
353
  }
354
 
355
  .bp-media-ajax-single .bp-media-mod-title{
356
- display:block;
357
- margin-top:22px;
358
  }
359
  .bp-media-ajax-single .bp-media-mod-title h2{
360
- margin: 5px 0;
361
- padding:0;
362
  }
363
  .bp-media-ajax-single .bp-media-mod-title p{
364
- line-height:1.4em;
365
  }
366
  .bp-media-ajax-single .bp_media_content img,
367
  .bp-media-ajax-single .bp_media_content video,
368
  .bp-media-ajax-single .bp_media_content audio{
369
- max-width: 100%;
370
- display:inline-block;
371
- margin:0 auto;
372
- vertical-align: middle;
373
- background:#fff none;
374
- max-height:600px;
375
  }
376
  .bp-media-ajax-single .bp_media_author{
377
- position:absolute;
378
- top:0;
379
- left:0;
380
  }
381
  .bp-media-ajax-single .bp-media-content-wrap,
382
  .bp-media-ajax-single .bp_media_content{
383
- float:left;
384
- width:auto;
385
- margin:0;
386
- position:relative;
387
- overflow:hidden;
388
- height:480px;
389
- min-width:640px;
390
- background: #333 none;
391
- display:table;
392
 
393
  }
394
  .bp-media-ajax-single .bp_media_content{
395
- display:table-cell;
396
- vertical-align: middle;
397
- float:none;
398
  }
399
  .bp-media-ajax-single .bp-media-content-wrap .bp_media_description{
400
- display:block;
401
- position:absolute;
402
- bottom:0;
403
- left:0;
404
  }
405
  .bp-media-ajax-single .bp-media-meta-content-wrap{
406
- float:left;
407
- width:250px;
408
- margin:0;
409
- min-height:480px;
410
- margin-left:10px;
411
- overflow:auto;
412
  }
413
  .bp-media-ajax-single .bp-media-meta-content-wrap .activity-meta{
414
- margin:0;
415
  }
416
  .bp-media-ajax-single .bp-media-meta-content-wrap .activity-meta a{
417
- padding: 2px 8px;
418
- margin: 5px 5px 0 0;
419
- display:inline-block;
420
  }
421
  .bp-media-ajax-single .bp-media-meta-content-wrap div.activity-comments ul li > ul{
422
- margin-left:0;
423
- padding-left:0;
424
  }
425
  .bp-media-ajax-single .bp-media-meta-content-wrap div.activity-comments form div.ac-reply-content{
426
- margin-left:0;
427
- padding-left:0;
428
  }
429
  /*.bp-media-ajax-single .bp-media-meta-content-wrap div.activity-meta a {
430
  padding: 0;
431
  float:left;
432
  }*/
433
  .bp-media-ajax-preloader{
434
- display:none;
435
  }
436
 
437
  @media (min-width: 981px) and (max-width: 1096px) {
438
  li #bp-media-upload-ui #drag-drop-area{padding: 10px 0;}
439
- /* li #bp-media-upload-ui .drag-drop-inside{margin: 0 auto;}*/
440
  li #bp-media-album-in, .albums li #bp-media-album-or{margin: 15px auto;}
441
  li #bp-media-upload-ui .drag-drop-inside p.drag-drop-info{font-size: 17px;}
442
  li #bp-media-upload-ui .drag-drop-buttons input{padding: 3px 8px;}
443
  li #bp-media-uploaded-files{top: 130px}
444
  li #bp-media-upload-ui #bp-media-album-prompt{margin-top: 0;}
445
  li #bp-media-album-prompt input.button{padding: 3px;}
446
- /* .albums li #bp-media-upload-ui #drag-drop-area{padding: 10px 0 0;}*/
447
  }
448
  @media (max-width: 980px) {
449
  #item-body ul.bp-media-gallery li{width: 23%;}
@@ -470,7 +519,7 @@ float:left;
470
  ul.bp-media-gallery li img,li #bp-media-upload-ui #drag-drop-area{max-width: 170px;width: 100%;}
471
  li #bp-media-upload-ui #drag-drop-area{max-width: 162px;padding: 20px 0;}
472
  #bp-media-upload-ui .drag-drop-area{padding: 23px 0 10px;}
473
- /* li #bp-media-upload-ui .drag-drop-inside{margin: 0 auto 23px;}*/
474
  }
475
  @media (max-width: 379px) {
476
  #bp-media-upload-ui{min-height: 190px;}
54
  /* Addons page Styling */
55
 
56
  a.toplevel_page_bp-media-settings div.wp-menu-image{
57
+ background:url('../img/admin-menu.png') 0 -32px no-repeat;
58
  }
59
 
60
  #rt-donate-button, .rt-link img{vertical-align: middle;}
61
  #adminmenu .menu-icon-generic.toplevel_page_bp-media-settings div.wp-menu-image{
62
+ background-position: 0 -32px;
63
  }
64
  #adminmenu .menu-icon-generic.wp-has-current-submenu.toplevel_page_bp-media-settings div.wp-menu-image,
65
  #adminmenu .menu-icon-generic.toplevel_page_bp-media-settings:hover div.wp-menu-image{
66
+ background-position-y:0;
67
  }
68
 
69
  #bp-media-addons-list_metabox {background: #ffffff}
97
  .bp-album-importer-wizard { display: none; margin-top: 15px; }
98
  #setting-error-bp-album-importer { line-height: 1.8em; }
99
  .wp-core-ui .btn-warning {
100
+ color: #ffffff;
101
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
102
+ background-color: #faa732;
103
+ *background-color: #f89406;
104
+ background-image: -moz-linear-gradient(top, #fbb450, #f89406);
105
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
106
+ background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
107
+ background-image: -o-linear-gradient(top, #fbb450, #f89406);
108
+ background-image: linear-gradient(to bottom, #fbb450, #f89406);
109
+ background-repeat: repeat-x;
110
+ border-color: #f89406 #f89406 #ad6704;
111
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
112
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
113
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
114
  }
115
 
116
+ #item-body a.btn-danger {
117
+ padding: 4px 10px;
118
+ color: #ffffff;
119
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
120
+ background-color: #da4f49;
121
+ *background-color: #bd362f;
122
+ background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
123
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
124
+ background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
125
+ background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
126
+ background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
127
+ background-repeat: repeat-x;
128
+ border-color: #bd362f #bd362f #802420;
129
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
130
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
131
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
132
+ }
133
+
134
+ #item-body a.btn-danger:hover,
135
+ #item-body a.btn-danger:focus,
136
+ #item-body a.btn-danger:active,
137
+ #item-body a.btn-danger.active,
138
+ #item-body a.btn-danger.disabled,
139
+ #item-body a.btn-danger[disabled] {
140
+ color: #ffffff;
141
+ border-color: #bd362f #bd362f #802420;
142
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
143
+ background: #bd362f;
144
+ *background: #a9302a;
145
+ }
146
+
147
+ #item-body a.btn-danger:active,
148
+ #item-body a.btn-danger.active {
149
+ border-color: #bd362f #bd362f #802420;
150
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
151
+ background: #942a25 \9;
152
+ }
153
+
154
+
155
  .wp-core-ui .btn-warning:hover,
156
  .wp-core-ui .btn-warning:focus,
157
  .wp-core-ui .btn-warning:active,
158
  .wp-core-ui .btn-warning.active,
159
  .wp-core-ui .btn-warning.disabled,
160
  .wp-core-ui .btn-warning[disabled] {
161
+ color: #ffffff;
162
+ background: #f89406;
163
+ background-color: #f89406;
164
+ *background: #df8505;
165
+ *background-color: #df8505;
166
  }
167
 
168
  /* Admin bar Menu */
186
  .bp-media-support-attachment .add-more-attachment-btn{clear: both;display: inline-block;margin-left: 160px;margin-top: 10px;}
187
  .template_select_label{float: left}
188
  .template_select_container{overflow-x:scroll; width:405px;float: left}
189
+ #bp_media_settings_form .support_form_loader{height: 100px; width: 200px; background: url("../img/loader.gif") no-repeat }
190
  /* Miscellaneous */
191
  #normal-sortables .postbox .bp-media-form .submit{float: none; margin-left: 150px}
192
  .rt-success{background-color: #E1FFDF;border-color: #2ACF2A;}
197
  .para-blockquote { background: #E5E5E5; padding: 10px; font-style: italic; }
198
  #latest-update img, #members-list .update img, #members-list .update {display:block; overflow: hidden;}
199
  #rtprogressbar {
200
+ background-color: #444;
201
+ border-radius: 13px;
202
+ padding: 3px;
203
  }
204
 
205
  #rtprogressbar div {
206
+ background-color: #fb6003;
207
+ width: 0;
208
+ height: 20px;
209
+ border-radius: 10px;
210
  }
211
 
212
 
213
  .bp_media_content img{max-width:100%;}
214
  .bp_media_content .mejs-poster img{max-width: 100%;}
215
+ .media .album-edit{display:inline;}
216
+ .media #item-body h3 {float: left;}
217
+ .media #item-body .bp-media-gallery h3 { float:none; }
218
+ .media .bp-media-album-actions {float: left; margin-left: 15px;}
219
+ .media .bulk-move, .media .bulk-delete {display: none;}
220
  .media h3 {display:block;font-size:20px;font-weight:bold;}
221
  ul.bp-media-gallery{overflow: hidden}
222
  .bp_media_description {display:block;margin-top:20px;}
223
+ #bp-media-upload-form, #message, .bp-media-action-wrapper, #bp-media-user-privacy {clear:left;}
224
+ .bp-media-album-action-ui { display:none; }
225
+ .bp-media-album-description {clear:left;font-size:1.2em}
226
+ ul.bp-media-gallery.item-list{clear:left;overflow:visible;margin: 1% 0;width: auto;}
227
  #item-body ul.bp-media-gallery li{float: left;margin: 1% 1% 0;width: 18%;border-bottom: none;padding: 0;position: static;height:auto; display:block;}
228
  ul.bp-media-gallery li img{max-width:150px;width:100%;height:auto;-moz-box-shadow: 1px 1px 10px #a0a0a0;-webkit-box-shadow: 1px 1px 10px #a0a0a0;box-shadow: 1px 1px 10px #a0a0a0;-moz-transition: box-shadow 0.2s linear;-webkit-transition: box-shadow 0.2s linear;transition: box-shadow 0.2s linear;}
229
  ul.bp-media-gallery li img:hover{-moz-box-shadow: 1px 1px 10px #333;-webkit-box-shadow: 1px 1px 10px #333;box-shadow: 1px 1px 10px #333;}
239
  #item-body:after,ul.bp-media-gallery.item-list:after{content: " ";clear: both;display: block;text-indent: -9999em;}
240
  #item-body{position: relative;}
241
 
242
+
243
+ .bp-media-ajax-spinner { display: none; vertical-align: -3px;}
244
  #bp-media-activity-upload-ui { width: 50%;}
245
  .bp-media-area-allocate{height: 10px;width: 100%;display: block;}
246
  li #bp-media-upload-ui {padding: 0;max-width: 158px;position: relative;}
247
+ #bp-media-upload-ui {margin-top: 10px; clear: left;}
248
  #bp-media-upload-ui #drag-drop-area{border: 4px dashed #DDD;text-align: center;background: #fafafa;overflow: hidden;padding: 15px 0;}
249
  #bp-media-upload-ui.hover #drag-drop-area {border-color: #83b4d8;}
250
  li #bp-media-upload-ui #drag-drop-area{max-width: 150px;min-height: auto;}
284
  .bpm-aligncenter{display: inline-block;text-align: center;width: 100%;}
285
  #bp-media-premium-addons ul,#bp-media-premium-addons li{list-style:disc;margin-left:10px;}
286
  .bp-media-single div.bp_media_content{text-align:center;width: auto;
287
+ margin: 0 auto;
288
+ position: relative;}
289
  .bp-media-single .bp_media_content .mejs-container{margin-left:auto;margin-right:auto;}
290
 
291
  .bp-media-actions{margin:20px 0;}
308
  .media-tabs-container .widget-item-listing li h3 a{font-size: 13px;font-weight: normal;word-wrap: break-word; }
309
 
310
  #bp-media-show-more{width: 200px;margin-left: auto;margin-right: auto;display: block;height: 30px;line-height: 30px;font-size: 20px;}
311
+ #bp-media-show-more-sc {display:block; margin: 0 auto;}
312
  #bp-media-upload-ui.activity-component{margin-left: 74px;margin-top: 10px;}
313
  ul#activity-stream li.media.album_updated ul{}
314
  ul#activity-stream li.media.album_updated ul li,ul.bp-media-list-media li{float: left;margin-right:2%}
322
  #bp-media-upload-set-privacy .album-set-privacy-label{margin: 0;font-weight: normal;}
323
 
324
  .bp-media-single .delete-activity-single,.bp-media-single .delete-activity{
325
+ color: #ff0000;
326
+ font-weight:bold;
327
  }
328
  .simplemodal-overlay{
329
+ background:#333 none;
330
+ z-index: 100000;
331
  }
332
  .simplemodal-container{
333
+ background:#fff none;
334
  }
335
  .bp-media-mod-title{
336
+ display:none;
337
  }
338
 
339
  .bp-media-ajax-single{
340
+ padding:0;
341
  }
342
  .bp-media-ajax-single .lightbox-spinner{
343
+ height:24px;
344
+ width:24px;
345
+ background: url("../img/boxspinner.gif") center center;
346
+ left:50%;
347
+ top:50%;
348
+ position:absolute;
349
  }
350
  .simplemodal-container .simplemodal-close{
351
+ background: url("../img/bp-media-modal.png") right bottom no-repeat;
352
+ width:22px;
353
+ height:22px;
354
+ display:block;
355
+ position:absolute;
356
+ right:0px;
357
+ top:0px;
358
+ cursor: pointer;
359
  }
360
  .simplemodal-container .simplemodal-close:hover{
361
+ background-position: right top;
362
  }
363
  .simplemodal-container a.modal-ctrl{
364
+ position:absolute;
365
+ height:100%;
366
+ height:100px;
367
+ width:100px;
368
+ top:50%;
369
+ margin-top:-50px;
370
+ cursor: pointer;
371
  }
372
  .simplemodal-container a.modal-ctrl:hover{
373
+ background: #232323 none;
374
  }
375
  .simplemodal-container a.modal-ctrl span.img-icon{
376
+ display: block;
377
+ height:22px;
378
+ width:22px;
379
+ margin:39px auto 39px 10px;
380
 
381
+ background: url("../img/bp-media-modal.png") left bottom no-repeat;
382
  }
383
  .simplemodal-container a.modal-next span.img-icon{
384
+ background-position: center bottom;
385
+ margin:39px 10px 39px auto;
386
  }
387
  .simplemodal-container a.modal-prev:hover span.img-icon{
388
+ background-position: left top;
389
  }
390
  .simplemodal-container a.modal-next:hover span.img-icon{
391
+ background-position: center top;
392
  }
393
  .simplemodal-container a.modal-prev:hover,
394
  .simplemodal-container a.modal-next:hover{
395
+ background:url("../img/") no-repeat;
396
  }
397
  .simplemodal-container a.modal-prev{
398
+ left: 0px;
399
  }
400
  .simplemodal-container a.modal-next{
401
+ right: 0px;
402
  }
403
 
404
  .bp-media-ajax-single .bp-media-mod-title{
405
+ display:block;
406
+ margin-top:22px;
407
  }
408
  .bp-media-ajax-single .bp-media-mod-title h2{
409
+ margin: 5px 0;
410
+ padding:0;
411
  }
412
  .bp-media-ajax-single .bp-media-mod-title p{
413
+ line-height:1.4em;
414
  }
415
  .bp-media-ajax-single .bp_media_content img,
416
  .bp-media-ajax-single .bp_media_content video,
417
  .bp-media-ajax-single .bp_media_content audio{
418
+ max-width: 100%;
419
+ display:inline-block;
420
+ margin:0 auto;
421
+ vertical-align: middle;
422
+ background:#fff none;
423
+ max-height:600px;
424
  }
425
  .bp-media-ajax-single .bp_media_author{
426
+ position:absolute;
427
+ top:0;
428
+ left:0;
429
  }
430
  .bp-media-ajax-single .bp-media-content-wrap,
431
  .bp-media-ajax-single .bp_media_content{
432
+ float:left;
433
+ width:auto;
434
+ margin:0;
435
+ position:relative;
436
+ overflow:hidden;
437
+ height:480px;
438
+ min-width:640px;
439
+ background: #333 none;
440
+ display:table;
441
 
442
  }
443
  .bp-media-ajax-single .bp_media_content{
444
+ display:table-cell;
445
+ vertical-align: middle;
446
+ float:none;
447
  }
448
  .bp-media-ajax-single .bp-media-content-wrap .bp_media_description{
449
+ display:block;
450
+ position:absolute;
451
+ bottom:0;
452
+ left:0;
453
  }
454
  .bp-media-ajax-single .bp-media-meta-content-wrap{
455
+ float:left;
456
+ width:250px;
457
+ margin:0;
458
+ min-height:480px;
459
+ margin-left:10px;
460
+ overflow:auto;
461
  }
462
  .bp-media-ajax-single .bp-media-meta-content-wrap .activity-meta{
463
+ margin:0;
464
  }
465
  .bp-media-ajax-single .bp-media-meta-content-wrap .activity-meta a{
466
+ padding: 2px 8px;
467
+ margin: 5px 5px 0 0;
468
+ display:inline-block;
469
  }
470
  .bp-media-ajax-single .bp-media-meta-content-wrap div.activity-comments ul li > ul{
471
+ margin-left:0;
472
+ padding-left:0;
473
  }
474
  .bp-media-ajax-single .bp-media-meta-content-wrap div.activity-comments form div.ac-reply-content{
475
+ margin-left:0;
476
+ padding-left:0;
477
  }
478
  /*.bp-media-ajax-single .bp-media-meta-content-wrap div.activity-meta a {
479
  padding: 0;
480
  float:left;
481
  }*/
482
  .bp-media-ajax-preloader{
483
+ display:none;
484
  }
485
 
486
  @media (min-width: 981px) and (max-width: 1096px) {
487
  li #bp-media-upload-ui #drag-drop-area{padding: 10px 0;}
488
+ /* li #bp-media-upload-ui .drag-drop-inside{margin: 0 auto;}*/
489
  li #bp-media-album-in, .albums li #bp-media-album-or{margin: 15px auto;}
490
  li #bp-media-upload-ui .drag-drop-inside p.drag-drop-info{font-size: 17px;}
491
  li #bp-media-upload-ui .drag-drop-buttons input{padding: 3px 8px;}
492
  li #bp-media-uploaded-files{top: 130px}
493
  li #bp-media-upload-ui #bp-media-album-prompt{margin-top: 0;}
494
  li #bp-media-album-prompt input.button{padding: 3px;}
495
+ /* .albums li #bp-media-upload-ui #drag-drop-area{padding: 10px 0 0;}*/
496
  }
497
  @media (max-width: 980px) {
498
  #item-body ul.bp-media-gallery li{width: 23%;}
519
  ul.bp-media-gallery li img,li #bp-media-upload-ui #drag-drop-area{max-width: 170px;width: 100%;}
520
  li #bp-media-upload-ui #drag-drop-area{max-width: 162px;padding: 20px 0;}
521
  #bp-media-upload-ui .drag-drop-area{padding: 23px 0 10px;}
522
+ /* li #bp-media-upload-ui .drag-drop-inside{margin: 0 auto 23px;}*/
523
  }
524
  @media (max-width: 379px) {
525
  #bp-media-upload-ui{min-height: 190px;}
app/assets/js/admin.js CHANGED
@@ -25,7 +25,7 @@ jQuery(document).ready(function(){
25
  jQuery('#bp-media-settings-boxes').on('change', '#select-request', function(){
26
  if(jQuery(this).val()){
27
  jQuery('#bp_media_settings_form .bp-media-metabox-holder').html()
28
- jQuery('#bp_media_settings_form .bp-media-metabox-holder').html('<div class="support_form_laoder"></div>');
29
  var data = {
30
  action: 'bp_media_select_request',
31
  form: jQuery(this).val()
@@ -43,7 +43,7 @@ jQuery(document).ready(function(){
43
  jQuery('#bp-media-settings-boxes').on('click', '#cancel-request', function(){
44
  if(jQuery(this).val()){
45
  jQuery('#bp_media_settings_form .bp-media-metabox-holder').html()
46
- jQuery('#bp_media_settings_form .bp-media-metabox-holder').html('<div class="support_form_laoder"></div>');
47
  var data = {
48
  action: 'bp_media_cancel_request'
49
  };
@@ -70,7 +70,7 @@ jQuery(document).ready(function(){
70
  jQuery('#bp_media_settings_form .bp-media-metabox-holder').html(response).fadeIn('slow');
71
  });
72
  });
73
-
74
  function fireRequest(data) {
75
  return jQuery.post(ajaxurl, data, function(response){
76
  if(response != 0){
@@ -272,7 +272,7 @@ jQuery(document).ready(function(){
272
  }
273
  wp_admin_url = ajaxurl.replace('admin-ajax.php','');
274
  if (!jQuery('.bpm-ajax-loader').length)
275
- jQuery(this).after(' <img class="bpm-ajax-loader" src="'+wp_admin_url+'images/wpspin_light.gif" /> <strong>Please do not refresh this page.</strong>');
276
 
277
 
278
  $progress_parent = jQuery('#bpmedia-bpalbumimport');
@@ -347,7 +347,7 @@ jQuery(document).ready(function(){
347
  if(response)
348
  location.reload();
349
  else
350
- $bpalbum.parent().after('<p>Something went wronng. Please <a href onclick="location.reload();">refresh</a> page.</p>');
351
  });
352
  });
353
 
25
  jQuery('#bp-media-settings-boxes').on('change', '#select-request', function(){
26
  if(jQuery(this).val()){
27
  jQuery('#bp_media_settings_form .bp-media-metabox-holder').html()
28
+ jQuery('#bp_media_settings_form .bp-media-metabox-holder').html('<div class="support_form_loader"></div>');
29
  var data = {
30
  action: 'bp_media_select_request',
31
  form: jQuery(this).val()
43
  jQuery('#bp-media-settings-boxes').on('click', '#cancel-request', function(){
44
  if(jQuery(this).val()){
45
  jQuery('#bp_media_settings_form .bp-media-metabox-holder').html()
46
+ jQuery('#bp_media_settings_form .bp-media-metabox-holder').html('<div class="support_form_loader"></div>');
47
  var data = {
48
  action: 'bp_media_cancel_request'
49
  };
70
  jQuery('#bp_media_settings_form .bp-media-metabox-holder').html(response).fadeIn('slow');
71
  });
72
  });
73
+
74
  function fireRequest(data) {
75
  return jQuery.post(ajaxurl, data, function(response){
76
  if(response != 0){
272
  }
273
  wp_admin_url = ajaxurl.replace('admin-ajax.php','');
274
  if (!jQuery('.bpm-ajax-loader').length)
275
+ jQuery(this).after(' <img class="bpm-ajax-loader" src="'+wp_admin_url+'images/wpspin_light.gif" /> <strong>'+bp_media_admin_strings.no_refresh+'</strong>');
276
 
277
 
278
  $progress_parent = jQuery('#bpmedia-bpalbumimport');
347
  if(response)
348
  location.reload();
349
  else
350
+ $bpalbum.parent().after('<p>'+bp_media_admin_strings.something_went_wrong+'</p>');
351
  });
352
  });
353
 
app/assets/js/bp-media-uploader.js CHANGED
@@ -26,7 +26,7 @@ jQuery(document).ready(function(){
26
  }
27
  var new_album_name = jQuery('#bp_media_album_new').val();
28
  if(new_album_name.length==0){
29
- alert('You have not filled the album name');
30
  return false;
31
  } else {
32
  new_album_flag = 1;
@@ -39,9 +39,8 @@ jQuery(document).ready(function(){
39
  jQuery.post(bp_media_vars.ajaxurl,data,function(response){
40
  var album = parseInt(response);
41
  if(album == 0){
42
- alert('Sorry you cannot create albums in this group');
43
- }
44
- else {
45
  jQuery('#bp-media-album-prompt select option').removeAttr('selected');
46
  jQuery('#bp-media-selected-album').prepend('<option value='+album+' selected="selected">'+new_album_name+'</option>');
47
  jQuery('#bp-media-album-prompt div.hide').hide();
@@ -69,7 +68,7 @@ jQuery(document).ready(function(){
69
 
70
  bp_media_uploader.bind('FilesAdded', function(up, files) {
71
  if ( jQuery('#bp-media-selected-album').val() == 'create_new' ) {
72
- alert("Please Select an Album !!");
73
  return false;
74
  }
75
  //bp_media_is_multiple_upload = files.length==1&&jQuery('.bp-media-progressbar').length==0?false:true;
@@ -112,7 +111,7 @@ jQuery(document).ready(function(){
112
  else
113
  new_location = new_location.concat('0/');
114
  window.location.replace(new_location);
115
- } else
116
  location.reload(true);
117
  });
118
 
26
  }
27
  var new_album_name = jQuery('#bp_media_album_new').val();
28
  if(new_album_name.length==0){
29
+ alert(bp_media_uploader_strings.no_name);
30
  return false;
31
  } else {
32
  new_album_flag = 1;
39
  jQuery.post(bp_media_vars.ajaxurl,data,function(response){
40
  var album = parseInt(response);
41
  if(album == 0){
42
+ alert(bp_media_uploader_strings.cant_upload_group_album);
43
+ } else {
 
44
  jQuery('#bp-media-album-prompt select option').removeAttr('selected');
45
  jQuery('#bp-media-selected-album').prepend('<option value='+album+' selected="selected">'+new_album_name+'</option>');
46
  jQuery('#bp-media-album-prompt div.hide').hide();
68
 
69
  bp_media_uploader.bind('FilesAdded', function(up, files) {
70
  if ( jQuery('#bp-media-selected-album').val() == 'create_new' ) {
71
+ alert(bp_media_uploader_strings.select_album);
72
  return false;
73
  }
74
  //bp_media_is_multiple_upload = files.length==1&&jQuery('.bp-media-progressbar').length==0?false:true;
111
  else
112
  new_location = new_location.concat('0/');
113
  window.location.replace(new_location);
114
+ } else
115
  location.reload(true);
116
  });
117
 
app/assets/js/main.js CHANGED
@@ -30,7 +30,219 @@ jQuery(document).ready(function(){
30
 
31
 
32
  jQuery('#item-body').on('click','#bp-media-upload-button', function(){
33
- jQuery(this).next().slideToggle();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
34
  });
35
 
36
  jQuery('#bp-media-upload-ui').bind('dragover', function(e){
@@ -67,9 +279,30 @@ jQuery(document).ready(function(){
67
  jQuery('.bp-media-gallery').append(response);
68
  });
69
  });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
70
  setTimeout(function(){
71
  jQuery('.media album_updated .delete-activity,.media_upload .delete-activity').unbind('click').click(function(e){
72
- if(confirm('Are you sure you want to delete this activity and associated media?')){
73
  return true;
74
  }
75
  else{
@@ -99,12 +332,7 @@ jQuery(document).ready(function(){
99
  });
100
 
101
  if ( bp_media_vars.lightbox > 0 ) {
102
- jQuery('#bp-media-list').on('click','li a',function(e){
103
- e.preventDefault();
104
- $current = jQuery(this);
105
- load_media($current);
106
- });
107
- jQuery('.widget-item-listing').on('click','li a',function(e){
108
  e.preventDefault();
109
  $current = jQuery(this);
110
  load_media($current);
@@ -119,7 +347,6 @@ jQuery(document).ready(function(){
119
  e.preventDefault();
120
  if(!$current.parent().hasClass('bp_media_content')){
121
  $next_current = $current.closest('li').next().find('a');
122
- console.log(jQuery('#bp-media-show-more').length);
123
  if($next_current.length<1){
124
  if(jQuery('#bp-media-show-more').length>0){
125
  var args = load_more_data();
@@ -235,6 +462,10 @@ jQuery(document).ready(function(){
235
  });
236
  }
237
  function load_more_data(){
 
 
 
 
238
  var data = {
239
  action: 'bp_media_load_more',
240
  page:++bp_media_vars.page,
@@ -242,7 +473,8 @@ jQuery(document).ready(function(){
242
  action_variables : bp_media_vars.action_variables,
243
  displayed_user : bp_media_vars.displayed_user,
244
  loggedin_user : bp_media_vars.loggedin_user,
245
- current_group : bp_media_vars.current_group
 
246
  };
247
  return data;
248
  }
@@ -288,10 +520,8 @@ jQuery(document).ready(function(){
288
  );
289
  }
290
 
291
-
292
  /* Favoriting activity stream items */
293
  if ( target.hasClass('fav') || target.hasClass('unfav') ) {
294
- console.log('hua');
295
  event.preventDefault();
296
  var type = target.hasClass('fav') ? 'fav' : 'unfav';
297
  var parent = target.closest('.activity_update');
30
 
31
 
32
  jQuery('#item-body').on('click','#bp-media-upload-button', function(){
33
+ jQuery('#bp-media-move-merge-ui').slideUp();
34
+ jQuery('#bp-media-delete-ui').slideUp();
35
+ jQuery('#bp-media-list input').remove();
36
+ jQuery('#bp-media-show-more').attr('data-move',0);
37
+ $parent = jQuery('.bp-media-album-actions');
38
+ $wrapper = jQuery('.bp-media-upload-wrapper');
39
+ $description = jQuery('.bp-media-album-description');
40
+ if($parent.length>0 && $wrapper.length<=0 ){
41
+ if($description.length>0)
42
+ $description.after('<div class="bp-media-action-wrapper bp-media-upload-wrapper"></div>');
43
+ else
44
+ $parent.after('<div class="bp-media-action-wrapper bp-media-upload-wrapper"></div>');
45
+ jQuery('#bp-media-upload-ui').appendTo('.bp-media-upload-wrapper');
46
+ }
47
+ jQuery('#bp-media-upload-ui').slideToggle();
48
+ });
49
+
50
+ jQuery('#item-body').on('click','#bp-media-move-merge-button', function(){
51
+ jQuery('#bp-media-upload-ui').slideUp();
52
+ jQuery('#bp-media-delete-ui').slideUp();
53
+ $parent = jQuery('.bp-media-album-actions');
54
+ $wrapper = jQuery('.bp-media-move-merge-wrapper');
55
+ $description = jQuery('.bp-media-album-description');
56
+ if($parent.length>0 && $wrapper.length<=0 ){
57
+ if($description.length>0)
58
+ $description.after('<div class="bp-media-action-wrapper bp-media-move-merge-wrapper"></div>');
59
+ else
60
+ $parent.after('<div class="bp-media-action-wrapper bp-media-move-merge-wrapper"></div>');
61
+ jQuery('#bp-media-move-merge-ui').appendTo('.bp-media-move-merge-wrapper');
62
+ }
63
+ jQuery('#bp-media-move-merge-ui').slideToggle('slow',function(){
64
+ if(jQuery(this).css('display') == 'none' || jQuery('#bp-media-move-merge-select option:checked').val() == 'merge') {
65
+ jQuery('#bp-media-list input').remove();
66
+ jQuery('#bp-media-show-more').attr('data-move',0);
67
+ } else if ( !jQuery('#bp-media-list input').length ) {
68
+ jQuery('#bp-media-show-more').attr('data-move',1);
69
+ jQuery('#bp-media-list h3').each(function(){
70
+ $media_id = jQuery(this).parent().attr('id').replace('bp-media-item-','');
71
+ jQuery(this).prepend('<input type="checkbox" name="move" value="'+$media_id+'" />');
72
+ });
73
+ }
74
+ });
75
+ });
76
+
77
+ jQuery('#item-body').on('click','#bp-media-delete-button', function(){
78
+ jQuery('#bp-media-upload-ui').slideUp();
79
+ jQuery('#bp-media-move-merge-ui').slideUp();
80
+ $parent = jQuery('.bp-media-album-actions');
81
+ $wrapper = jQuery('.bp-media-delete-wrapper');
82
+ $description = jQuery('.bp-media-album-description');
83
+ if($parent.length>0 && $wrapper.length<=0 ){
84
+ if($description.length>0)
85
+ $description.after('<div class="bp-media-action-wrapper bp-media-delete-wrapper"></div>');
86
+ else
87
+ $parent.after('<div class="bp-media-action-wrapper bp-media-delete-wrapper"></div>');
88
+ jQuery('#bp-media-delete-ui').appendTo('.bp-media-delete-wrapper');
89
+ }
90
+ jQuery('#bp-media-delete-ui').slideToggle('slow',function(){
91
+ if(jQuery(this).css('display') == 'none') {
92
+ jQuery('#bp-media-list input').remove();
93
+ jQuery('#bp-media-show-more').attr('data-move',0);
94
+ } else if ( !jQuery('#bp-media-list input').length ) {
95
+ jQuery('#bp-media-show-more').attr('data-move',1);
96
+ jQuery('#bp-media-list h3').each(function(){
97
+ $media_id = jQuery(this).parent().attr('id').replace('bp-media-item-','');
98
+ jQuery(this).prepend('<input type="checkbox" name="move" value="'+$media_id+'" />');
99
+ });
100
+ }
101
+ });
102
+ });
103
+
104
+ jQuery('#bp-media-move-merge-ui,#bp-media-delete-ui').on('click','.select-all', function(e){
105
+ e.preventDefault();
106
+ jQuery('#bp-media-list input').each(function(){
107
+ jQuery(this).prop('checked',true);
108
+ });
109
+ });
110
+
111
+ jQuery('#bp-media-move-merge-ui,#bp-media-delete-ui').on('click','.unselect-all', function(e){
112
+ e.preventDefault();
113
+ jQuery('#bp-media-list input').each(function(){
114
+ jQuery(this).prop('checked',false);
115
+ });
116
+ });
117
+
118
+ jQuery('#bp-media-move-merge-ui').on('change','#bp-media-move-merge-select', function(){
119
+ $this = jQuery(this);
120
+ if ( $this.val() == 'move' ) {
121
+ if ( !jQuery('#bp-media-list input').length ) {
122
+ jQuery('#bp-media-list h3').each(function(){
123
+ $media_id = jQuery(this).parent().attr('id').replace('bp-media-item-','');
124
+ jQuery(this).prepend('<input type="checkbox" name="move" value="'+$media_id+'" />');
125
+ });
126
+ }
127
+ jQuery('#bp-media-show-more').attr('data-move',1);
128
+ jQuery('.bp-media-move-selected-checks').fadeIn();
129
+ } else if ( $this.val() == 'merge' ) {
130
+ jQuery('.bp-media-move-selected-checks').fadeOut();
131
+ jQuery('#bp-media-list input').remove();
132
+ jQuery('#bp-media-show-more').attr('data-move',0)
133
+ }
134
+ });
135
+
136
+ jQuery('#bp-media-move-merge-ui').on('click','#bp-media-move-merge-media',function(){
137
+ jQuery(this).siblings('.bp-media-ajax-spinner').show();
138
+ jQuery(this).prop('disabled',true);
139
+ jQuery(this).addClass('disabled');
140
+ $val = jQuery('#bp-media-move-merge-select option:checked').val();
141
+ if ( $val == 'merge' ) {
142
+ if(confirm(bp_media_main_strings.merge_confirmation)){
143
+ $delete_album = false;
144
+ // if ( jQuery('.bp-media-can-delete').length ) {
145
+ // if(confirm(bp_media_main_strings.delete_after_merge))
146
+ // $delete_album = true;
147
+ // }
148
+ $from = jQuery('#bp-media-selected-album').val();
149
+ $to = jQuery('.bp-media-selected-album-move-merge option:checked').val();
150
+ if ( $from && $to ) {
151
+ var data = {
152
+ action: 'bp_media_merge_album',
153
+ from: $from,
154
+ to: $to,
155
+ delete_album: $delete_album
156
+ };
157
+ jQuery.post(bp_media_vars.ajaxurl, data, function(response) {
158
+ if(response.length==0) {
159
+ jQuery('.item-list-tabs:last').after('<div id="message" class="error"><p>'+bp_media_main_strings.something_went_wrong+'</p></div>');
160
+ } else if( response == 'redirect' ) {
161
+ window.location = window.location.href.replace($from,$to);
162
+ } else {
163
+ location.reload();
164
+ }
165
+ });
166
+ }
167
+ } else {
168
+ jQuery(this).siblings('.bp-media-ajax-spinner').hide();
169
+ jQuery(this).prop('disabled',false);
170
+ jQuery(this).removeClass('disabled');
171
+ return false;
172
+ }
173
+ } else if( $val == 'move' ) {
174
+ $media = new Array();
175
+ jQuery('input:checkbox[name="move"]:checked').each(function(){
176
+ $media.push(jQuery(this).val());
177
+ });
178
+ if ($media.length) {
179
+ if(confirm(bp_media_main_strings.are_you_sure)){
180
+ var data = {
181
+ action: 'bp_media_move_selected_media',
182
+ media: $media,
183
+ parent: jQuery('.bp-media-selected-album-move-merge option:checked').val()
184
+ };
185
+ jQuery.post(bp_media_vars.ajaxurl, data, function(response) {
186
+ if(response.length==0) {
187
+ jQuery('.item-list-tabs:last').after('<div id="message" class="error"><p>'+bp_media_main_strings.something_went_wrong+'</p></div>');
188
+ } else {
189
+ location.reload();
190
+ }
191
+ });
192
+ } else {
193
+ jQuery(this).siblings('.bp-media-ajax-spinner').hide();
194
+ jQuery(this).prop('disabled',false);
195
+ jQuery(this).removeClass('disabled');
196
+ }
197
+ } else {
198
+ alert(bp_media_main_strings.select_media);
199
+ jQuery(this).siblings('.bp-media-ajax-spinner').hide();
200
+ jQuery(this).prop('disabled',false);
201
+ jQuery(this).removeClass('disabled');
202
+ }
203
+ } else {
204
+ alert(bp_media_main_strings.select_action);
205
+ jQuery(this).siblings('.bp-media-ajax-spinner').hide();
206
+ jQuery(this).prop('disabled',false);
207
+ jQuery(this).removeClass('disabled');
208
+ return false;
209
+ }
210
+
211
+ });
212
+
213
+ jQuery('#bp-media-delete-ui').on('click','#bp-media-delete-media',function(){
214
+ jQuery(this).siblings('.bp-media-ajax-spinner').show();
215
+ jQuery(this).prop('disabled',true);
216
+ jQuery(this).addClass('disabled');
217
+ $media = new Array();
218
+ jQuery('input:checkbox[name="move"]:checked').each(function(){
219
+ $media.push(jQuery(this).val());
220
+ });
221
+ if ($media.length) {
222
+ if(confirm(bp_media_main_strings.delete_selected_media)){
223
+ var data = {
224
+ action: 'bp_media_delete_selected_media',
225
+ media: $media
226
+ };
227
+ jQuery.post(bp_media_vars.ajaxurl, data, function(response) {
228
+ if(response.length==0) {
229
+ jQuery('.item-list-tabs:last').after('<div id="message" class="error"><p>'+bp_media_main_strings.something_went_wrong+'</p></div>');
230
+ } else {
231
+ location.reload();
232
+ }
233
+ });
234
+ } else {
235
+ jQuery(this).siblings('.bp-media-ajax-spinner').hide();
236
+ jQuery(this).prop('disabled',false);
237
+ jQuery(this).removeClass('disabled');
238
+ return false;
239
+ }
240
+ } else {
241
+ alert(bp_media_main_strings.select_media);
242
+ jQuery(this).siblings('.bp-media-ajax-spinner').hide();
243
+ jQuery(this).prop('disabled',false);
244
+ jQuery(this).removeClass('disabled');
245
+ }
246
  });
247
 
248
  jQuery('#bp-media-upload-ui').bind('dragover', function(e){
279
  jQuery('.bp-media-gallery').append(response);
280
  });
281
  });
282
+
283
+ jQuery('#bp-media-show-more-sc').click(function(e){
284
+ e.preventDefault();
285
+ $this = jQuery(this);
286
+ $this.prop("disabled", true);
287
+ var data = {
288
+ action: 'bp_media_load_more_sc',
289
+ page: parseInt($this.attr('data-page'))+1,
290
+ media:$this.attr('data-media'),
291
+ count:$this.attr('data-count')
292
+ };
293
+ jQuery.get(bp_media_vars.ajaxurl, data, function(response) {
294
+ if(response.length==0) {
295
+ jQuery('#bp-media-show-more-sc').parent().remove();
296
+ }else{
297
+ $this.prop("disabled", false);
298
+ $this.attr('data-page',parseInt($this.attr('data-page'))+1);
299
+ jQuery('.bp-media-gallery').append(response);
300
+ }
301
+ });
302
+ });
303
  setTimeout(function(){
304
  jQuery('.media album_updated .delete-activity,.media_upload .delete-activity').unbind('click').click(function(e){
305
+ if(confirm(bp_media_main_strings.delete_activity_media)){
306
  return true;
307
  }
308
  else{
332
  });
333
 
334
  if ( bp_media_vars.lightbox > 0 ) {
335
+ jQuery('#bp-media-list,.widget-item-listing,.bp-media-sc-list').on('click','li a',function(e){
 
 
 
 
 
336
  e.preventDefault();
337
  $current = jQuery(this);
338
  load_media($current);
347
  e.preventDefault();
348
  if(!$current.parent().hasClass('bp_media_content')){
349
  $next_current = $current.closest('li').next().find('a');
 
350
  if($next_current.length<1){
351
  if(jQuery('#bp-media-show-more').length>0){
352
  var args = load_more_data();
462
  });
463
  }
464
  function load_more_data(){
465
+ if (jQuery('#bp-media-show-more').attr('data-move') == 1)
466
+ $move = 1;
467
+ else
468
+ $move = 0;
469
  var data = {
470
  action: 'bp_media_load_more',
471
  page:++bp_media_vars.page,
473
  action_variables : bp_media_vars.action_variables,
474
  displayed_user : bp_media_vars.displayed_user,
475
  loggedin_user : bp_media_vars.loggedin_user,
476
+ current_group : bp_media_vars.current_group,
477
+ move : $move
478
  };
479
  return data;
480
  }
520
  );
521
  }
522
 
 
523
  /* Favoriting activity stream items */
524
  if ( target.hasClass('fav') || target.hasClass('unfav') ) {
 
525
  event.preventDefault();
526
  var type = target.hasClass('fav') ? 'fav' : 'unfav';
527
  var parent = target.closest('.activity_update');
app/helper/BPMediaSettings.php CHANGED
@@ -30,7 +30,7 @@ if (!class_exists('BPMediaSettings')) {
30
  */
31
  public function settings() {
32
  global $bp_media, $bp_media_addon, $wpdb;
33
- add_settings_section('bpm-settings', __('Enabled Media Types', 'buddypress-media'), is_multisite() ? array($this, 'network_notices') : '', 'bp-media-settings');
34
  add_settings_field('bpm-image', __('Photos', 'buddypress-media'), array($this, 'checkbox'), 'bp-media-settings', 'bpm-settings', array(
35
  'setting' => 'bp_media_options',
36
  'option' => 'images_enabled',
@@ -258,6 +258,13 @@ if (!class_exists('BPMediaSettings')) {
258
  }
259
  delete_site_option('bpm-settings-saved');
260
  }
 
 
 
 
 
 
 
261
 
262
  /**
263
  * Sanitizes the settings
30
  */
31
  public function settings() {
32
  global $bp_media, $bp_media_addon, $wpdb;
33
+ add_settings_section('bpm-settings', __('Enabled Media Types', 'buddypress-media'), is_multisite() ? array($this, 'allowed_types') : '', 'bp-media-settings');
34
  add_settings_field('bpm-image', __('Photos', 'buddypress-media'), array($this, 'checkbox'), 'bp-media-settings', 'bpm-settings', array(
35
  'setting' => 'bp_media_options',
36
  'option' => 'images_enabled',
258
  }
259
  delete_site_option('bpm-settings-saved');
260
  }
261
+
262
+ public function allowed_types(){
263
+ $allowed_types = get_site_option('upload_filetypes', 'jpg jpeg png gif');
264
+ $allowed_types = explode(' ',$allowed_types);
265
+ $allowed_types = implode(', ',$allowed_types);
266
+ echo '<span class="description">'.sprintf(__('Currently your network allows uploading of the following file types. You can change the settings <a href="%s">here</a>.<br /><code>%s</code></span>','buddypress-media'),network_admin_url('settings.php#upload_filetypes'),$allowed_types);
267
+ }
268
 
269
  /**
270
  * Sanitizes the settings
app/main/group/BPMediaGroupElementExtension.php CHANGED
@@ -98,7 +98,6 @@ if (class_exists('BP_Group_Extension')) :
98
  $bp->action_variables[0] = BP_MEDIA_ALBUMS_VIEW_SLUG;
99
  echo '<h3>'.get_the_title($bp->action_variables[1]).'</h3>';
100
  $bp_media_content->entry_screen();
101
- } else {
102
  }
103
  $bp_media_content->entry_screen_content();
104
 
98
  $bp->action_variables[0] = BP_MEDIA_ALBUMS_VIEW_SLUG;
99
  echo '<h3>'.get_the_title($bp->action_variables[1]).'</h3>';
100
  $bp_media_content->entry_screen();
 
101
  }
102
  $bp_media_content->entry_screen_content();
103
 
app/main/includes/BPMediaActions.php CHANGED
@@ -31,6 +31,11 @@ class BPMediaActions {
31
  add_action('bp_media_after_add_media', 'BPMediaActions::activity_create_after_add_media', 10, 4);
32
  add_action('wp_ajax_bp_media_load_more', array($this, 'load_more'));
33
  add_action('wp_ajax_nopriv_bp_media_load_more', array($this, 'load_more'));
 
 
 
 
 
34
  add_action('wp_ajax_bp_media_set_album_cover', array($this, 'set_album_cover'));
35
  add_action('delete_attachment', array($this, 'delete_attachment_handler'));
36
  add_action('wp_ajax_bp_media_add_album', array($this, 'add_album'));
@@ -41,7 +46,7 @@ class BPMediaActions {
41
  add_action('bp_before_group_settings_creation_step', array($this, 'group_create_default_album'));
42
  add_filter('intermediate_image_sizes_advanced', array($this, 'filter_image_sizes_details'));
43
  add_filter('intermediate_image_sizes', array($this, 'filter_image_sizes'));
44
- // add_shortcode('bpmedia', array($this, 'bpmedia_shortcode'));
45
  $linkback = bp_get_option('bp_media_add_linkback', false);
46
  if ($linkback)
47
  add_action('bp_footer', array($this, 'footer'));
@@ -174,8 +179,19 @@ class BPMediaActions {
174
  'current_group' => $cur_group_id,
175
  'lightbox' => $lightbox,
176
  );
 
 
 
 
 
 
 
 
 
 
177
 
178
  wp_localize_script('bp-media-default', 'bp_media_vars', $bp_media_vars);
 
179
  wp_enqueue_style('bp-media-mecss', BP_MEDIA_URL . 'lib/media-element/mediaelementplayer.min.css', '', BP_MEDIA_VERSION);
180
  wp_enqueue_style('bp-media-default', BP_MEDIA_URL . 'app/assets/css/main.css', '', BP_MEDIA_VERSION);
181
  }
@@ -509,6 +525,12 @@ class BPMediaActions {
509
  );
510
  wp_enqueue_script('bp-media-uploader', BP_MEDIA_URL . 'app/assets/js/bp-media-uploader.js', array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4', 'plupload-handlers'), BP_MEDIA_VERSION, true);
511
  wp_localize_script('bp-media-uploader', 'bp_media_uploader_params', $params);
 
 
 
 
 
 
512
  }
513
  }
514
  wp_enqueue_style('bp-media-default', BP_MEDIA_URL . 'app/assets/css/main.css', '', BP_MEDIA_VERSION);
@@ -585,6 +607,7 @@ class BPMediaActions {
585
  $displayed_user = isset($_GET['displayed_user']) ? $_GET['displayed_user'] : null;
586
  $loggedin_user = isset($_GET['loggedin_user']) ? $_GET['loggedin_user'] : null;
587
  $current_group = isset($_GET['current_group']) ? $_GET['current_group'] : null;
 
588
  $album_id = isset($_GET['album_id']) ? $_GET['album_id'] : false;
589
  if ($current_group && isset($action_variables[1])) {
590
  $type_var = 'list';
@@ -628,7 +651,7 @@ class BPMediaActions {
628
  foreach ($bp_media_albums_query->posts as $attachment) {
629
  try {
630
  $media = new BPMediaAlbum($attachment->ID);
631
- echo $media->get_album_gallery_content();
632
  } catch (exception $e) {
633
  die();
634
  }
@@ -640,7 +663,7 @@ class BPMediaActions {
640
  foreach ($bp_media_query->posts as $attachment) {
641
  try {
642
  $media = new BPMediaHostWordpress($attachment->ID);
643
- echo $media->get_media_gallery_content();
644
  } catch (exception $e) {
645
  die();
646
  }
@@ -650,6 +673,112 @@ class BPMediaActions {
650
  die();
651
  }
652
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
653
  /**
654
  *
655
  * @global type $bp_media_count
@@ -981,11 +1110,12 @@ class BPMediaActions {
981
  }
982
 
983
  function bpmedia_shortcode($atts) {
 
984
  extract(shortcode_atts(array(
985
- 'media' => 'all',
986
- 'count' => '10',
 
987
  ), $atts));
988
-
989
  $value = 0;
990
  if (is_user_logged_in()) {
991
  $value = 2;
@@ -997,18 +1127,27 @@ class BPMediaActions {
997
  'compare' => '<='
998
  )
999
  );
 
 
 
1000
  $args = array(
 
 
1001
  'post_type' => 'attachment',
1002
  'post_status' => 'any',
1003
  'meta_query' => $privacy_query,
1004
  'posts_per_page' => $count
1005
  );
1006
- if ($media != 'all')
1007
- $args['post_mime_type'] = $media;
 
 
 
1008
  $query = new WP_Query($args);
1009
  if ($query->have_posts()) {
1010
  ?>
1011
- <div id="item-body"><ul class="bp-media-gallery item-list"><?php
 
1012
  while ($query->have_posts()) {
1013
  $query->the_post();
1014
  try {
@@ -1017,19 +1156,19 @@ class BPMediaActions {
1017
  } catch (Exception $e) {
1018
  echo '<li>';
1019
  echo $e->getMessage();
1020
- echo '<h3><a>Private</h3>';
1021
  echo '</li>';
1022
  }
1023
  }
1024
  ?>
1025
- </ul></div>
1026
- <div class="bp-media-actions"><a href="#" class="button" id="bp-media-show-more">Show More</a></div><?php
1027
- } else {
1028
- $media_string = $type;
1029
- if ($type === 'all') {
1030
- $media_string = 'media';
1031
  }
1032
- _e('No ' . $wdType . ' ' . $media_string . ' found', 'buddypress-media');
 
1033
  }
1034
  wp_reset_query();
1035
  }
31
  add_action('bp_media_after_add_media', 'BPMediaActions::activity_create_after_add_media', 10, 4);
32
  add_action('wp_ajax_bp_media_load_more', array($this, 'load_more'));
33
  add_action('wp_ajax_nopriv_bp_media_load_more', array($this, 'load_more'));
34
+ add_action('wp_ajax_bp_media_load_more_sc', array($this, 'load_more_sc'));
35
+ add_action('wp_ajax_nopriv_bp_media_load_more_sc', array($this, 'load_more_sc'));
36
+ add_action('wp_ajax_bp_media_move_selected_media', array($this, 'move_selected_media'));
37
+ add_action('wp_ajax_bp_media_delete_selected_media', array($this, 'delete_selected_media'));
38
+ add_action('wp_ajax_bp_media_merge_album', array($this, 'merge_album'));
39
  add_action('wp_ajax_bp_media_set_album_cover', array($this, 'set_album_cover'));
40
  add_action('delete_attachment', array($this, 'delete_attachment_handler'));
41
  add_action('wp_ajax_bp_media_add_album', array($this, 'add_album'));
46
  add_action('bp_before_group_settings_creation_step', array($this, 'group_create_default_album'));
47
  add_filter('intermediate_image_sizes_advanced', array($this, 'filter_image_sizes_details'));
48
  add_filter('intermediate_image_sizes', array($this, 'filter_image_sizes'));
49
+ add_shortcode('bpmedia', array($this, 'bpmedia_shortcode'));
50
  $linkback = bp_get_option('bp_media_add_linkback', false);
51
  if ($linkback)
52
  add_action('bp_footer', array($this, 'footer'));
179
  'current_group' => $cur_group_id,
180
  'lightbox' => $lightbox,
181
  );
182
+ $bp_media_main_strings = array(
183
+ 'something_went_wrong' => __('Something went wrong. Please try again.', 'buddypress-media'),
184
+ 'merge_confirmation' => __('Are you sure you want to merge this album?', 'buddypress-media'),
185
+ 'delete_after_merge' => __('Would you like to delete this album after the merge?', 'buddypress-media'),
186
+ 'delete_selected_media' => __('Are you sure you want to delete the selected media?', 'buddypress-media'),
187
+ 'delete_activity_media' => __('Are you sure you want to delete this activity and associated media?', 'buddypress-media'),
188
+ 'are_you_sure' => __('Are you sure?', 'buddypress-media'),
189
+ 'select_media' => __('Please select media.', 'buddypress-media'),
190
+ 'select_action' => __('Please select an action.', 'buddypress-media')
191
+ );
192
 
193
  wp_localize_script('bp-media-default', 'bp_media_vars', $bp_media_vars);
194
+ wp_localize_script('bp-media-default', 'bp_media_main_strings', $bp_media_main_strings);
195
  wp_enqueue_style('bp-media-mecss', BP_MEDIA_URL . 'lib/media-element/mediaelementplayer.min.css', '', BP_MEDIA_VERSION);
196
  wp_enqueue_style('bp-media-default', BP_MEDIA_URL . 'app/assets/css/main.css', '', BP_MEDIA_VERSION);
197
  }
525
  );
526
  wp_enqueue_script('bp-media-uploader', BP_MEDIA_URL . 'app/assets/js/bp-media-uploader.js', array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4', 'plupload-handlers'), BP_MEDIA_VERSION, true);
527
  wp_localize_script('bp-media-uploader', 'bp_media_uploader_params', $params);
528
+ $bp_media_uploader_strings = array(
529
+ 'no_name' => __('You have not filled the album name', 'buddypress-media'),
530
+ 'cant_upload_group_album' => __('Sorry you cannot create albums in this group', 'buddypress-media'),
531
+ 'select_album' => __('Please Select an Album !!', 'buddypress-media'),
532
+ );
533
+ wp_localize_script('bp-media-uploader', 'bp_media_uploader_strings', $bp_media_uploader_strings);
534
  }
535
  }
536
  wp_enqueue_style('bp-media-default', BP_MEDIA_URL . 'app/assets/css/main.css', '', BP_MEDIA_VERSION);
607
  $displayed_user = isset($_GET['displayed_user']) ? $_GET['displayed_user'] : null;
608
  $loggedin_user = isset($_GET['loggedin_user']) ? $_GET['loggedin_user'] : null;
609
  $current_group = isset($_GET['current_group']) ? $_GET['current_group'] : null;
610
+ $move = isset($_GET['move']) ? $_GET['move'] : null;
611
  $album_id = isset($_GET['album_id']) ? $_GET['album_id'] : false;
612
  if ($current_group && isset($action_variables[1])) {
613
  $type_var = 'list';
651
  foreach ($bp_media_albums_query->posts as $attachment) {
652
  try {
653
  $media = new BPMediaAlbum($attachment->ID);
654
+ echo $media->get_album_gallery_content($move);
655
  } catch (exception $e) {
656
  die();
657
  }
663
  foreach ($bp_media_query->posts as $attachment) {
664
  try {
665
  $media = new BPMediaHostWordpress($attachment->ID);
666
+ echo $media->get_media_gallery_content($move);
667
  } catch (exception $e) {
668
  die();
669
  }
673
  die();
674
  }
675
 
676
+ function load_more_sc() {
677
+ global $bp, $bp_media_query, $bp_media, $bp_media_albums_query;
678
+ $page = isset($_GET['page']) ? $_GET['page'] : die();
679
+ $type = isset($_GET['media']) ? $_GET['media'] : 'all';
680
+ $count = isset($_GET['count']) ? $_GET['count'] : 1;
681
+
682
+ $value = 0;
683
+ if (is_user_logged_in()) {
684
+ $value = 2;
685
+ }
686
+ $privacy_query = array(
687
+ array(
688
+ 'key' => 'bp_media_privacy',
689
+ 'value' => $value,
690
+ 'compare' => '<='
691
+ )
692
+ );
693
+
694
+ $args = array(
695
+ 'paged' => $page,
696
+ 'post_type' => 'attachment',
697
+ 'post_status' => 'any',
698
+ 'meta_query' => $privacy_query,
699
+ 'posts_per_page' => $count
700
+ );
701
+ if ($type != 'all')
702
+ $args['post_mime_type'] = $type;
703
+ $bp_media_widget_query = new WP_Query($args);
704
+ if ($bp_media_widget_query->have_posts()) {
705
+ while ($bp_media_widget_query->have_posts()) {
706
+ $bp_media_widget_query->the_post();
707
+ try {
708
+ $entry = new BPMediaHostWordpress(get_the_ID());
709
+ echo $entry->get_media_gallery_content();
710
+ } catch (Exception $e) {
711
+ echo '<li>';
712
+ echo $e->getMessage();
713
+ echo '<h3><a>Private</h3>';
714
+ echo '</li>';
715
+ }
716
+ }
717
+ }
718
+
719
+ die();
720
+ }
721
+
722
+ function move_selected_media() {
723
+ $media = isset($_POST['media']) ? $_POST['media'] : array();
724
+ $parent = isset($_POST['parent']) ? $_POST['parent'] : 0;
725
+ if (!empty($media)) {
726
+ foreach ($media as $item) {
727
+ $post['ID'] = $item;
728
+ $post['post_parent'] = $parent;
729
+ wp_update_post($post);
730
+ }
731
+ echo true;
732
+ }
733
+ die();
734
+ }
735
+
736
+ function delete_selected_media() {
737
+ $media = isset($_POST['media']) ? $_POST['media'] : array();
738
+ if (!empty($media)) {
739
+ foreach ($media as $item) {
740
+ $delete_handler = new BPMediaHostWordpress($item);
741
+ $delete_handler->delete_media();
742
+ }
743
+ echo true;
744
+ }
745
+ die();
746
+ }
747
+
748
+ function merge_album() {
749
+ $to = isset($_POST['to']) ? $_POST['to'] : null;
750
+ $from = isset($_POST['from']) ? $_POST['from'] : null;
751
+ $delete = isset($_POST['delete_album']) ? $_POST['delete_album'] : null;
752
+ if ($to && $from) {
753
+ global $wpdb;
754
+ $results = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = $from");
755
+ if ($results) {
756
+ foreach ($results as $media) {
757
+ $post['ID'] = $media->ID;
758
+ $post['post_parent'] = $to;
759
+ wp_update_post($post);
760
+ }
761
+ $activity_id = get_post_meta($from, 'bp_media_child_activity', true);
762
+ if ($delete == 'true') {
763
+ if (bp_is_active('activity')) {
764
+ if ($activity_id) {
765
+ bp_activity_delete_by_activity_id($activity_id);
766
+ } else {
767
+ $delete_handler = new BPMediaAlbum($from);
768
+ $delete_handler->delete_album();
769
+ }
770
+ }
771
+ echo 'redirect';
772
+ die();
773
+ } elseif ($activity_id) {
774
+ BPMediaFunction::update_album_activity($from);
775
+ }
776
+ }
777
+ echo true;
778
+ }
779
+ die();
780
+ }
781
+
782
  /**
783
  *
784
  * @global type $bp_media_count
1110
  }
1111
 
1112
  function bpmedia_shortcode($atts) {
1113
+ global $bp_media;
1114
  extract(shortcode_atts(array(
1115
+ 'type' => 'all',
1116
+ 'count' => $bp_media->options['default_count'] ? $bp_media->options['default_count'] : 10,
1117
+ 'loadmore' => true
1118
  ), $atts));
 
1119
  $value = 0;
1120
  if (is_user_logged_in()) {
1121
  $value = 2;
1127
  'compare' => '<='
1128
  )
1129
  );
1130
+
1131
+ $paged = get_query_var('paged') ? get_query_var('paged') : 1;
1132
+
1133
  $args = array(
1134
+ 'paged' => $paged,
1135
+ 'post_type' => 'attachment',
1136
  'post_type' => 'attachment',
1137
  'post_status' => 'any',
1138
  'meta_query' => $privacy_query,
1139
  'posts_per_page' => $count
1140
  );
1141
+
1142
+ $type = str_replace(array('music', 'photos'),array('audio','image'),$type);
1143
+
1144
+ if ($type != 'all')
1145
+ $args['post_mime_type'] = $type;
1146
  $query = new WP_Query($args);
1147
  if ($query->have_posts()) {
1148
  ?>
1149
+ <div id="item-body" class="bp-media-sc-list">
1150
+ <ul class="bp-media-gallery item-list"><?php
1151
  while ($query->have_posts()) {
1152
  $query->the_post();
1153
  try {
1156
  } catch (Exception $e) {
1157
  echo '<li>';
1158
  echo $e->getMessage();
1159
+ echo '<h3>' . __('Private', 'buddypress-media') . '</h3>';
1160
  echo '</li>';
1161
  }
1162
  }
1163
  ?>
1164
+ </ul>
1165
+ </div><?php
1166
+ $loadmore = strtolower($loadmore);
1167
+ if ( $loadmore != 'false' && $loadmore != '0' && $loadmore != 'no' ) { ?>
1168
+ <div class="bp-media-actions"><button data-media="<?php echo $type; ?>" data-count="<?php echo $count; ?>" data-page="<?php echo $count; ?>" class="button" id="bp-media-show-more-sc">Show More</button></div><?php
 
1169
  }
1170
+ } else {
1171
+ _e('No media found', 'buddypress-media');
1172
  }
1173
  wp_reset_query();
1174
  }
app/main/includes/BPMediaHostWordpress.php CHANGED
@@ -472,7 +472,7 @@ class BPMediaHostWordpress {
472
  * @global type $bp_media
473
  * @return boolean
474
  */
475
- function get_media_gallery_content() {
476
  $attachment = $this->id;
477
  switch ($this->type) {
478
  case 'video' :
@@ -489,7 +489,13 @@ class BPMediaHostWordpress {
489
  <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>">
490
  <img src="<?php echo apply_filters('bp_media_video_thumb', $thumb_url, $attachment, $this->type); ?>" />
491
  </a>
492
- <h3 title="<?php echo $this->name; ?>"><a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>"><?php echo $this->name; ?></a></h3>
 
 
 
 
 
 
493
  </li>
494
  <?php
495
  break;
@@ -503,11 +509,17 @@ class BPMediaHostWordpress {
503
  $thumb_url = BP_MEDIA_URL . 'app/assets/img/audio_thumb.png';
504
  }
505
  ?>
506
- <li id="bp-media-item-<?php echo $this->id ?>">
507
  <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>">
508
  <img src="<?php echo $thumb_url ?>" />
509
  </a>
510
- <h3 title="<?php echo $this->name; ?>"><a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>"><?php echo $this->name ?></a></h3>
 
 
 
 
 
 
511
  <div class="bp-media-ajax-preloader"></div>
512
  </li>
513
  <?php
@@ -522,7 +534,13 @@ class BPMediaHostWordpress {
522
  <a href="<?php echo $this->url ?>" title="<?php echo $this->description ?>">
523
  <img src="<?php echo $medium_path ?>" />
524
  </a>
525
- <h3 title="<?php echo $this->name ?>"><a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>"><?php echo $this->name ?></a></h3>
 
 
 
 
 
 
526
  <div class="bp-media-ajax-preloader"></div>
527
  </li>
528
  <?php
472
  * @global type $bp_media
473
  * @return boolean
474
  */
475
+ function get_media_gallery_content($move=false) {
476
  $attachment = $this->id;
477
  switch ($this->type) {
478
  case 'video' :
489
  <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>">
490
  <img src="<?php echo apply_filters('bp_media_video_thumb', $thumb_url, $attachment, $this->type); ?>" />
491
  </a>
492
+ <h3 title="<?php echo $this->name; ?>"><?php
493
+ if ( $move ) {
494
+ echo '<input type="checkbox" name="move" value="'.$this->id.'" />';
495
+ }
496
+ ?>
497
+ <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>"><?php echo $this->name; ?></a>
498
+ </h3>
499
  </li>
500
  <?php
501
  break;
509
  $thumb_url = BP_MEDIA_URL . 'app/assets/img/audio_thumb.png';
510
  }
511
  ?>
512
+ <li id="bp-media-item-<?php echo $this->id; ?>">
513
  <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>">
514
  <img src="<?php echo $thumb_url ?>" />
515
  </a>
516
+ <h3 title="<?php echo $this->name; ?>"><?php
517
+ if ( $move ) {
518
+ echo '<input type="checkbox" name="move" value="'.$this->id.'" />';
519
+ }
520
+ ?>
521
+ <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>"><?php echo $this->name ?></a>
522
+ </h3>
523
  <div class="bp-media-ajax-preloader"></div>
524
  </li>
525
  <?php
534
  <a href="<?php echo $this->url ?>" title="<?php echo $this->description ?>">
535
  <img src="<?php echo $medium_path ?>" />
536
  </a>
537
+ <h3 title="<?php echo $this->name ?>"><?php
538
+ if ( $move ) {
539
+ echo '<input type="checkbox" name="move" value="'.$this->id.'" />';
540
+ }
541
+ ?>
542
+ <a href="<?php echo $this->url ?>" title="<?php _e($this->description, 'buddypress-media'); ?>"><?php echo $this->name ?></a>
543
+ </h3>
544
  <div class="bp-media-ajax-preloader"></div>
545
  </li>
546
  <?php
app/main/profile/BPMediaAlbum.php CHANGED
@@ -301,6 +301,14 @@ class BPMediaAlbum {
301
  function the_title() {
302
  echo $this->name;
303
  }
 
 
 
 
 
 
 
 
304
 
305
  /**
306
  * Returns the id of the album
301
  function the_title() {
302
  echo $this->name;
303
  }
304
+
305
+ /**
306
+ *
307
+ * @return type
308
+ */
309
+ function get_description() {
310
+ return $this->description;
311
+ }
312
 
313
  /**
314
  * Returns the id of the album
app/main/profile/BPMediaAlbumScreen.php CHANGED
@@ -43,7 +43,7 @@ class BPMediaAlbumScreen extends BPMediaScreen {
43
  $this->page_not_exist();
44
  }
45
  $media_actions = new BPMediaActions();
46
- if ( $media_actions->default_user_album() != $bp->action_variables[1])
47
  $this->entry_delete();
48
  else
49
  $this->page_not_exist();
@@ -70,9 +70,7 @@ class BPMediaAlbumScreen extends BPMediaScreen {
70
  */
71
  function screen_content() {
72
  global $bp_media_albums_query;
73
-
74
  $this->hook_before();
75
-
76
  if ($bp_media_albums_query && $bp_media_albums_query->have_posts()):
77
  echo '<ul id="bp-album-list" class="bp-media-gallery item-list">';
78
  while ($bp_media_albums_query->have_posts()) : $bp_media_albums_query->the_post();
@@ -118,37 +116,12 @@ class BPMediaAlbumScreen extends BPMediaScreen {
118
  global $bp, $bp_media_current_album, $bp_media_query;
119
  if (!$bp->action_variables[0] == BP_MEDIA_ALBUMS_VIEW_SLUG)
120
  return false;
121
- $allowed_edit = false;
122
- if (is_user_logged_in()) {
123
- if (!bp_is_user()) {
124
- if (bp_is_active('groups')) {
125
- if (groups_is_user_admin(bp_loggedin_user_id(), $bp->groups->current_group->id)) {
126
- $allowed_edit = true;
127
- } elseif (bp_displayed_user_id() == bp_loggedin_user_id()) {
128
- $allowed_edit = true;
129
- }
130
- }
131
- } else {
132
- if (bp_displayed_user_id() == bp_loggedin_user_id()) {
133
- $allowed_edit = true;
134
- }
135
- }
136
-
137
- if ($allowed_edit != false) {
138
- echo '<div class="album-edit">';
139
- echo '<a href="' . $bp_media_current_album->get_edit_url() . '" class="button item-button bp-secondary-action bp-media-edit bp-media-edit-album" title="' . __('Edit Album', 'buddypress-media') . '">' . __('Edit', 'buddypress-media') . '</a>';
140
- $media_actions = new BPMediaActions();
141
- if ( $media_actions->default_user_album() != $bp_media_current_album->get_id())
142
- echo '<a href="' . $bp_media_current_album->get_delete_url() . '" class="button item-button bp-secondary-action delete-activity-single confirm" rel="nofollow">' . __("Delete", 'buddypress-media') . '</a>';
143
- echo '</div>';
144
- }
145
- }
146
  $this->inner_query($bp_media_current_album->get_id());
 
147
  $this->hook_before();
 
 
148
  if ($bp_media_current_album && $bp_media_query->have_posts()) {
149
- if (bp_is_my_profile() || BPMediaGroupLoader::can_upload()) {
150
- BPMediaUploadScreen::upload_screen_content();
151
- }
152
  echo '<ul id="bp-media-list" class="bp-media-gallery albums item-list">';
153
 
154
  while ($bp_media_query->have_posts()) {
@@ -243,6 +216,102 @@ class BPMediaAlbumScreen extends BPMediaScreen {
243
  $this->filters = $filters;
244
  }
245
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
246
  }
247
 
248
  ?>
43
  $this->page_not_exist();
44
  }
45
  $media_actions = new BPMediaActions();
46
+ if ($media_actions->default_user_album() != $bp->action_variables[1])
47
  $this->entry_delete();
48
  else
49
  $this->page_not_exist();
70
  */
71
  function screen_content() {
72
  global $bp_media_albums_query;
 
73
  $this->hook_before();
 
74
  if ($bp_media_albums_query && $bp_media_albums_query->have_posts()):
75
  echo '<ul id="bp-album-list" class="bp-media-gallery item-list">';
76
  while ($bp_media_albums_query->have_posts()) : $bp_media_albums_query->the_post();
116
  global $bp, $bp_media_current_album, $bp_media_query;
117
  if (!$bp->action_variables[0] == BP_MEDIA_ALBUMS_VIEW_SLUG)
118
  return false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
119
  $this->inner_query($bp_media_current_album->get_id());
120
+ add_action('bp_media_before_' . $this->slug, array($this, 'album_actions'));
121
  $this->hook_before();
122
+ if ($bp_media_current_album->get_description())
123
+ echo '<p class="bp-media-album-description">' . nl2br($bp_media_current_album->get_description()) . '</p>';
124
  if ($bp_media_current_album && $bp_media_query->have_posts()) {
 
 
 
125
  echo '<ul id="bp-media-list" class="bp-media-gallery albums item-list">';
126
 
127
  while ($bp_media_query->have_posts()) {
216
  $this->filters = $filters;
217
  }
218
 
219
+ public function album_actions() {
220
+ global $bp, $bp_media_current_album, $bp_media_query;
221
+ if (!$bp->action_variables[0] == BP_MEDIA_ALBUMS_VIEW_SLUG)
222
+ return false;
223
+ $allowed_edit = false;
224
+ if (is_user_logged_in()) {
225
+ echo '<div class="bp-media-album-actions">';
226
+ if (bp_is_active('groups') && bp_get_current_group_id())
227
+ $default_album = groups_get_groupmeta(bp_get_current_group_id(), 'bp_media_default_album');
228
+ else
229
+ $default_album = get_user_meta(get_current_user_id(), 'bp-media-default-album', true);
230
+ if (!bp_is_user()) {
231
+ if (bp_is_active('groups')) {
232
+ if (groups_is_user_admin(bp_loggedin_user_id(), $bp->groups->current_group->id)) {
233
+ $allowed_edit = true;
234
+ } elseif (bp_displayed_user_id() == bp_loggedin_user_id()) {
235
+ $allowed_edit = true;
236
+ }
237
+ }
238
+ } else {
239
+ if (bp_displayed_user_id() == bp_loggedin_user_id()) {
240
+ $allowed_edit = true;
241
+ }
242
+ }
243
+
244
+ if ($allowed_edit != false && is_object($bp_media_current_album)) {
245
+ echo '<div class="album-edit">';
246
+ echo '<a href="' . $bp_media_current_album->get_edit_url() . '" class="button item-button bp-secondary-action bp-media-edit bp-media-edit-album" title="' . __('Edit Album', 'buddypress-media') . '">' . __('Edit', 'buddypress-media') . '</a>';
247
+ $media_actions = new BPMediaActions();
248
+ if ($default_album != $bp_media_current_album->get_id() || $bp_media_query->have_posts()) {
249
+ if (!$bp_media_query->have_posts()) {
250
+ echo '<a href="' . $bp_media_current_album->get_delete_url() . '" class="btn-danger button bp-media-can-delete item-button bp-secondary-action delete-activity-single confirm" rel="nofollow">' . __("Delete Album", 'buddypress-media') . '</a>';
251
+ } else {
252
+ echo '<input id="bp-media-delete-button" type="button" value="' . __('Delete', 'buddypress-media') . '" class="button">';
253
+ echo '<div class="bp-media-album-action-ui" id="bp-media-delete-ui">
254
+ <a class="select-all" href="#">' . __('Select All Visible', 'buddypress-media') . '</a> |
255
+ <a class="unselect-all" href="#">' . __('Unselect All Visible', 'buddypress-media') . '</a> |
256
+ <input id="bp-media-delete-media" type="button" value="' . __('Delete Selected Media', 'buddypress-media') . '" />';
257
+ if ($default_album != $bp_media_current_album->get_id())
258
+ echo '&nbsp;<a href="' . $bp_media_current_album->get_delete_url() . '" class="btn-danger button bp-media-can-delete item-button bp-secondary-action delete-activity-single confirm" rel="nofollow">' . __("Delete Album", 'buddypress-media') . '</a>';
259
+ echo '<img class="bp-media-ajax-spinner" src="' . admin_url('images/wpspin_light.gif') . '" /></div>';
260
+ }
261
+ }
262
+ echo '</div>';
263
+ if ($bp_media_query->have_posts()) {
264
+ if (bp_is_my_profile() || BPMediaGroupLoader::can_upload()) {
265
+ BPMediaUploadScreen::upload_screen_content();
266
+ $album_selector = '';
267
+
268
+ if (bp_is_current_component('groups')) {
269
+ $albums = new WP_Query(array(
270
+ 'post_type' => 'bp_media_album',
271
+ 'posts_per_page' => -1,
272
+ 'meta_key' => 'bp-media-key',
273
+ 'meta_value' => -bp_get_current_group_id(),
274
+ 'meta_compare' => '=',
275
+ 'post__not_in' => array($bp_media_current_album->get_id())
276
+ ));
277
+ } else {
278
+ $albums = new WP_Query(array(
279
+ 'post_type' => 'bp_media_album',
280
+ 'posts_per_page' => -1,
281
+ 'author' => get_current_user_id(),
282
+ 'meta_key' => 'bp-media-key',
283
+ 'meta_value' => get_current_user_id(),
284
+ 'meta_compare' => '=',
285
+ 'post__not_in' => array($bp_media_current_album->get_id())
286
+ ));
287
+ }
288
+ if (isset($albums->posts) && is_array($albums->posts) && count($albums->posts) > 0) {
289
+ foreach ($albums->posts as $album) {
290
+ if ($album->post_title == $post_wall)
291
+ $album_selector .= '<option value="' . $album->ID . '" selected="selected">' . $album->post_title . '</option>';
292
+ else
293
+ $album_selector .= '<option value="' . $album->ID . '">' . $album->post_title . '</option>';
294
+ };
295
+ }
296
+
297
+ if ($album_selector) {
298
+ echo '<input id="bp-media-move-merge-button" type="button" value="' . __('Move', 'buddypress-media') . '" class="button">';
299
+ echo '<div class="bp-media-album-action-ui" id="bp-media-move-merge-ui">
300
+ <span class="bp-media-move-selected-checks"><a class="select-all" href="#">' . __('Select All Visible', 'buddypress-media') . '</a> |
301
+ <a class="unselect-all" href="#">' . __('Unselect All Visible', 'buddypress-media') . '</a> | </span>
302
+ <select id="bp-media-move-merge-select"><option value="move">' . __('Move selected', 'buddypress-media') . '</option>' . '<option value="merge">' . __('Move all', 'buddypress-media') . '</option></select>'
303
+ . ' ' . __('to', 'buddypress-media') . '&nbsp;&nbsp;<select class="bp-media-selected-album-move-merge">' . $album_selector . '</select>&nbsp;&nbsp;<input id="bp-media-move-merge-media" type="button" value="' . __('Submit', 'buddypress-media') . '" />
304
+ <img class="bp-media-ajax-spinner" src="' . admin_url('images/wpspin_light.gif') . '" /></div>';
305
+ // '<span class="bulk-delete"><input id="bp-media-delete-selected-media" type="button" value="' . __('Delete Media', 'buddypress-media') . '" /></span>
306
+ }
307
+ }
308
+ }
309
+ }
310
+ do_action('bp_media_album_actions');
311
+ echo '</div>';
312
+ }
313
+ }
314
+
315
  }
316
 
317
  ?>
app/main/profile/BPMediaTemplate.php CHANGED
@@ -30,7 +30,7 @@ class BPMediaTemplate {
30
  if ($bp_media_query && $bp_media_query->have_posts()) {
31
  $hidden = ' style="display:none;"';
32
  ?>
33
- <input id="bp-media-upload-button" type="button" value="Upload" class="button"><?php
34
  } else {
35
  $hidden = '';
36
  }
30
  if ($bp_media_query && $bp_media_query->have_posts()) {
31
  $hidden = ' style="display:none;"';
32
  ?>
33
+ &nbsp;<input id="bp-media-upload-button" type="button" value="Upload" class="button"><?php
34
  } else {
35
  $hidden = '';
36
  }
app/main/profile/BPMediaUploadScreen.php CHANGED
@@ -34,11 +34,7 @@ class BPMediaUploadScreen extends BPMediaScreen {
34
  }
35
 
36
  function upload_screen_content() {
37
- $this->hook_before();
38
-
39
  $this->template->upload_form_multiple();
40
-
41
- $this->hook_after();
42
  }
43
 
44
  function upload_enqueue() {
34
  }
35
 
36
  function upload_screen_content() {
 
 
37
  $this->template->upload_form_multiple();
 
 
38
  }
39
 
40
  function upload_enqueue() {
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.9
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.10
7
  Author: rtCamp
8
  Text Domain: buddypress-media
9
  Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
languages/buddypress-media-ar_AR.mo ADDED
Binary file
languages/buddypress-media-de_DE.mo CHANGED
Binary file
languages/buddypress-media-es_ES.mo CHANGED
Binary file
languages/buddypress-media-fa_IR.mo ADDED
Binary file
languages/buddypress-media-fr_FR.mo CHANGED
Binary file
languages/buddypress-media-it_IT.mo CHANGED
Binary file
languages/buddypress-media-nl_NL.mo CHANGED
Binary file
languages/buddypress-media-pl_PL.mo CHANGED
Binary file
languages/buddypress-media-pt_BR.mo CHANGED
Binary file
languages/buddypress-media-ro_RO.mo ADDED
Binary file
languages/buddypress-media-sr_SR.mo CHANGED
Binary file
languages/buddypress-media.mo CHANGED
Binary file
languages/buddypress-media.po CHANGED
@@ -2,8 +2,8 @@ msgid ""
2
  msgstr ""
3
  "Project-Id-Version: BuddyPress Media\n"
4
  "Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2013-04-09 12:48+0530\n"
6
- "PO-Revision-Date: 2013-04-09 12:48+0530\n"
7
  "Last-Translator: Joshua Abenazer <joshua.abenazer@rtcamp.com>\n"
8
  "Language-Team: rtCamp <info@rtcamp.com>\n"
9
  "Language: \n"
@@ -190,7 +190,7 @@ msgid "Enabled Media Types"
190
  msgstr ""
191
 
192
  #: app/helper/BPMediaSettings.php:34
193
- #: app/main/BuddyPressMedia.php:283
194
  msgid "Photos"
195
  msgstr ""
196
 
@@ -199,7 +199,7 @@ msgid "Enable Photos"
199
  msgstr ""
200
 
201
  #: app/helper/BPMediaSettings.php:39
202
- #: app/main/BuddyPressMedia.php:292
203
  msgid "Video"
204
  msgstr ""
205
 
@@ -216,374 +216,470 @@ msgid "Enable Audio (mp3)"
216
  msgstr ""
217
 
218
  #: app/helper/BPMediaSettings.php:50
219
- msgid "Activity Upload"
220
  msgstr ""
221
 
222
  #: app/helper/BPMediaSettings.php:51
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
223
  msgid "Activity Uploads"
224
  msgstr ""
225
 
226
- #: app/helper/BPMediaSettings.php:54
227
  msgid "Enable Activity Uploading"
228
  msgstr ""
229
 
230
- #: app/helper/BPMediaSettings.php:59
231
  msgid "Lightbox Integration"
232
  msgstr ""
233
 
234
- #: app/helper/BPMediaSettings.php:60
235
  msgid "Lightbox"
236
  msgstr ""
237
 
238
- #: app/helper/BPMediaSettings.php:63
239
  msgid "Enable Lighbox on Media"
240
  msgstr ""
241
 
242
- #: app/helper/BPMediaSettings.php:68
243
  msgid "Groups Integration"
244
  msgstr ""
245
 
246
- #: app/helper/BPMediaSettings.php:75
247
  msgid "Groups"
248
  msgstr ""
249
 
250
- #: app/helper/BPMediaSettings.php:78
251
  msgid "Allow Media in Groups"
252
  msgstr ""
253
 
254
- #: app/helper/BPMediaSettings.php:85
255
  msgid "Display Settings"
256
  msgstr ""
257
 
258
- #: app/helper/BPMediaSettings.php:86
259
  msgid "Number of media"
260
  msgstr ""
261
 
262
- #: app/helper/BPMediaSettings.php:91
263
  msgid "Download Button"
264
  msgstr ""
265
 
266
- #: app/helper/BPMediaSettings.php:94
267
  msgid "Display download button under media"
268
  msgstr ""
269
 
270
- #: app/helper/BPMediaSettings.php:98
271
  #: app/main/privacy/BPMediaPrivacyScreen.php:59
272
  msgid "Privacy Settings"
273
  msgstr ""
274
 
275
- #: app/helper/BPMediaSettings.php:99
276
  msgid "Enable Privacy"
277
  msgstr ""
278
 
279
- #: app/helper/BPMediaSettings.php:102
280
  msgid "Enable privacy"
281
  msgstr ""
282
 
283
- #: app/helper/BPMediaSettings.php:106
284
  msgid "<strong>Private</strong> - Visible only to the user"
285
  msgstr ""
286
 
287
- #: app/helper/BPMediaSettings.php:107
288
  msgid "<strong>Friends</strong> - Visible to user's friends"
289
  msgstr ""
290
 
291
- #: app/helper/BPMediaSettings.php:108
292
  msgid "<strong>Users</strong> - Visible to registered users"
293
  msgstr ""
294
 
295
- #: app/helper/BPMediaSettings.php:109
296
  msgid "<strong>Public</strong> - Visible to the world"
297
  msgstr ""
298
 
299
- #: app/helper/BPMediaSettings.php:114
300
  msgid "Default Privacy"
301
  msgstr ""
302
 
303
- #: app/helper/BPMediaSettings.php:120
304
  msgid "User Override"
305
  msgstr ""
306
 
307
- #: app/helper/BPMediaSettings.php:123
308
  msgid "Allow users to override admin defaults (<em>Recommended</em>)"
309
  msgstr ""
310
 
311
- #: app/helper/BPMediaSettings.php:126
312
  msgid "Other Settings"
313
  msgstr ""
314
 
315
- #: app/helper/BPMediaSettings.php:128
316
  msgid "Admin bar menu"
317
  msgstr ""
318
 
319
- #: app/helper/BPMediaSettings.php:131
320
  msgid "Enable menu in WordPress admin bar"
321
  msgstr ""
322
 
323
- #: app/helper/BPMediaSettings.php:134
324
- #: app/helper/BPMediaSettings.php:136
325
  msgid "Recount"
326
  msgstr ""
327
 
328
- #: app/helper/BPMediaSettings.php:137
329
  msgid "Repair media counts"
330
  msgstr ""
331
 
332
- #: app/helper/BPMediaSettings.php:141
333
  msgid "BuddyPress Media Addons for Audio/Video Conversion"
334
  msgstr ""
335
 
336
- #: app/helper/BPMediaSettings.php:142
337
- msgid "Submit a request form"
338
- msgstr ""
339
-
340
- #: app/helper/BPMediaSettings.php:143
341
- msgid "Request Type"
342
- msgstr ""
343
-
344
- #: app/helper/BPMediaSettings.php:144
345
- msgid "Select One"
346
- msgstr ""
347
-
348
- #: app/helper/BPMediaSettings.php:145
349
- msgid "Premium Support"
350
- msgstr ""
351
-
352
- #: app/helper/BPMediaSettings.php:146
353
- msgid "Suggest a New Feature"
354
  msgstr ""
355
 
356
- #: app/helper/BPMediaSettings.php:152
357
- #: app/helper/BPMediaSettings.php:513
358
- #: app/admin/BPMediaAdmin.php:81
359
  #: app/main/privacy/BPMediaPrivacySettings.php:29
360
  msgid "Update Database"
361
  msgstr ""
362
 
363
- #: app/helper/BPMediaSettings.php:156
364
  msgid "BP-Album Importer"
365
  msgstr ""
366
 
367
- #: app/helper/BPMediaSettings.php:240
368
- #: app/helper/BPMediaSettings.php:242
 
 
 
 
 
369
  msgid "Recounting of media files done successfully"
370
  msgstr ""
371
 
372
- #: app/helper/BPMediaSettings.php:242
373
  msgid "Recount Success"
374
  msgstr ""
375
 
376
- #: app/helper/BPMediaSettings.php:245
377
- #: app/helper/BPMediaSettings.php:247
378
  msgid "Recounting Failed"
379
  msgstr ""
380
 
381
- #: app/helper/BPMediaSettings.php:247
382
  msgid "Recount Fail"
383
  msgstr ""
384
 
385
- #: app/helper/BPMediaSettings.php:259
386
- #: app/helper/BPMediaSettings.php:261
387
  msgid "Atleast one Media Type Must be selected"
388
  msgstr ""
389
 
390
- #: app/helper/BPMediaSettings.php:261
391
  msgid "Media Type"
392
  msgstr ""
393
 
394
- #: app/helper/BPMediaSettings.php:268
395
- #: app/helper/BPMediaSettings.php:270
396
  msgid "\"Number of media\" count value should be numeric and greater than 0."
397
  msgstr ""
398
 
399
- #: app/helper/BPMediaSettings.php:270
400
  msgid "Default Count"
401
  msgstr ""
402
 
403
- #: app/helper/BPMediaSettings.php:274
404
  msgid "Settings saved."
405
  msgstr ""
406
 
407
- #: app/helper/BPMediaSettings.php:303
 
 
 
 
 
408
  msgid "Please provide \"option\" value ( required ) in the argument. Pass argument to add_settings_field in the following format array( 'option' => 'option_name' ) "
409
  msgstr ""
410
 
411
- #: app/helper/BPMediaSettings.php:348
412
- #: app/helper/BPMediaSettings.php:397
413
- #: app/helper/BPMediaSettings.php:441
414
  msgid "Please provide \"option\" value ( required ) in the argument. Pass argument to add_settings_field in the following format array( 'option' => 'option_name' )"
415
  msgstr ""
416
 
417
- #: app/helper/BPMediaSettings.php:350
418
  msgid "Need to specify atleast to radios else use a checkbox instead"
419
  msgstr ""
420
 
421
- #: app/helper/BPMediaSettings.php:443
 
 
 
 
 
 
 
 
 
 
 
 
422
  msgid "Please provide some values to populate the dropdown. Format : array( 'value' => 'option' )"
423
  msgstr ""
424
 
425
- #: app/helper/BPMediaSettings.php:458
426
  msgid "None"
427
  msgstr ""
428
 
429
- #: app/helper/BPMediaSettings.php:512
430
  msgid "BuddyPress Media 2.6 requires a database upgrade. "
431
  msgstr ""
432
 
433
- #: app/admin/BPMediaAdmin.php:78
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
434
  msgid "BuddyPress Media Component"
435
  msgstr ""
436
 
437
- #: app/admin/BPMediaAdmin.php:78
438
- #: app/admin/BPMediaAdmin.php:202
439
- #: app/admin/BPMediaAdmin.php:203
440
  msgid "BuddyPress Media"
441
  msgstr ""
442
 
443
- #: app/admin/BPMediaAdmin.php:79
444
- #: app/admin/BPMediaAdmin.php:230
445
  msgid "BuddyPress Media Settings"
446
  msgstr ""
447
 
448
- #: app/admin/BPMediaAdmin.php:79
449
- #: app/admin/BPMediaAdmin.php:231
450
- #: app/main/BuddyPressMedia.php:416
451
  msgid "Settings"
452
  msgstr ""
453
 
454
- #: app/admin/BPMediaAdmin.php:81
455
  msgid "BuddyPress Media Database Update"
456
  msgstr ""
457
 
458
- #: app/admin/BPMediaAdmin.php:84
459
- #: app/admin/BPMediaAdmin.php:260
460
- #: app/admin/BPMediaAdmin.php:261
461
  msgid "Importer"
462
  msgstr ""
463
 
464
- #: app/admin/BPMediaAdmin.php:86
465
- #: app/admin/BPMediaAdmin.php:237
466
  msgid "BuddyPress Media Addons"
467
  msgstr ""
468
 
469
- #: app/admin/BPMediaAdmin.php:86
470
- #: app/admin/BPMediaAdmin.php:238
471
  msgid "Addons"
472
  msgstr ""
473
 
474
- #: app/admin/BPMediaAdmin.php:87
475
- #: app/admin/BPMediaAdmin.php:244
476
  msgid "BuddyPress Media Support"
477
  msgstr ""
478
 
479
- #: app/admin/BPMediaAdmin.php:87
480
  msgid "Support "
481
  msgstr ""
482
 
483
- #: app/admin/BPMediaAdmin.php:89
484
  msgid "BuddyPress Media Convert Videos"
485
  msgstr ""
486
 
487
- #: app/admin/BPMediaAdmin.php:89
488
- #: app/admin/BPMediaAdmin.php:253
489
  msgid "Convert Videos"
490
  msgstr ""
491
 
492
- #: app/admin/BPMediaAdmin.php:150
493
  #: app/importers/BPMediaAlbumimporter.php:91
494
- #: app/main/BuddyPressMedia.php:275
495
- #: app/main/BuddyPressMedia.php:278
496
  #: app/main/BPMediaComponent.php:297
497
  #: app/main/BPMediaComponent.php:298
498
  #: app/main/BPMediaComponent.php:304
499
  msgid "Media"
500
  msgstr ""
501
 
502
- #: app/admin/BPMediaAdmin.php:172
503
  msgid "By"
504
  msgstr ""
505
 
506
- #: app/admin/BPMediaAdmin.php:172
507
  msgid "Empowering The Web With WordPress"
508
  msgstr ""
509
 
510
- #: app/admin/BPMediaAdmin.php:245
511
- msgid "Support"
512
- msgstr ""
513
-
514
- #: app/admin/BPMediaAdmin.php:252
515
  msgid "BuddyPress Media Covert Videos"
516
  msgstr ""
517
 
518
- #: app/admin/BPMediaAdmin.php:353
519
  #, php-format
520
  msgid "I use @buddypressmedia http://goo.gl/8Upmv on %s"
521
  msgstr ""
522
 
523
- #: app/admin/BPMediaAdmin.php:354
524
  msgid "Add link to footer"
525
  msgstr ""
526
 
527
- #: app/admin/BPMediaAdmin.php:355
528
  msgid "Tweet"
529
  msgstr ""
530
 
531
- #: app/admin/BPMediaAdmin.php:356
532
  msgid "Rate on WordPress.org"
533
  msgstr ""
534
 
535
- #: app/admin/BPMediaAdmin.php:357
536
  msgid "Spread the Word"
537
  msgstr ""
538
 
539
- #: app/admin/BPMediaAdmin.php:367
540
  msgid "USD"
541
  msgstr ""
542
 
543
- #: app/admin/BPMediaAdmin.php:376
544
  msgid "OR"
545
  msgstr ""
546
 
547
- #: app/admin/BPMediaAdmin.php:377
548
  msgid "Use <a href=\"https://rtcamp.com/store/product-category/buddypress/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media\">premium add-ons</a> starting from $9"
549
  msgstr ""
550
 
551
- #: app/admin/BPMediaAdmin.php:379
552
  msgid "Donate"
553
  msgstr ""
554
 
555
- #: app/admin/BPMediaAdmin.php:393
556
  msgid "Become a fan on Facebook"
557
  msgstr ""
558
 
559
- #: app/admin/BPMediaAdmin.php:393
560
  msgid "Facebook"
561
  msgstr ""
562
 
563
- #: app/admin/BPMediaAdmin.php:394
564
  msgid "Follow us on Twitter"
565
  msgstr ""
566
 
567
- #: app/admin/BPMediaAdmin.php:394
568
  msgid "Twitter"
569
  msgstr ""
570
 
571
- #: app/admin/BPMediaAdmin.php:395
572
  msgid "Subscribe to our feeds"
573
  msgstr ""
574
 
575
- #: app/admin/BPMediaAdmin.php:395
576
  msgid "RSS Feed"
577
  msgstr ""
578
 
579
- #: app/admin/BPMediaAdmin.php:397
580
  msgid "Subscribe"
581
  msgstr ""
582
 
583
- #: app/admin/BPMediaAdmin.php:400
584
  msgid "Latest News"
585
  msgstr ""
586
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
587
  #: app/importers/BPMediaAlbumimporter.php:72
588
  msgid "Warning!"
589
  msgstr ""
@@ -697,39 +793,39 @@ msgstr ""
697
  msgid "<a href=\"%s\">Install BuddyPress now</a>"
698
  msgstr ""
699
 
700
- #: app/main/BuddyPressMedia.php:280
701
  msgid "Privacy"
702
  msgstr ""
703
 
704
- #: app/main/BuddyPressMedia.php:286
705
  msgid "Photo"
706
  msgstr ""
707
 
708
- #: app/main/BuddyPressMedia.php:289
709
  msgid "Videos"
710
  msgstr ""
711
 
712
- #: app/main/BuddyPressMedia.php:295
713
- #: app/main/BuddyPressMedia.php:298
714
  msgid "Music"
715
  msgstr ""
716
 
717
- #: app/main/BuddyPressMedia.php:301
718
  #: app/main/BPMediaComponent.php:255
719
  #: app/main/BPMediaComponent.php:267
720
  msgid "Albums"
721
  msgstr ""
722
 
723
- #: app/main/BuddyPressMedia.php:304
724
  #: app/main/BPMediaComponent.php:256
725
  msgid "Album"
726
  msgstr ""
727
 
728
- #: app/main/BuddyPressMedia.php:307
729
  msgid "Upload"
730
  msgstr ""
731
 
732
- #: app/main/BuddyPressMedia.php:508
733
  #, php-format
734
  msgid ""
735
  "The BuddyPress version installed is an\n"
@@ -739,7 +835,7 @@ msgid ""
739
  "\t\t\t\t\t\t\t\t\t\t<a class=\"alignright\" href=\"%1$s\">X</a>"
740
  msgstr ""
741
 
742
- #: app/main/BuddyPressMedia.php:521
743
  #, php-format
744
  msgid ""
745
  "You have not installed BuddyPress.\n"
@@ -847,24 +943,24 @@ msgstr ""
847
  msgid "This %s is visible to logged in users, only"
848
  msgstr ""
849
 
850
- #: app/main/includes/BPMediaFilters.php:143
851
  #, php-format
852
  msgid "Delete %s"
853
  msgstr ""
854
 
855
- #: app/main/includes/BPMediaFilters.php:394
856
  msgid "Total Photos"
857
  msgstr ""
858
 
859
- #: app/main/includes/BPMediaFilters.php:395
860
  msgid "Total Videos"
861
  msgstr ""
862
 
863
- #: app/main/includes/BPMediaFilters.php:396
864
  msgid "Total Audio"
865
  msgstr ""
866
 
867
- #: app/main/includes/BPMediaFilters.php:397
868
  msgid "Total Albums"
869
  msgstr ""
870
 
@@ -892,146 +988,198 @@ msgstr ""
892
  msgid "Error Uploading File"
893
  msgstr ""
894
 
895
- #: app/main/includes/BPMediaHostWordpress.php:171
896
  msgid "MP4 file you have uploaded is corrupt."
897
  msgstr ""
898
 
899
- #: app/main/includes/BPMediaHostWordpress.php:178
900
- #: app/main/includes/BPMediaHostWordpress.php:183
901
  msgid "The MP4 file you have uploaded is using an unsupported video codec. Supported video codec is H.264."
902
  msgstr ""
903
 
904
- #: app/main/includes/BPMediaHostWordpress.php:188
905
  msgid "The MP4 file you have uploaded is not a video file."
906
  msgstr ""
907
 
908
- #: app/main/includes/BPMediaHostWordpress.php:199
909
  msgid "MP3 file you have uploaded is currupt."
910
  msgstr ""
911
 
912
- #: app/main/includes/BPMediaHostWordpress.php:206
913
- #: app/main/includes/BPMediaHostWordpress.php:211
914
  msgid "The MP3 file you have uploaded is using an unsupported audio format. Supported audio format is MP3."
915
  msgstr ""
916
 
917
- #: app/main/includes/BPMediaHostWordpress.php:216
918
  msgid "The MP3 file you have uploaded is not an audio file."
919
  msgstr ""
920
 
921
- #: app/main/includes/BPMediaHostWordpress.php:228
922
  msgid "Media File you have tried to upload is not supported. Supported media files are .jpg, .png, .gif, .mp3, .mov and .mp4."
923
  msgstr ""
924
 
925
- #: app/main/includes/BPMediaHostWordpress.php:235
926
  msgid "Error creating attachment for the media file, please try again"
927
  msgstr ""
928
 
929
- #: app/main/includes/BPMediaHostWordpress.php:340
930
  #, php-format
931
  msgid "%s uploaded a media."
932
  msgstr ""
933
 
934
- #: app/main/includes/BPMediaHostWordpress.php:361
935
  msgid "Uploaded by "
936
  msgstr ""
937
 
938
- #: app/main/includes/BPMediaHostWordpress.php:562
939
  #, php-format
940
  msgid "Comment <span>%s</span>"
941
  msgstr ""
942
 
943
- #: app/main/includes/BPMediaHostWordpress.php:566
944
  msgid "Favorite"
945
  msgstr ""
946
 
947
- #: app/main/includes/BPMediaHostWordpress.php:568
948
  msgid "Remove Favorite"
949
  msgstr ""
950
 
951
- #: app/main/includes/BPMediaHostWordpress.php:587
952
  msgid "Post"
953
  msgstr ""
954
 
955
- #: app/main/includes/BPMediaHostWordpress.php:587
956
  msgid "or press esc to cancel."
957
  msgstr ""
958
 
959
- #: app/main/includes/BPMediaHostWordpress.php:612
960
  msgid "Delete"
961
  msgstr ""
962
 
963
- #: app/main/includes/BPMediaHostWordpress.php:714
964
- #: app/main/includes/BPMediaActions.php:788
965
  #: app/main/group/BPMediaGroupAction.php:124
966
  #, php-format
967
  msgid "%1$s added a %2$s"
968
  msgstr ""
969
 
970
- #: app/main/includes/BPMediaHostWordpress.php:984
971
  msgid "Wall Posts"
972
  msgstr ""
973
 
974
- #: app/main/includes/BPMediaActions.php:66
975
- #: app/main/includes/BPMediaActions.php:90
976
  msgid "File uploaded is not supported"
977
  msgstr ""
978
 
979
- #: app/main/includes/BPMediaActions.php:73
980
  msgid "Image uploads are disabled"
981
  msgstr ""
982
 
983
- #: app/main/includes/BPMediaActions.php:79
984
  msgid "Video uploads are disabled"
985
  msgstr ""
986
 
987
- #: app/main/includes/BPMediaActions.php:85
988
  msgid "Audio uploads are disabled"
989
  msgstr ""
990
 
991
- #: app/main/includes/BPMediaActions.php:104
992
  msgid "Upload Successful"
993
  msgstr ""
994
 
995
- #: app/main/includes/BPMediaActions.php:109
996
  msgid "You did not specified a file to upload"
997
  msgstr ""
998
 
999
- #: app/main/includes/BPMediaActions.php:311
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1000
  msgid "Download"
1001
  msgstr ""
1002
 
1003
- #: app/main/includes/BPMediaActions.php:318
1004
- #: app/main/includes/BPMediaActions.php:838
1005
  msgid "Set as Album Cover"
1006
  msgstr ""
1007
 
1008
- #: app/main/includes/BPMediaActions.php:323
1009
- #: app/main/includes/BPMediaActions.php:841
1010
  msgid "Unset as Album Cover"
1011
  msgstr ""
1012
 
1013
- #: app/main/includes/BPMediaActions.php:329
1014
  msgid "Edit Media"
1015
  msgstr ""
1016
 
1017
- #: app/main/includes/BPMediaActions.php:329
1018
  msgid "Edit"
1019
  msgstr ""
1020
 
1021
- #: app/main/includes/BPMediaActions.php:741
 
 
 
 
 
 
 
 
 
 
 
 
1022
  #, php-format
1023
  msgid "%1$s created an album %2$s"
1024
  msgstr ""
1025
 
 
 
 
 
 
 
 
 
1026
  #: app/main/includes/bp-media-upload-handler.php:32
1027
  msgid "You are not allowed to be here"
1028
  msgstr ""
1029
 
1030
- #: app/main/includes/BPMediaFunction.php:167
1031
  msgid "You do not have access to this page."
1032
  msgstr ""
1033
 
1034
- #: app/main/includes/BPMediaFunction.php:228
1035
  #, php-format
1036
  msgid "%1$s added new media in album %2$s"
1037
  msgstr ""
@@ -1194,18 +1342,57 @@ msgstr ""
1194
  msgid "Add Media"
1195
  msgstr ""
1196
 
1197
- #: app/main/profile/BPMediaAlbumScreen.php:84
1198
  #: app/main/profile/BPMediaScreen.php:194
1199
  #, php-format
1200
  msgid "Sorry, no %s were found."
1201
  msgstr ""
1202
 
1203
- #: app/main/profile/BPMediaAlbumScreen.php:161
1204
  msgid "Sorry, no media items were found in this album."
1205
  msgstr ""
1206
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1207
  #: app/main/profile/BPMediaScreen.php:112
1208
- #: app/main/profile/BPMediaScreen.php:371
1209
  msgid "The requested url does not exist"
1210
  msgstr ""
1211
 
@@ -1229,19 +1416,19 @@ msgstr ""
1229
  msgid "%s Description"
1230
  msgstr ""
1231
 
1232
- #: app/main/profile/BPMediaScreen.php:339
1233
  msgid "Update"
1234
  msgstr ""
1235
 
1236
- #: app/main/profile/BPMediaScreen.php:340
1237
  msgid "Back to Media File"
1238
  msgstr ""
1239
 
1240
- #: app/main/profile/BPMediaScreen.php:341
1241
  msgid "Back to Media"
1242
  msgstr ""
1243
 
1244
- #: app/main/profile/BPMediaScreen.php:393
1245
  msgid "Media deleted successfully"
1246
  msgstr ""
1247
 
2
  msgstr ""
3
  "Project-Id-Version: BuddyPress Media\n"
4
  "Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2013-04-18 12:58+0530\n"
6
+ "PO-Revision-Date: 2013-04-18 12:59+0530\n"
7
  "Last-Translator: Joshua Abenazer <joshua.abenazer@rtcamp.com>\n"
8
  "Language-Team: rtCamp <info@rtcamp.com>\n"
9
  "Language: \n"
190
  msgstr ""
191
 
192
  #: app/helper/BPMediaSettings.php:34
193
+ #: app/main/BuddyPressMedia.php:309
194
  msgid "Photos"
195
  msgstr ""
196
 
199
  msgstr ""
200
 
201
  #: app/helper/BPMediaSettings.php:39
202
+ #: app/main/BuddyPressMedia.php:318
203
  msgid "Video"
204
  msgstr ""
205
 
216
  msgstr ""
217
 
218
  #: app/helper/BPMediaSettings.php:50
219
+ msgid "Image Settings"
220
  msgstr ""
221
 
222
  #: app/helper/BPMediaSettings.php:51
223
+ msgid "Thumbnail Size"
224
+ msgstr ""
225
+
226
+ #: app/helper/BPMediaSettings.php:55
227
+ msgid "Used in albums, sidebar media widget acitvity stream"
228
+ msgstr ""
229
+
230
+ #: app/helper/BPMediaSettings.php:57
231
+ msgid "Medium Size"
232
+ msgstr ""
233
+
234
+ #: app/helper/BPMediaSettings.php:61
235
+ msgid "Used in activity stream for single media uploads"
236
+ msgstr ""
237
+
238
+ #: app/helper/BPMediaSettings.php:63
239
+ msgid "Large Size"
240
+ msgstr ""
241
+
242
+ #: app/helper/BPMediaSettings.php:67
243
+ msgid "Used in single media and thickbox"
244
+ msgstr ""
245
+
246
+ #: app/helper/BPMediaSettings.php:70
247
+ msgid "Video Payer Settings"
248
+ msgstr ""
249
+
250
+ #: app/helper/BPMediaSettings.php:71
251
+ #: app/helper/BPMediaSettings.php:81
252
+ msgid "Activity Player Size"
253
+ msgstr ""
254
+
255
+ #: app/helper/BPMediaSettings.php:75
256
+ #: app/helper/BPMediaSettings.php:86
257
+ msgid "Single Player Size"
258
+ msgstr ""
259
+
260
+ #: app/helper/BPMediaSettings.php:80
261
+ msgid "Audio Player Settings"
262
+ msgstr ""
263
+
264
+ #: app/helper/BPMediaSettings.php:93
265
+ msgid "Activity Upload"
266
+ msgstr ""
267
+
268
+ #: app/helper/BPMediaSettings.php:94
269
  msgid "Activity Uploads"
270
  msgstr ""
271
 
272
+ #: app/helper/BPMediaSettings.php:97
273
  msgid "Enable Activity Uploading"
274
  msgstr ""
275
 
276
+ #: app/helper/BPMediaSettings.php:102
277
  msgid "Lightbox Integration"
278
  msgstr ""
279
 
280
+ #: app/helper/BPMediaSettings.php:103
281
  msgid "Lightbox"
282
  msgstr ""
283
 
284
+ #: app/helper/BPMediaSettings.php:106
285
  msgid "Enable Lighbox on Media"
286
  msgstr ""
287
 
288
+ #: app/helper/BPMediaSettings.php:111
289
  msgid "Groups Integration"
290
  msgstr ""
291
 
292
+ #: app/helper/BPMediaSettings.php:118
293
  msgid "Groups"
294
  msgstr ""
295
 
296
+ #: app/helper/BPMediaSettings.php:121
297
  msgid "Allow Media in Groups"
298
  msgstr ""
299
 
300
+ #: app/helper/BPMediaSettings.php:126
301
  msgid "Display Settings"
302
  msgstr ""
303
 
304
+ #: app/helper/BPMediaSettings.php:127
305
  msgid "Number of media"
306
  msgstr ""
307
 
308
+ #: app/helper/BPMediaSettings.php:132
309
  msgid "Download Button"
310
  msgstr ""
311
 
312
+ #: app/helper/BPMediaSettings.php:135
313
  msgid "Display download button under media"
314
  msgstr ""
315
 
316
+ #: app/helper/BPMediaSettings.php:139
317
  #: app/main/privacy/BPMediaPrivacyScreen.php:59
318
  msgid "Privacy Settings"
319
  msgstr ""
320
 
321
+ #: app/helper/BPMediaSettings.php:140
322
  msgid "Enable Privacy"
323
  msgstr ""
324
 
325
+ #: app/helper/BPMediaSettings.php:143
326
  msgid "Enable privacy"
327
  msgstr ""
328
 
329
+ #: app/helper/BPMediaSettings.php:147
330
  msgid "<strong>Private</strong> - Visible only to the user"
331
  msgstr ""
332
 
333
+ #: app/helper/BPMediaSettings.php:148
334
  msgid "<strong>Friends</strong> - Visible to user's friends"
335
  msgstr ""
336
 
337
+ #: app/helper/BPMediaSettings.php:149
338
  msgid "<strong>Users</strong> - Visible to registered users"
339
  msgstr ""
340
 
341
+ #: app/helper/BPMediaSettings.php:150
342
  msgid "<strong>Public</strong> - Visible to the world"
343
  msgstr ""
344
 
345
+ #: app/helper/BPMediaSettings.php:155
346
  msgid "Default Privacy"
347
  msgstr ""
348
 
349
+ #: app/helper/BPMediaSettings.php:161
350
  msgid "User Override"
351
  msgstr ""
352
 
353
+ #: app/helper/BPMediaSettings.php:164
354
  msgid "Allow users to override admin defaults (<em>Recommended</em>)"
355
  msgstr ""
356
 
357
+ #: app/helper/BPMediaSettings.php:167
358
  msgid "Other Settings"
359
  msgstr ""
360
 
361
+ #: app/helper/BPMediaSettings.php:169
362
  msgid "Admin bar menu"
363
  msgstr ""
364
 
365
+ #: app/helper/BPMediaSettings.php:172
366
  msgid "Enable menu in WordPress admin bar"
367
  msgstr ""
368
 
369
+ #: app/helper/BPMediaSettings.php:175
370
+ #: app/helper/BPMediaSettings.php:177
371
  msgid "Recount"
372
  msgstr ""
373
 
374
+ #: app/helper/BPMediaSettings.php:178
375
  msgid "Repair media counts"
376
  msgstr ""
377
 
378
+ #: app/helper/BPMediaSettings.php:182
379
  msgid "BuddyPress Media Addons for Audio/Video Conversion"
380
  msgstr ""
381
 
382
+ #: app/helper/BPMediaSettings.php:184
383
+ #: app/admin/BPMediaAdmin.php:255
384
+ msgid "Support"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
385
  msgstr ""
386
 
387
+ #: app/helper/BPMediaSettings.php:189
388
+ #: app/helper/BPMediaSettings.php:603
389
+ #: app/admin/BPMediaAdmin.php:91
390
  #: app/main/privacy/BPMediaPrivacySettings.php:29
391
  msgid "Update Database"
392
  msgstr ""
393
 
394
+ #: app/helper/BPMediaSettings.php:193
395
  msgid "BP-Album Importer"
396
  msgstr ""
397
 
398
+ #: app/helper/BPMediaSettings.php:266
399
+ #, php-format
400
+ msgid "Currently your network allows uploading of the following file types. You can change the settings <a href=\"%s\">here</a>.<br /><code>%s</code></span>"
401
+ msgstr ""
402
+
403
+ #: app/helper/BPMediaSettings.php:284
404
+ #: app/helper/BPMediaSettings.php:286
405
  msgid "Recounting of media files done successfully"
406
  msgstr ""
407
 
408
+ #: app/helper/BPMediaSettings.php:286
409
  msgid "Recount Success"
410
  msgstr ""
411
 
412
+ #: app/helper/BPMediaSettings.php:289
413
+ #: app/helper/BPMediaSettings.php:291
414
  msgid "Recounting Failed"
415
  msgstr ""
416
 
417
+ #: app/helper/BPMediaSettings.php:291
418
  msgid "Recount Fail"
419
  msgstr ""
420
 
421
+ #: app/helper/BPMediaSettings.php:303
422
+ #: app/helper/BPMediaSettings.php:305
423
  msgid "Atleast one Media Type Must be selected"
424
  msgstr ""
425
 
426
+ #: app/helper/BPMediaSettings.php:305
427
  msgid "Media Type"
428
  msgstr ""
429
 
430
+ #: app/helper/BPMediaSettings.php:312
431
+ #: app/helper/BPMediaSettings.php:314
432
  msgid "\"Number of media\" count value should be numeric and greater than 0."
433
  msgstr ""
434
 
435
+ #: app/helper/BPMediaSettings.php:314
436
  msgid "Default Count"
437
  msgstr ""
438
 
439
+ #: app/helper/BPMediaSettings.php:318
440
  msgid "Settings saved."
441
  msgstr ""
442
 
443
+ #: app/helper/BPMediaSettings.php:331
444
+ #, php-format
445
+ msgid "If you make changes to width, height or crop settings, you must use \"<a href=\"%s\">Regenerate Thumbnail Plugin</a>\" to regenerate old images.\""
446
+ msgstr ""
447
+
448
+ #: app/helper/BPMediaSettings.php:358
449
  msgid "Please provide \"option\" value ( required ) in the argument. Pass argument to add_settings_field in the following format array( 'option' => 'option_name' ) "
450
  msgstr ""
451
 
452
+ #: app/helper/BPMediaSettings.php:403
453
+ #: app/helper/BPMediaSettings.php:452
454
+ #: app/helper/BPMediaSettings.php:531
455
  msgid "Please provide \"option\" value ( required ) in the argument. Pass argument to add_settings_field in the following format array( 'option' => 'option_name' )"
456
  msgstr ""
457
 
458
+ #: app/helper/BPMediaSettings.php:405
459
  msgid "Need to specify atleast to radios else use a checkbox instead"
460
  msgstr ""
461
 
462
+ #: app/helper/BPMediaSettings.php:501
463
+ msgid "Width"
464
+ msgstr ""
465
+
466
+ #: app/helper/BPMediaSettings.php:502
467
+ msgid "Height"
468
+ msgstr ""
469
+
470
+ #: app/helper/BPMediaSettings.php:503
471
+ msgid "Crop"
472
+ msgstr ""
473
+
474
+ #: app/helper/BPMediaSettings.php:533
475
  msgid "Please provide some values to populate the dropdown. Format : array( 'value' => 'option' )"
476
  msgstr ""
477
 
478
+ #: app/helper/BPMediaSettings.php:548
479
  msgid "None"
480
  msgstr ""
481
 
482
+ #: app/helper/BPMediaSettings.php:602
483
  msgid "BuddyPress Media 2.6 requires a database upgrade. "
484
  msgstr ""
485
 
486
+ #: app/helper/BPMediaSettings.php:610
487
+ msgid "If your site has some issues due to BuddyPress Media and you want one on one support then you can create a support topic on the <a target=\"_blank\" href=\"http://rtcamp.com/support/forum/buddypress-media/technical-support/\">rtCamp Support Forum</a>."
488
+ msgstr ""
489
+
490
+ #: app/helper/BPMediaSettings.php:611
491
+ msgid "If you have any suggestions, enhancements or bug reports, then you can open a new issue on <a target=\"_blank\" href=\"https://github.com/rtCamp/buddypress-media/issues/new\">GitHub</a>."
492
+ msgstr ""
493
+
494
+ #: app/admin/BPMediaAdmin.php:68
495
+ msgid "Please do not refresh this page."
496
+ msgstr ""
497
+
498
+ #: app/admin/BPMediaAdmin.php:69
499
+ msgid "Something went wronng. Please <a href onclick=\"location.reload();\">refresh</a> page."
500
+ msgstr ""
501
+
502
+ #: app/admin/BPMediaAdmin.php:88
503
  msgid "BuddyPress Media Component"
504
  msgstr ""
505
 
506
+ #: app/admin/BPMediaAdmin.php:88
507
+ #: app/admin/BPMediaAdmin.php:212
508
+ #: app/admin/BPMediaAdmin.php:213
509
  msgid "BuddyPress Media"
510
  msgstr ""
511
 
512
+ #: app/admin/BPMediaAdmin.php:89
513
+ #: app/admin/BPMediaAdmin.php:240
514
  msgid "BuddyPress Media Settings"
515
  msgstr ""
516
 
517
+ #: app/admin/BPMediaAdmin.php:89
518
+ #: app/admin/BPMediaAdmin.php:241
519
+ #: app/main/BuddyPressMedia.php:443
520
  msgid "Settings"
521
  msgstr ""
522
 
523
+ #: app/admin/BPMediaAdmin.php:91
524
  msgid "BuddyPress Media Database Update"
525
  msgstr ""
526
 
527
+ #: app/admin/BPMediaAdmin.php:94
528
+ #: app/admin/BPMediaAdmin.php:270
529
+ #: app/admin/BPMediaAdmin.php:271
530
  msgid "Importer"
531
  msgstr ""
532
 
533
+ #: app/admin/BPMediaAdmin.php:96
534
+ #: app/admin/BPMediaAdmin.php:247
535
  msgid "BuddyPress Media Addons"
536
  msgstr ""
537
 
538
+ #: app/admin/BPMediaAdmin.php:96
539
+ #: app/admin/BPMediaAdmin.php:248
540
  msgid "Addons"
541
  msgstr ""
542
 
543
+ #: app/admin/BPMediaAdmin.php:97
544
+ #: app/admin/BPMediaAdmin.php:254
545
  msgid "BuddyPress Media Support"
546
  msgstr ""
547
 
548
+ #: app/admin/BPMediaAdmin.php:97
549
  msgid "Support "
550
  msgstr ""
551
 
552
+ #: app/admin/BPMediaAdmin.php:99
553
  msgid "BuddyPress Media Convert Videos"
554
  msgstr ""
555
 
556
+ #: app/admin/BPMediaAdmin.php:99
557
+ #: app/admin/BPMediaAdmin.php:263
558
  msgid "Convert Videos"
559
  msgstr ""
560
 
561
+ #: app/admin/BPMediaAdmin.php:160
562
  #: app/importers/BPMediaAlbumimporter.php:91
563
+ #: app/main/BuddyPressMedia.php:301
564
+ #: app/main/BuddyPressMedia.php:304
565
  #: app/main/BPMediaComponent.php:297
566
  #: app/main/BPMediaComponent.php:298
567
  #: app/main/BPMediaComponent.php:304
568
  msgid "Media"
569
  msgstr ""
570
 
571
+ #: app/admin/BPMediaAdmin.php:182
572
  msgid "By"
573
  msgstr ""
574
 
575
+ #: app/admin/BPMediaAdmin.php:182
576
  msgid "Empowering The Web With WordPress"
577
  msgstr ""
578
 
579
+ #: app/admin/BPMediaAdmin.php:262
 
 
 
 
580
  msgid "BuddyPress Media Covert Videos"
581
  msgstr ""
582
 
583
+ #: app/admin/BPMediaAdmin.php:363
584
  #, php-format
585
  msgid "I use @buddypressmedia http://goo.gl/8Upmv on %s"
586
  msgstr ""
587
 
588
+ #: app/admin/BPMediaAdmin.php:364
589
  msgid "Add link to footer"
590
  msgstr ""
591
 
592
+ #: app/admin/BPMediaAdmin.php:365
593
  msgid "Tweet"
594
  msgstr ""
595
 
596
+ #: app/admin/BPMediaAdmin.php:366
597
  msgid "Rate on WordPress.org"
598
  msgstr ""
599
 
600
+ #: app/admin/BPMediaAdmin.php:367
601
  msgid "Spread the Word"
602
  msgstr ""
603
 
604
+ #: app/admin/BPMediaAdmin.php:377
605
  msgid "USD"
606
  msgstr ""
607
 
608
+ #: app/admin/BPMediaAdmin.php:386
609
  msgid "OR"
610
  msgstr ""
611
 
612
+ #: app/admin/BPMediaAdmin.php:387
613
  msgid "Use <a href=\"https://rtcamp.com/store/product-category/buddypress/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media\">premium add-ons</a> starting from $9"
614
  msgstr ""
615
 
616
+ #: app/admin/BPMediaAdmin.php:389
617
  msgid "Donate"
618
  msgstr ""
619
 
620
+ #: app/admin/BPMediaAdmin.php:403
621
  msgid "Become a fan on Facebook"
622
  msgstr ""
623
 
624
+ #: app/admin/BPMediaAdmin.php:403
625
  msgid "Facebook"
626
  msgstr ""
627
 
628
+ #: app/admin/BPMediaAdmin.php:404
629
  msgid "Follow us on Twitter"
630
  msgstr ""
631
 
632
+ #: app/admin/BPMediaAdmin.php:404
633
  msgid "Twitter"
634
  msgstr ""
635
 
636
+ #: app/admin/BPMediaAdmin.php:405
637
  msgid "Subscribe to our feeds"
638
  msgstr ""
639
 
640
+ #: app/admin/BPMediaAdmin.php:405
641
  msgid "RSS Feed"
642
  msgstr ""
643
 
644
+ #: app/admin/BPMediaAdmin.php:407
645
  msgid "Subscribe"
646
  msgstr ""
647
 
648
+ #: app/admin/BPMediaAdmin.php:410
649
  msgid "Latest News"
650
  msgstr ""
651
 
652
+ #: app/admin/BPMediaAdmin.php:454
653
+ #, php-format
654
+ msgid "You have images enabled on BuddyPress Media but your network allowed filetypes does not allow uploading of %s. Click <a href=\"%s\">here</a> to change your settings manually."
655
+ msgstr ""
656
+
657
+ #: app/admin/BPMediaAdmin.php:455
658
+ #: app/admin/BPMediaAdmin.php:466
659
+ #: app/admin/BPMediaAdmin.php:475
660
+ msgid "Recommended"
661
+ msgstr ""
662
+
663
+ #: app/admin/BPMediaAdmin.php:455
664
+ #: app/admin/BPMediaAdmin.php:466
665
+ #: app/admin/BPMediaAdmin.php:475
666
+ msgid "Update Network Settings Automatically"
667
+ msgstr ""
668
+
669
+ #: app/admin/BPMediaAdmin.php:465
670
+ #, php-format
671
+ msgid "You have video enabled on BuddyPress Media but your network allowed filetypes does not allow uploading of mp4. Click <a href=\"%s\">here</a> to change your settings manually."
672
+ msgstr ""
673
+
674
+ #: app/admin/BPMediaAdmin.php:474
675
+ #, php-format
676
+ msgid "You have audio enabled on BuddyPress Media but your network allowed filetypes does not allow uploading of mp3. Click <a href=\"%s\">here</a> to change your settings manually."
677
+ msgstr ""
678
+
679
+ #: app/admin/BPMediaAdmin.php:489
680
+ msgid "Network settings updated successfully."
681
+ msgstr ""
682
+
683
  #: app/importers/BPMediaAlbumimporter.php:72
684
  msgid "Warning!"
685
  msgstr ""
793
  msgid "<a href=\"%s\">Install BuddyPress now</a>"
794
  msgstr ""
795
 
796
+ #: app/main/BuddyPressMedia.php:306
797
  msgid "Privacy"
798
  msgstr ""
799
 
800
+ #: app/main/BuddyPressMedia.php:312
801
  msgid "Photo"
802
  msgstr ""
803
 
804
+ #: app/main/BuddyPressMedia.php:315
805
  msgid "Videos"
806
  msgstr ""
807
 
808
+ #: app/main/BuddyPressMedia.php:321
809
+ #: app/main/BuddyPressMedia.php:324
810
  msgid "Music"
811
  msgstr ""
812
 
813
+ #: app/main/BuddyPressMedia.php:327
814
  #: app/main/BPMediaComponent.php:255
815
  #: app/main/BPMediaComponent.php:267
816
  msgid "Albums"
817
  msgstr ""
818
 
819
+ #: app/main/BuddyPressMedia.php:330
820
  #: app/main/BPMediaComponent.php:256
821
  msgid "Album"
822
  msgstr ""
823
 
824
+ #: app/main/BuddyPressMedia.php:333
825
  msgid "Upload"
826
  msgstr ""
827
 
828
+ #: app/main/BuddyPressMedia.php:547
829
  #, php-format
830
  msgid ""
831
  "The BuddyPress version installed is an\n"
835
  "\t\t\t\t\t\t\t\t\t\t<a class=\"alignright\" href=\"%1$s\">X</a>"
836
  msgstr ""
837
 
838
+ #: app/main/BuddyPressMedia.php:560
839
  #, php-format
840
  msgid ""
841
  "You have not installed BuddyPress.\n"
943
  msgid "This %s is visible to logged in users, only"
944
  msgstr ""
945
 
946
+ #: app/main/includes/BPMediaFilters.php:158
947
  #, php-format
948
  msgid "Delete %s"
949
  msgstr ""
950
 
951
+ #: app/main/includes/BPMediaFilters.php:409
952
  msgid "Total Photos"
953
  msgstr ""
954
 
955
+ #: app/main/includes/BPMediaFilters.php:410
956
  msgid "Total Videos"
957
  msgstr ""
958
 
959
+ #: app/main/includes/BPMediaFilters.php:411
960
  msgid "Total Audio"
961
  msgstr ""
962
 
963
+ #: app/main/includes/BPMediaFilters.php:412
964
  msgid "Total Albums"
965
  msgstr ""
966
 
988
  msgid "Error Uploading File"
989
  msgstr ""
990
 
991
+ #: app/main/includes/BPMediaHostWordpress.php:170
992
  msgid "MP4 file you have uploaded is corrupt."
993
  msgstr ""
994
 
995
+ #: app/main/includes/BPMediaHostWordpress.php:177
996
+ #: app/main/includes/BPMediaHostWordpress.php:182
997
  msgid "The MP4 file you have uploaded is using an unsupported video codec. Supported video codec is H.264."
998
  msgstr ""
999
 
1000
+ #: app/main/includes/BPMediaHostWordpress.php:187
1001
  msgid "The MP4 file you have uploaded is not a video file."
1002
  msgstr ""
1003
 
1004
+ #: app/main/includes/BPMediaHostWordpress.php:198
1005
  msgid "MP3 file you have uploaded is currupt."
1006
  msgstr ""
1007
 
1008
+ #: app/main/includes/BPMediaHostWordpress.php:205
1009
+ #: app/main/includes/BPMediaHostWordpress.php:210
1010
  msgid "The MP3 file you have uploaded is using an unsupported audio format. Supported audio format is MP3."
1011
  msgstr ""
1012
 
1013
+ #: app/main/includes/BPMediaHostWordpress.php:215
1014
  msgid "The MP3 file you have uploaded is not an audio file."
1015
  msgstr ""
1016
 
1017
+ #: app/main/includes/BPMediaHostWordpress.php:227
1018
  msgid "Media File you have tried to upload is not supported. Supported media files are .jpg, .png, .gif, .mp3, .mov and .mp4."
1019
  msgstr ""
1020
 
1021
+ #: app/main/includes/BPMediaHostWordpress.php:236
1022
  msgid "Error creating attachment for the media file, please try again"
1023
  msgstr ""
1024
 
1025
+ #: app/main/includes/BPMediaHostWordpress.php:346
1026
  #, php-format
1027
  msgid "%s uploaded a media."
1028
  msgstr ""
1029
 
1030
+ #: app/main/includes/BPMediaHostWordpress.php:367
1031
  msgid "Uploaded by "
1032
  msgstr ""
1033
 
1034
+ #: app/main/includes/BPMediaHostWordpress.php:592
1035
  #, php-format
1036
  msgid "Comment <span>%s</span>"
1037
  msgstr ""
1038
 
1039
+ #: app/main/includes/BPMediaHostWordpress.php:596
1040
  msgid "Favorite"
1041
  msgstr ""
1042
 
1043
+ #: app/main/includes/BPMediaHostWordpress.php:598
1044
  msgid "Remove Favorite"
1045
  msgstr ""
1046
 
1047
+ #: app/main/includes/BPMediaHostWordpress.php:617
1048
  msgid "Post"
1049
  msgstr ""
1050
 
1051
+ #: app/main/includes/BPMediaHostWordpress.php:617
1052
  msgid "or press esc to cancel."
1053
  msgstr ""
1054
 
1055
+ #: app/main/includes/BPMediaHostWordpress.php:642
1056
  msgid "Delete"
1057
  msgstr ""
1058
 
1059
+ #: app/main/includes/BPMediaHostWordpress.php:744
1060
+ #: app/main/includes/BPMediaActions.php:921
1061
  #: app/main/group/BPMediaGroupAction.php:124
1062
  #, php-format
1063
  msgid "%1$s added a %2$s"
1064
  msgstr ""
1065
 
1066
+ #: app/main/includes/BPMediaHostWordpress.php:1019
1067
  msgid "Wall Posts"
1068
  msgstr ""
1069
 
1070
+ #: app/main/includes/BPMediaActions.php:74
1071
+ #: app/main/includes/BPMediaActions.php:98
1072
  msgid "File uploaded is not supported"
1073
  msgstr ""
1074
 
1075
+ #: app/main/includes/BPMediaActions.php:81
1076
  msgid "Image uploads are disabled"
1077
  msgstr ""
1078
 
1079
+ #: app/main/includes/BPMediaActions.php:87
1080
  msgid "Video uploads are disabled"
1081
  msgstr ""
1082
 
1083
+ #: app/main/includes/BPMediaActions.php:93
1084
  msgid "Audio uploads are disabled"
1085
  msgstr ""
1086
 
1087
+ #: app/main/includes/BPMediaActions.php:112
1088
  msgid "Upload Successful"
1089
  msgstr ""
1090
 
1091
+ #: app/main/includes/BPMediaActions.php:117
1092
  msgid "You did not specified a file to upload"
1093
  msgstr ""
1094
 
1095
+ #: app/main/includes/BPMediaActions.php:183
1096
+ msgid "Something went wrong. Please try again."
1097
+ msgstr ""
1098
+
1099
+ #: app/main/includes/BPMediaActions.php:184
1100
+ msgid "Are you sure you want to merge this album?"
1101
+ msgstr ""
1102
+
1103
+ #: app/main/includes/BPMediaActions.php:185
1104
+ msgid "Would you like to delete this album after the merge?"
1105
+ msgstr ""
1106
+
1107
+ #: app/main/includes/BPMediaActions.php:186
1108
+ msgid "Are you sure you want to delete the selected media?"
1109
+ msgstr ""
1110
+
1111
+ #: app/main/includes/BPMediaActions.php:187
1112
+ msgid "Are you sure you want to delete this activity and associated media?"
1113
+ msgstr ""
1114
+
1115
+ #: app/main/includes/BPMediaActions.php:188
1116
+ msgid "Are you sure?"
1117
+ msgstr ""
1118
+
1119
+ #: app/main/includes/BPMediaActions.php:189
1120
+ msgid "Please select media."
1121
+ msgstr ""
1122
+
1123
+ #: app/main/includes/BPMediaActions.php:190
1124
+ msgid "Please select an action."
1125
+ msgstr ""
1126
+
1127
+ #: app/main/includes/BPMediaActions.php:330
1128
  msgid "Download"
1129
  msgstr ""
1130
 
1131
+ #: app/main/includes/BPMediaActions.php:337
1132
+ #: app/main/includes/BPMediaActions.php:971
1133
  msgid "Set as Album Cover"
1134
  msgstr ""
1135
 
1136
+ #: app/main/includes/BPMediaActions.php:342
1137
+ #: app/main/includes/BPMediaActions.php:974
1138
  msgid "Unset as Album Cover"
1139
  msgstr ""
1140
 
1141
+ #: app/main/includes/BPMediaActions.php:348
1142
  msgid "Edit Media"
1143
  msgstr ""
1144
 
1145
+ #: app/main/includes/BPMediaActions.php:348
1146
  msgid "Edit"
1147
  msgstr ""
1148
 
1149
+ #: app/main/includes/BPMediaActions.php:529
1150
+ msgid "You have not filled the album name"
1151
+ msgstr ""
1152
+
1153
+ #: app/main/includes/BPMediaActions.php:530
1154
+ msgid "Sorry you cannot create albums in this group"
1155
+ msgstr ""
1156
+
1157
+ #: app/main/includes/BPMediaActions.php:531
1158
+ msgid "Please Select an Album !!"
1159
+ msgstr ""
1160
+
1161
+ #: app/main/includes/BPMediaActions.php:874
1162
  #, php-format
1163
  msgid "%1$s created an album %2$s"
1164
  msgstr ""
1165
 
1166
+ #: app/main/includes/BPMediaActions.php:1159
1167
+ msgid "Private"
1168
+ msgstr ""
1169
+
1170
+ #: app/main/includes/BPMediaActions.php:1171
1171
+ msgid "No media found"
1172
+ msgstr ""
1173
+
1174
  #: app/main/includes/bp-media-upload-handler.php:32
1175
  msgid "You are not allowed to be here"
1176
  msgstr ""
1177
 
1178
+ #: app/main/includes/BPMediaFunction.php:168
1179
  msgid "You do not have access to this page."
1180
  msgstr ""
1181
 
1182
+ #: app/main/includes/BPMediaFunction.php:229
1183
  #, php-format
1184
  msgid "%1$s added new media in album %2$s"
1185
  msgstr ""
1342
  msgid "Add Media"
1343
  msgstr ""
1344
 
1345
+ #: app/main/profile/BPMediaAlbumScreen.php:82
1346
  #: app/main/profile/BPMediaScreen.php:194
1347
  #, php-format
1348
  msgid "Sorry, no %s were found."
1349
  msgstr ""
1350
 
1351
+ #: app/main/profile/BPMediaAlbumScreen.php:134
1352
  msgid "Sorry, no media items were found in this album."
1353
  msgstr ""
1354
 
1355
+ #: app/main/profile/BPMediaAlbumScreen.php:250
1356
+ #: app/main/profile/BPMediaAlbumScreen.php:258
1357
+ msgid "Delete Album"
1358
+ msgstr ""
1359
+
1360
+ #: app/main/profile/BPMediaAlbumScreen.php:254
1361
+ #: app/main/profile/BPMediaAlbumScreen.php:300
1362
+ msgid "Select All Visible"
1363
+ msgstr ""
1364
+
1365
+ #: app/main/profile/BPMediaAlbumScreen.php:255
1366
+ #: app/main/profile/BPMediaAlbumScreen.php:301
1367
+ msgid "Unselect All Visible"
1368
+ msgstr ""
1369
+
1370
+ #: app/main/profile/BPMediaAlbumScreen.php:256
1371
+ msgid "Delete Selected Media"
1372
+ msgstr ""
1373
+
1374
+ #: app/main/profile/BPMediaAlbumScreen.php:298
1375
+ msgid "Move"
1376
+ msgstr ""
1377
+
1378
+ #: app/main/profile/BPMediaAlbumScreen.php:302
1379
+ msgid "Move selected"
1380
+ msgstr ""
1381
+
1382
+ #: app/main/profile/BPMediaAlbumScreen.php:302
1383
+ msgid "Move all"
1384
+ msgstr ""
1385
+
1386
+ #: app/main/profile/BPMediaAlbumScreen.php:303
1387
+ msgid "to"
1388
+ msgstr ""
1389
+
1390
+ #: app/main/profile/BPMediaAlbumScreen.php:303
1391
+ msgid "Submit"
1392
+ msgstr ""
1393
+
1394
  #: app/main/profile/BPMediaScreen.php:112
1395
+ #: app/main/profile/BPMediaScreen.php:372
1396
  msgid "The requested url does not exist"
1397
  msgstr ""
1398
 
1416
  msgid "%s Description"
1417
  msgstr ""
1418
 
1419
+ #: app/main/profile/BPMediaScreen.php:340
1420
  msgid "Update"
1421
  msgstr ""
1422
 
1423
+ #: app/main/profile/BPMediaScreen.php:341
1424
  msgid "Back to Media File"
1425
  msgstr ""
1426
 
1427
+ #: app/main/profile/BPMediaScreen.php:342
1428
  msgid "Back to Media"
1429
  msgstr ""
1430
 
1431
+ #: app/main/profile/BPMediaScreen.php:394
1432
  msgid "Media deleted successfully"
1433
  msgstr ""
1434
 
readme.txt CHANGED
@@ -5,8 +5,8 @@ Tags: BuddyPress, media, multimedia, album, audio, songs, music, video, photo, i
5
  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.6
9
- Stable tag: 2.9
10
 
11
  Adds Photos, Music, Videos & Albums to BuddyPress. Supports mobile devices (iPhone/iPad, etc) and automatic audio/video conversion.
12
 
@@ -35,6 +35,7 @@ BuddyPress Media adds Photos, Music, Videos & Albums to your BuddyPress powered
35
  * **Groups** Supported: Users can upload media on Groups, as well!
36
  * **HTML5 playback**: with fall back to flash/silverlight player support
37
  * **Privacy**: Users can control access to their uploaded media
 
38
  * **Automatic conversion** (*premium*): of common audio & video formats to mp3/mp4 via [Kaltura Add-On](http://rtcamp.com/store/buddypress-media-kaltura/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "BuddyPress Media Kaltura Addon for Kaltura.com/Kaltura-CE/Kaltura On-Prem version"), and [FFMPEG Add-On](http://rtcamp.com/store/buddypress-media-ffmpeg/ "BuddyPress Media FFMPEG Addon")
39
 
40
  = Roadmap =
@@ -91,6 +92,8 @@ BuddyPress Media is now available in *Brazilian Portuguese*, *Spanish*, *Japanes
91
  * [German](https://rtcamp.com/translate/projects/buddypress-media/de/default) translation by [hannes.muc]
92
  * [French](https://rtcamp.com/translate/projects/buddypress-media/fr/default) translation by [Peter Lewit](http://profiles.wordpress.org/deegan)
93
 
 
 
94
  == Installation ==
95
 
96
  * Install the plugin from the 'Plugins' section in your dashboard (Go to `Plugins > Add New > Search` and search for BuddyPress Media).
@@ -122,13 +125,19 @@ Please visit [BuddyPress Media's Features page](http://rtcamp.com/buddypress-med
122
 
123
  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.
124
 
 
 
 
 
 
 
125
  = 2.9 =
126
  * Adds options to specify Media Sizes
127
  * Adds options to modify the image ( Crop, Rotate, Flip & Scale )
128
  * Creates only required image sizes ( Rather than all registered image sizes )
129
  * Adds thickbox to BuddyPress Media Widget
130
  * Fixes bug in js
131
- * Adds framework for shotcode support ( Functionality will be added in the next release )
132
 
133
  = 2.8.1 =
134
  * Improved i18n support, thanks to [David Decker](http://profiles.wordpress.org/daveshine/)
@@ -365,5 +374,5 @@ Please visit [BuddyPress Media's Roadmap page](http://rtcamp.com/buddypress-medi
365
  * HTML5 Video Tag Support (with fallback)
366
 
367
  == Upgrade Notice ==
368
- = 2.9 =
369
- Adds Image Editor
5
  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.10
10
 
11
  Adds Photos, Music, Videos & Albums to BuddyPress. Supports mobile devices (iPhone/iPad, etc) and automatic audio/video conversion.
12
 
35
  * **Groups** Supported: Users can upload media on Groups, as well!
36
  * **HTML5 playback**: with fall back to flash/silverlight player support
37
  * **Privacy**: Users can control access to their uploaded media
38
+ * **Shortcode**: Display public media of all the users on the site
39
  * **Automatic conversion** (*premium*): of common audio & video formats to mp3/mp4 via [Kaltura Add-On](http://rtcamp.com/store/buddypress-media-kaltura/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "BuddyPress Media Kaltura Addon for Kaltura.com/Kaltura-CE/Kaltura On-Prem version"), and [FFMPEG Add-On](http://rtcamp.com/store/buddypress-media-ffmpeg/ "BuddyPress Media FFMPEG Addon")
40
 
41
  = Roadmap =
92
  * [German](https://rtcamp.com/translate/projects/buddypress-media/de/default) translation by [hannes.muc]
93
  * [French](https://rtcamp.com/translate/projects/buddypress-media/fr/default) translation by [Peter Lewit](http://profiles.wordpress.org/deegan)
94
 
95
+ (**Note**: Credits are given for translations that are at least 50% complete.)
96
+
97
  == Installation ==
98
 
99
  * Install the plugin from the 'Plugins' section in your dashboard (Go to `Plugins > Add New > Search` and search for BuddyPress Media).
125
 
126
  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.
127
 
128
+ = 2.10 =
129
+ * Adds album management options (Merge/Move/Delete)
130
+ * Adds shortcode to display media [bpmedia]
131
+ * Adds localization to JS
132
+ * Added partial Arabic and Persion translations
133
+
134
  = 2.9 =
135
  * Adds options to specify Media Sizes
136
  * Adds options to modify the image ( Crop, Rotate, Flip & Scale )
137
  * Creates only required image sizes ( Rather than all registered image sizes )
138
  * Adds thickbox to BuddyPress Media Widget
139
  * Fixes bug in js
140
+ * Adds framework for shortcode support ( Functionality will be added in the next release )
141
 
142
  = 2.8.1 =
143
  * Improved i18n support, thanks to [David Decker](http://profiles.wordpress.org/daveshine/)
374
  * HTML5 Video Tag Support (with fallback)
375
 
376
  == Upgrade Notice ==
377
+ = 2.10 =
378
+ Adds album management options (Merge/Move/Delete), shortcode to display media