Skip to content

Commit

Permalink
Merge pull request #6 from rtCamp/master
Browse files Browse the repository at this point in the history 
updates
  • Loading branch information
@neerukoul
neerukoul committed Feb 13, 2013
2 parents edb5cbb + b24ab3c commit a1a3d9a
Show file tree
Hide file tree
Showing 13 changed files with 784 additions and 669 deletions.
90 changes: 55 additions & 35 deletions app/assets/css/main.css
View file
Expand Up @@ -34,28 +34,40 @@ div.bp_media_title{margin-bottom:10px;}
.bp-media-rss{background-position: 35px 0px;}
.bp-media-rss:hover{background-position: 35px 36px;}
/*#bp-media-upload-ui{position: relative;}*/


#bp-media-upload-ui #drag-drop-area{border: 4px dashed #DDD;height: 150px;width: 150px;}
.upload #bp-media-upload-ui #drag-drop-area{height: auto; width: 100%;}
#bp-media-upload-ui .drag-drop-inside{margin:auto;width: 100%;}
#bp-media-album-prompt{margin: 0;position: absolute;right: 0;text-align: right;top: 2px;min-width: 200px;}
#bp-media-album-prompt span{float: left;line-height: 25px;margin-right: 15px;}
#bp-media-album-prompt .bp-media-album-content{float: left;}
#bp-media-album-prompt #create-new{background-color: #DF562C;color: #fff;}
#bp-media-album-prompt div.hide{display: none;position: absolute;right: 0;top: 0;z-index: 100;position: relative;}
#bp-media-album-prompt #bp_media_album_new {width: 160px;}
#bp-media-album-prompt input.button{height: 25px;margin-left: 5px;padding: 0 10px;position: relative;top: -1px;}
div.bp-media-area-allocate{display: block;height: 15px;}
div.bp_media_create_album{text-align: right}
#bp_media_album_name{margin-bottom: 6px;}
#item-body:after,ul.bp-media-gallery.item-list:after{content: " ";clear: both;display: block;text-indent: -9999em;}
#item-body{position: relative;}

#bp-media-upload-ui .drag-drop-inside p{display: block;text-align: center;color: #AAA;margin: 12px 0;}
#bp-media-upload-ui .drag-drop-info{font-size: 20px;}
#bp-media-upload-ui .drag-drop-buttons input{border-color: #BBB;color: #464646;text-decoration: none;font-size: 12px!important;line-height: 13px;padding: 3px 8px;cursor: pointer;border-width: 1px;border-style: solid;-webkit-border-radius: 11px;border-radius: 11px;-moz-box-sizing: content-box;-webkit-box-sizing: content-box;box-sizing: content-box;}
#bp-media-uploaded-files{background: none repeat scroll 0 0 #DDDDDD;left: 0;margin-top: 5px;position: absolute;top: 155px;width: 100%;}
.bp-media-area-allocate{height: 10px;width: 100%;display: block;}
li #bp-media-upload-ui {padding: 0;max-width: 158px;}
#bp-media-upload-ui #drag-drop-area{border: 4px dashed #DDD;min-height: 140px;text-align: center;background: url('../img/drag-drop-bg.png') repeat scroll 0 0 transparent;overflow: hidden;}
li #bp-media-upload-ui #drag-drop-area{max-width: 150px;min-height: 150px;}
#bp-media-upload-ui .drag-drop-space{margin: 18px auto 0;max-width: 400px;overflow: hidden;}
#bp-media-upload-ui .drag-drop-inside{float: left;margin: 0 auto 15px;width: 47%;}
.albums #bp-media-upload-ui .drag-drop-inside{float: none;width: auto;}
li #bp-media-upload-ui .drag-drop-inside,li #bp-media-upload-ui #bp-media-album-prompt{float: none;margin: 0 auto 15px;max-width: 100%;width: auto;}
li #bp-media-upload-ui #bp-media-album-prompt{margin: 12px auto 0;max-width: 144px;}
#bp-media-upload-ui #bp-media-album-prompt{float: right;margin: 12px auto 0;width: 45%;}
#bp-media-upload-ui .drag-drop-inside p.drag-drop-info{font-size: 20px;line-height: 100%;}

