Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Admin UI changes

  • Loading branch information...
commit abeb8137ba0f488813da9cfe17139fcb5b673f59 1 parent 8e2c4c3
@rahul286 rahul286 authored
View
4 .gitignore
@@ -1,2 +1,4 @@
*.DS_Store
-/nbproject/private/
+*.swp
+*.bak
+/nbproject/private/
View
43 includes/bp-media-admin.php
@@ -69,7 +69,7 @@ function bp_media_on_load_page() {
switch ( $tab ) {
case 'bp-media-addons' :
// All metaboxes registered during load page can be switched off/on at "Screen Options" automatically, nothing special to do therefore
- add_meta_box('bp-media-addons-list_metabox',__('BuddyPress Media Addons','bp-media'),'bp_media_addons_list','bp-media-settings', 'normal', 'core' );
+ add_meta_box('bp-media-addons-list_metabox',__('BuddyPress Media Addons for Audio/Video Conversion','bp-media'),'bp_media_addons_list','bp-media-settings', 'normal', 'core' );
break;
case 'bp-media-support' :
// All metaboxes registered during load page can be switched off/on at "Screen Options" automatically, nothing special to do therefore
@@ -308,32 +308,30 @@ function bp_media_addons_list(){ ?>
<a href="http://rtcamp.com/store/buddypress-media-kaltura/" title="BuddyPress - Media Kaltura Add-on">
<img width="240" height="184" title="BuddyPress - Media Kaltura Add-on" alt="BuddyPress - Media Kaltura Add-on" src="http://cdn.rtcamp.com/files/2012/10/new-buddypress-media-kaltura-logo-240x184.png">
</a>
- <h4><a href="http://rtcamp.com/store/buddypress-media-kaltura/" title="BuddyPress - Media Kaltura Add-on">BuddyPress &ndash; Media Kaltura Add-on</a></h4>
- <span class="price"><span class="amount">$99</span></span>
+ <h4><a href="http://rtcamp.com/store/buddypress-media-kaltura/" title="BuddyPress - Media Kaltura Add-on">BuddyPress-Media Kaltura Add-on</a></h4>
<div class="product_desc">
- <p>This plugins add automatic video conversion support for BuddyPress media plugin.
-It supports many popular video formats. It makes use of Kaltura server to encode various video formats to HTML5 supported MP4 file.</p>
-
+ <p>Add support for more video formats using Kaltura video solution.</p>
+ <p>Works with Kaltura.com, self-hosted Kaltura-CE and Kaltura-on-premise.</p>
</div>
- <div class="product_footer">
- <a class="alignleft product_demo_link" href="http://demo.rtcamp.com/bpm-kaltura/" title="BuddyPress Media Kaltura Add-on">Live Demo</a>
- <a class="add_to_cart_button product_type_simple" data-product_id="15446" href="http://rtcamp.com/store/?add-to-cart=15446"><?php _e('Buy Now', 'bp-media'); ?></a>
- </div><!-- .product_footer -->
+ <div class="product_footer">
+ <span class="price alignleft"><span class="amount">$99</span></span>
+ <a class="add_to_cart_button alignright product_type_simple" href="http://rtcamp.com/store/?add-to-cart=15446"><?php _e('Buy Now', 'bp-media'); ?></a>
+ <a class="alignleft product_demo_link" href="http://demo.rtcamp.com/bpm-kaltura/" title="BuddyPress Media Kaltura Add-on">Live Demo</a>
+ </div><!-- .product_footer -->
</li>
-
<li class="product last">
<a href="http://rtcamp.com/store/buddypress-media-ffmpeg-converter/" title="BuddyPress-Media FFMPEG Converter Plugin" >
<img width="240" height="184" title="BuddyPress-Media FFMPEG Converter Plugin" alt="BuddyPress-Media FFMPEG Converter Plugin" src="http://cdn.rtcamp.com/files/2012/09/ffmpeg-logo-240x184.png">
</a>
- <h4><a href="http://rtcamp.com/store/buddypress-media-ffmpeg-converter/" title="BuddyPress-Media FFMPEG Converter Plugin" >BuddyPress-Media FFMPEG Converter Plugin</a></h4>
- <span class="price"><span class="amount">$49</span></span>
+ <h4><a href="http://rtcamp.com/store/buddypress-media-ffmpeg-converter/" title="BuddyPress-Media FFMPEG Converter Plugin" >BuddyPress-Media FFMPEG Add-on</a></h4>
<div class="product_desc">
- <p>This plugins add automatic video conversion support for BuddyPress media plugin.</p>
- <p>It supports many popular audio & video formats. It is also capable of handling queues, multiple processor for encoding on your server.</p>
+ <p>Add supports for more audio &amp; video formats using open-source <a href="https://github.com/rtCamp/media-node">media-node</a>.</p>
+ <p>Media node comes with automated setup script for Ubuntu/Debian.</p>
</div>
<div class="product_footer">
- <a class="alignleft product_demo_link" href="http://demo.rtcamp.com/bpm-media" title="BuddyPress Media FFMPEG Add-on">Live Demo</a>
- <a class="add_to_cart_button product_type_simple" data-product_id="13677" href="http://rtcamp.com/store/?add-to-cart=13677"><?php _e('Buy Now', 'bp-media'); ?></a>
+ <span class="price alignleft"><span class="amount">$49</span></span>
+ <a class="add_to_cart_button alignright product_type_simple" href="http://rtcamp.com/store/?add-to-cart=13677"><?php _e('Buy Now', 'bp-media'); ?></a>
+ <a class="alignleft product_demo_link" href="http://demo.rtcamp.com/bpm-media" title="BuddyPress Media FFMPEG Add-on">Live Demo</a>
</div><!-- .product_footer -->
</li>
@@ -356,13 +354,8 @@ function bp_media_support(){ global $current_user; ?>
<h2><?php _e('Hire Us!', 'bp-media');?></h2>
- <p><?php _e('We are available for customisation and premium support.', 'bp-media');?></p>
-<!-- <ul class="support_list">
- <li>
- <a href="http://rtcamp.com" title="<?php // _e('Premium support', 'bp-media');?>"><?php //_e('Premium support', 'bp-media');?> </a>
- </li>
- </ul>-->
-
+ <h4><a href="http://rtcamp.com/contact/?purpose=hire"><?php _e('We are available for customisation and premium support. Get on touch with us. :-)', 'bp-media');?></a></h4>
+<!--
<div class="bp-media-form" id="premium-support-form" >
<h4><?php _e('Please fill the form for premium support'); ?></h4>
<ul>
@@ -384,7 +377,6 @@ function bp_media_support(){ global $current_user; ?>
</ul>
<p class="submit"><input type="submit" name="premium_form_submit" id="submit" class="button-primary" value="Submit"></p>
</div><!-- .premium-support-form-->
-
<br/>
</div>
@@ -421,6 +413,7 @@ function bp_media_default_admin_sidebar() { ?>
<h3 class="hndle"><span><?php _e('Premium Addons', 'bp-media'); ?></span></h3>
<div class="inside">
<ul>
+ <li><a href="http://rtcamp.com/store/buddypress-media-kaltura/" title="BuddyPress Media Kaltura">BPM-Kaltura</a> - add support for Kaltura.com/Kaltura-CE based video conversion support</li>
<li><a href="http://rtcamp.com/store/buddy-press-media-ffmpeg/" title="BuddyPress Media FFMPEG">BPM-FFMPEG</a> - add FFMEG-based audio/video conversion support</li>
</ul>
<h4><?php printf(__('Are you a developer?','bp-media')) ?></h4>
View
15 includes/css/bp-media-style.css
@@ -16,15 +16,11 @@ ul.bp-media-gallery a{width:150px;}
li.media div.activity-content div.activity-inner p{display:none;}
div.bp_media_title{margin-bottom:10px;}
#bp-media-footer {color: #4D4D4D;text-align: center;text-shadow: #FAFAFA 1px 1px 0;}
-#wpbody-content div.metabox-fixed{width: 280px;margin-right: -300px;float: right;}
-<<<<<<< HEAD
-#wpbody-content div.wrap.bp-media-admin .columns-2{margin-right:300px;}
-=======
+ #wpbody-content div.metabox-fixed{width: 280px;margin-right: -300px;float: right;}
#wpbody-content div.wrap.bp-media-admin .columns-2{margin-right:300px;padding-top: 0;margin-top: 15px;width: 600px}
#wpbody-content .bp-media-settings-tabs{margin-bottom: 15px}
#wpbody-content .bp-media-settings-tabs .media-nav-tab{margin: 0 10px; text-decoration: underline; text-transform: capitalize}
#wpbody-content .bp-media-settings-tabs .media-nav-tab.media-nav-tab-active{font-weight: bold}
->>>>>>> origin/feature-widget
#wpbody-content .wrap div.bp-media-metabox-holder{padding-top: 0}
@@ -82,12 +78,10 @@ div.bp_media_title{margin-bottom:10px;}
#branding #logo{text-align:center;padding: 10px 0;display:block;}
ul#social{display:block;text-align:center;margin:0;}
ul#social li{display:inline;}
-<<<<<<< HEAD
#bp-media-show-more{width: 200px;margin-left: auto;margin-right: auto;display: block;height: 30px;line-height: 30px;font-size: 20px;}
#bp-media-upload-ui.activity-component{margin-left: 74px;margin-top: 10px;}
ul#activity-stream li.media.album_updated ul{}
ul#activity-stream li.media.album_updated ul li{float: left;margin-right:2%}
-=======
/* Addons page Styling */
@@ -103,7 +97,7 @@ ul.products li.product a img, div.product div.images img {box-shadow: 0 1px 3px
ul.products li.product a img {box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.3);display: block;height: auto;margin: 5px 15px 5px 5px;transition: all 0.2s ease-in-out 0s;float: left; width: 200px}
ul.products li.product .price, ul.products li.product .price .amount, ul.products li.product .price ins {color: #85AD74;font-size: 25px;font-weight: bold;}
-ul.products li.product .price {line-height: 1;color: #85AD74;display: block;font-weight: normal;margin-bottom: 0.5em;}
+ul.products li.product .price {line-height: 1.4em;color: #85AD74;display: block;font-weight: normal;margin-bottom: 0.5em;}
/*ul.products li.product .add_to_cart_button{background-image: linear-gradient(bottom, #F7F6F7 47%, #DFDBDF 74%);
background-image: -o-linear-gradient(bottom, #F7F6F7 0%, #DFDBDF 100%);
background-image: -moz-linear-gradient(bottom, #F7F6F7 0%, #DFDBDF 100%);
@@ -120,8 +114,8 @@ background-image: -ms-linear-gradient(bottom, #F7F6F7 0%, #D3CED3 100%);
background-image: -webkit-gradient(linear,left bottom,left top,color-stop(1, #F7F6F7),color-stop(1, #D3CED3));}
*/
ul.products li.product .product_footer{margin: 20px 0 0;overflow: hidden;}
-ul.products li.product .add_to_cart_button{background: none repeat scroll 0 0 #C45200;border: 0 none;box-shadow: 0 0 0;color: #FFFFFF;display: inline-block;float: right;font-size: 18px;font-weight: bold;height: auto;line-height: 1.4em;margin: 0;padding: 4px 15px;text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.6)}
-ul.products li.product .product_footer .product_demo_link{font-size: 16px;margin-top: 8px;}
+ul.products li.product .add_to_cart_button{background: #C45200; color: #FFFFFF;display: inline-block;font-size: 18px;font-weight: bold; line-height: 1.4em; margin: 0 20px; padding: 4px 15px;text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.6)}
+ul.products li.product .product_footer .product_demo_link{font-size: 16px;margin: 8px 20px; font-weight: bold}
ul.products li.product .add_to_cart_button:hover{background: none repeat scroll 0 0 #D75A00;
box-shadow: 0 1px rgba(0, 0, 0, 0.2), 0 0 1px rgba(0, 0, 0, 0.4) inset;
@@ -137,4 +131,3 @@ ul.products li.product .add_to_cart_button:hover{background: none repeat scroll
.bp-media-form .bp-media-input{background-color: #FFFFFF;border: 1px solid #DFDFDF;border-radius: 3px 3px 3px 3px;color: #333333;line-height: 16px;padding: 5px;width: 220px;}
.bp-media-form .bp-media-textarea{background-color: #FFFFFF;border: 1px solid #DFDFDF;border-radius: 3px 3px 3px 3px;color: #333333;line-height: 16px;padding: 5px;width: 220px;}
#normal-sortables .postbox .bp-media-form .submit{float: none; margin-left: 150px}
->>>>>>> origin/feature-widget
View
9 loader.php
@@ -23,15 +23,6 @@
/* A constatnt to store database version */
define('BP_MEDIA_DB_VERSION','2.0');
-/* A constant to Active Collab API URL */
-define('BP_MEDIA_AC_API_URL','http://git2.rtcamp.info/public/api.php');
-
-/* A constant to Active Collab API AUTH TOKEN */
-define('BP_MEDIA_AC_API_AUTH_TOKEN','5-9B8qSK0sCpjX3cX0L8Empt19fDJ86l74N4jvChN5');
-
-/* A constant to Active Collab API PROJECT ID */
-define('BP_MEDIA_AC_API_PROJECT_ID','5-9B8qSK0sCpjX3cX0L8Empt19fDJ86l74N4jvChN5');
-
/* A constant to Active Collab API Assignee ID */
define('BP_MEDIA_AC_API_ASSIGNEE_ID','5');
Please sign in to comment.
Something went wrong with that request. Please try again.