#bp-media-upload-ui .drag-drop-buttons input,#bp-media-album-prompt input.button{-moz-box-sizing: content-box;border-color: #BBBBBB;border-radius: 15px;border-style: solid;border-width: 1px;color: #464646;cursor: pointer;font-size: 13px !important;line-height: 13px;padding: 5px 10px;text-decoration: none;}
li #bp-media-album-prompt input.button{font-size: 12px !important;padding: 3px;text-decoration: none;margin-top: 5px;}
#bp-media-selected-album{max-width: 140px;font-size: 14px;width: 100%;margin: 10px 0;}
li #bp-media-album-prompt > p,li #bp-media-upload-ui .drag-drop-space p{display: none;}
.albums li #bp-media-album-prompt > p,.albums li #bp-media-upload-ui .drag-drop-space p{display: block;}
li #bp-media-upload-ui .drag-drop-space p.drag-drop-buttons{display: block;}
#bp-media-album-prompt div.hide{display: none;margin: 0;}
#bp-media-album-prompt > p{font-size: 20px;}
#bp-media-upload-ui .drag-drop-inside p,#bp-media-album-prompt #bp_media_album_new{margin-bottom: 12px;font-size: 14px;}
#bp-media-album-prompt #bp_media_album_new{max-width: 90%;}
li #bp-media-album-prompt #bp_media_album_new{margin: 0;max-width: 134px;width: 94%;}
#bp-media-upload-ui .drag-drop-to{width: 22px;line-height: 22px;margin: 40px auto 0;float: left;}
li #bp-media-upload-ui .drag-drop-to{width: 100%;line-height: 22px;margin: 0;float: none;}
#bp-media-album-in{background-color: #333333;border-radius: 11px 11px 11px 11px;color: #FFFFFF;display: block;float: left;font-size: 14px;line-height: 22px;margin: 30px auto 0;width: 22px;}
li #bp-media-album-in{background-color: #333333;border-radius: 11px 11px 11px 11px;color: #FFFFFF;display: block;float: none;font-size: 14px;line-height: 22px;margin: 0 auto;width: 22px;}
#bp-media-album-prompt #create-new{background-color: #DF562C;color: #fff;}

#bp-media-uploaded-files{background: none repeat scroll 0 0 #DDDDDD;margin-top: 5px;width: 100%;}
li #bp-media-uploaded-files{left: 0;position: absolute;top: 155px;}
#bp-media-uploaded-files .error{padding: 5px;text-align: center;}
.bp-media-progressbar{height: 28px;margin: 6px 10px 0 0;line-height: 2em;padding: 0;overflow: hidden;margin-bottom: 2px;border: 1px solid #D1D1D1;background: white;background-image: linear-gradient(bottom,white 0,#F7F7F7 100%);background-image: -o-linear-gradient(bottom,white 0,#F7F7F7 100%);background-image: -moz-linear-gradient(bottom,white 0,#F7F7F7 100%);background-image: -webkit-linear-gradient(bottom,white 0,#F7F7F7 100%);background-image: -ms-linear-gradient(bottom,white 0,#F7F7F7 100%);-webkit-border-radius: 3px;border-radius: 3px;-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1);box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1)}
.bp-media-progress-text{z-index: 10;position: relative;width: 100%;padding: 0 8px;text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);color: rgba(0, 0, 0, 0.6);font-size:16px;line-height: 28px;height: 28px;}
Expand Down Expand Up @@ -178,19 +190,27 @@ background-image: -webkit-gradient(linear,left bottom,left top,color-stop(1, #F7
img.bp-media-donation-image{display:block;margin: 10px auto;}
#donate form{text-align: center;}

/* BuddyPress Media Image Uploader album selection */
/*#bp-media-album-prompt, #bp-media-album-new { background: none repeat scroll 0 0 #FFFFFF;border: 1px solid #AAAAAA;border-radius: 5px 5px 5px 5px;display: none;padding: 3px;z-index: 110000;left: 40%;position: fixed;top: 35%;width: 300px; }
#bp-media-album-new { z-index: 120000; }
.bp-media-album-title { background: url("../img/Popup-title-bg.png") repeat-x scroll 50% 50% #CCCCCC;border: 1px solid #AAAAAA;border-radius: 5px 5px 5px 5px;color: #222222;display: block;font-weight: bold;padding: 0;margin-bottom: 10px; }
.bp-media-album-title span { background: none repeat scroll 0 0 transparent;display: block;font-size: 16px;padding: 10px; }
#bp-media-create-album-close, #bp-media-create-album-close:active, #bp-media-close, #bp-media-close:active { border-radius: 3px 3px 3px 3px;cursor: pointer;display: block;padding: 0 7px 2px;position: absolute;right: 8px;top: 11px;z-index: 10; }
#bp-media-create-album-close:hover, #bp-media-create-album-close:focus, #bp-media-close:hover, #bp-media-close:focus { background: none repeat scroll 0 0 #545454;color: #CFCFCF; }
.bp-media-album-content { display: block;padding: 5px; }
.bp-media-album-content label { display: block;font-size: 14px;margin: 0 0 0 3px; }
#bp-media-album-prompt select { min-width: 140px; }
.select-btn-div { border-top: 1px solid #AAAAAA;margin: 15px 0 0;padding: 5px 5px 5px 30px;text-align: right; }
.select-btn-div .btn { float: right;font-size: 14px;margin: 5px;padding: 10px 25px; }
#bp-media-album-new > label { font-size: 14px; }
#bp-media-album-new input[type="text"] { width: 98%; }
#custom-overlay { background: none repeat scroll 0 0 #000000;bottom: 0;left: 0;min-height: 360px;opacity: 0.7;position: fixed;right: 0;top: 0;z-index: 105000; }
div.error{margin: 5px 0 15px; background-color: #ffebe8; border-color: #c00;padding: 0 .6em;-webkit-border-radius: 3px;border-radius: 3px;border-width: 1px;border-style: solid;}*/
@media (max-width: 980px) {
#item-body ul.bp-media-gallery li{width: 23%;}
li #bp-media-upload-ui #drag-drop-area{min-height: auto;}
}
@media (max-width: 850px) {
#item-body ul.bp-media-gallery li{width: 31%;}

}
@media (max-width: 480px) {
#item-body ul.bp-media-gallery li{width: 48%;}
li #bp-media-upload-ui{max-width: 170px;}
ul.bp-media-gallery li img,li #bp-media-upload-ui #drag-drop-area{max-width: 170px;width: 100%;}
li #bp-media-upload-ui #drag-drop-area{max-width: 162px;}
#bp-media-upload-ui .drag-drop-space{margin: 23px auto 10px;}
li #bp-media-upload-ui .drag-drop-inside{margin: 0 auto 23px;}
}
@media (max-width: 379px) {
#bp-media-upload-ui{min-height: 190px;}
#item-body ul.bp-media-gallery li{width: 95%;}
#bp-media-upload-ui .drag-drop-inside{float: none;width: 100%;}
#bp-media-album-in{float: none;margin: 0 auto;}
#bp-media-upload-ui #bp-media-album-prompt{margin: 15px auto 15px;float: none;width: 100%}
#bp-media-upload-ui .drag-drop-inside p,#bp-media-album-prompt #bp_media_album_new{margin-bottom: 5px;}
}
Binary file added app/assets/img/pixel-bg.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 8 additions & 7 deletions app/assets/js/bp-media-uploader.js
View file
Expand Up @@ -238,16 +238,15 @@ jQuery(document).ready(function(){
}

var selected = jQuery('#bp-media-album-prompt select').val();
var in_list = 0;
if(jQuery('#'+bp_media_uploader_params.container).length==0)
return false;
if ( jQuery('#bp-media-album-prompt p').css('display') == 'none' )
in_list = 1;
jQuery('#bp-media-album-prompt select').change(function() {

if ( jQuery(this).val() == 'create_new' ) {
jQuery('#bp_media_album_new').css({
'width':jQuery('#bp-media-album-prompt select').width()+20
});
jQuery('#bp-media-album-prompt select').hide();
jQuery('#bp-media-album-prompt span').hide();
jQuery('#bp-media-album-prompt p').hide();
jQuery('#bp-media-album-prompt div.hide').show();
} else
selected = jQuery(this).val();
Expand Down Expand Up @@ -279,7 +278,8 @@ jQuery(document).ready(function(){
jQuery('#bp-media-selected-album').prepend('<option value='+album+' selected="selected">'+new_album_name+'</option>');
jQuery('#bp-media-album-prompt div.hide').hide();
jQuery('#bp-media-album-prompt select').show();
jQuery('#bp-media-album-prompt span').show();
if ( in_list == 0 )
jQuery('#bp-media-album-prompt p').show();
}
});
}
Expand All @@ -289,7 +289,8 @@ jQuery(document).ready(function(){
jQuery('#bp-media-album-prompt select option').removeAttr('selected');
jQuery('#bp-media-album-prompt select option[value=' + selected + ']').attr('selected', 'selected');
jQuery('#bp-media-album-prompt select').show();
jQuery('#bp-media-album-prompt span').show();
if ( in_list == 0 )
jQuery('#bp-media-album-prompt p').show();
});

//Normal Uplaoder
Expand Down
4 changes: 2 additions & 2 deletions app/importers/BPMediaImporter.php
View file
Expand Up @@ -65,14 +65,14 @@ static function file_array($filepath){

function create_album($album_name = '',$author_id=1){

global $bp_media,$wpdb;
global $bp_media;

if(array_key_exists('bp_album_import_name',$bp_media->options)){
if($bp_media->options['bp_album_import_name']!=''){
$album_name = $bp_media->options['bp_album_import_name'];
}
}
$found_album = $wpdb->get_results("SELECT * FROM {$wpdb->prefix}posts WHERE post_title='Wall Posts' AND post_type='bp_media_album'");
$found_album = BuddyPressMedia::get_wall_album();

if(count($found_album)< 1){
$album = new BPMediaAlbum();
Expand Down
83 changes: 31 additions & 52 deletions app/main/BPMediaComponent.php
View file
Expand Up @@ -70,64 +70,43 @@ function setup_globals() {
function setup_nav() {
global $bp, $bp_media;

$enabled= array(
'images' => false,
'videos' => false,
'audio' => false,
);
$enabled = $bp_media->enabled();
$default_tab = $bp_media->default_tab();
$defaults_tab = $bp_media->defaults_tab();

/* Upload Screen */
$bp_media_upload = new BPMediaUploadScreen(
'upload',
BP_MEDIA_UPLOAD_SLUG
);
$options = $bp_media->options;

if( array_key_exists( 'images_enabled', $options )
&& $options['images_enabled']==1 ){
$enabled['images']=true;
}
if( array_key_exists( 'videos_enabled', $options )
&& $options['videos_enabled']==1 ){
$enabled['videos']=true;
}
if( array_key_exists( 'audio_enabled', $options )
&& $options['audio_enabled']==1 ){
$enabled['audio']=true;
}
/* Media Screens */

if($enabled['images']){
$bp_media_image = new BPMediaScreen(
'image',
BP_MEDIA_IMAGES_SLUG
/* Media Screens */
foreach ($enabled as $tab=>$active){
if($active==true){
$tabs = $tab;
if($tabs!='audio'&&$tabs!='upload'){
$tabs .= 's';
}
if($tab=='upload'){
${'bp_media_'.$tab} = new BPMediaUploadScreen(
$tab,
constant('BP_MEDIA_'.strtoupper($tabs).'_SLUG')
);
}
if($enabled['videos']){
$bp_media_video = new BPMediaScreen(
'video',
BP_MEDIA_VIDEOS_SLUG
}elseif($tab=='album'){
$bp_media_album = new BPMediaAlbumScreen(
$tab,
constant('BP_MEDIA_'.strtoupper($tabs).'_SLUG')
);
}else{
${'bp_media_'.$tab} = new BPMediaScreen(
$tab,
constant('BP_MEDIA_'.strtoupper($tabs).'_SLUG')
);
}
}
if($enabled['audio']){
$bp_media_audio = new BPMediaScreen(
'audio',
BP_MEDIA_AUDIO_SLUG
);
}




/* Album Screen */
$bp_media_album = new BPMediaAlbumScreen(
'album',
BP_MEDIA_ALBUMS_SLUG
);

/* Switch between different screens depending on context */
switch ($bp->current_component) {
case BP_MEDIA_IMAGES_SLUG:
if ( $enabled['images'] && is_numeric($bp->current_action)) {
if ( $enabled['image'] && is_numeric($bp->current_action)) {
$bp->action_variables[0] = $bp->current_action;
$bp->current_action = BP_MEDIA_IMAGES_ENTRY_SLUG;
}
Expand All @@ -139,7 +118,7 @@ function setup_nav() {
}
break;
case BP_MEDIA_VIDEOS_SLUG:
if ($enabled['videos'] && is_numeric($bp->current_action)) {
if ($enabled['video'] && is_numeric($bp->current_action)) {
$bp->action_variables[0] = $bp->current_action;
$bp->current_action = BP_MEDIA_VIDEOS_ENTRY_SLUG;
}
Expand All @@ -157,8 +136,8 @@ function setup_nav() {
'name' => __(BP_MEDIA_LABEL, BP_MEDIA_TXT_DOMAIN),
'slug' => BP_MEDIA_SLUG,
'position' => 80,
'screen_function' => array($bp_media_image, 'screen'),
'default_subnav_slug' => BP_MEDIA_IMAGES_SLUG
'screen_function' => array(${'bp_media_'.$default_tab}, 'screen'),
'default_subnav_slug' => constant('BP_MEDIA_'.strtoupper($defaults_tab).'_SLUG')
);

/* Create an empty sub navigation */
Expand All @@ -168,7 +147,7 @@ function setup_nav() {
parent::setup_nav($main_nav, $sub_nav);

/* Set up individual screens for each nav/sub nav */
if($enabled['images']){
if($enabled['image']){
bp_core_new_nav_item(array(
'name' => __(BP_MEDIA_IMAGES_LABEL, BP_MEDIA_TXT_DOMAIN),
'slug' => BP_MEDIA_IMAGES_SLUG,
Expand Down Expand Up @@ -242,7 +221,7 @@ function setup_nav() {
));
}

if($enabled['videos']){
if($enabled['video']){
bp_core_new_nav_item(array(
'name' => __(BP_MEDIA_VIDEOS_LABEL, BP_MEDIA_TXT_DOMAIN),
'slug' => BP_MEDIA_VIDEOS_SLUG,
Expand Down

0 comments on commit a1a3d9a

Please sign in to comment.