vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed : Playlist and Collection

Browse source 
Fixed : Photo Embed Form
This commit is contained in:
Arslan Hassan 2011-01-24 13:47:03 +00:00
parent 138519b648
commit 5d4d9ca300
9 changed files with 71 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
upload/includes/classes/collections.class.php
View file

@ -1504,6 +1504,34 @@ class Collections extends CBCategory
}
}
/**
* Function used to get collection from its Item ID and type
* only get collections of logged in user
* @param : OBJ_ID
* @param : OBJ_Type
* @return : Object
*/
function getCollectionFromItem($objId,$type=NULL)
{
global $db;
if(!$type)
$type = $this->objType;
$userid=userid();
$results = $db->select(tbl('collections,collection_items'),'*',
tbl("collections.collection_id")." = ".tbl("collection_items.collection_id")." AND "
.tbl("collection_items.type='".$type."'")." AND ".tbl("collections.userid='".$userid."'")." AND "
.tbl("collections.active='yes'")." AND ".tbl("collection_items.object_id='".$objId."'"));
if($db->num_rows>0)
$assign = $results;
else
$assign = false;
return $assign;
}
}
?>

1
upload/includes/functions.php
View file

@ -3087,6 +3087,7 @@
{
$collectArray = array("order"=>" collection_name ASC","type"=>"videos","user"=>userid());
$collections = $cbcollection->get_collections($collectArray);
assign("collections",$collections);
}
Template("/blocks/collection_form.html");

1
upload/manage_collections.php
View file

@ -46,6 +46,7 @@ switch($mode)
}
$collectArray = array('user'=>userid(),"limit"=>$get_limit);
$usr_collections = $cbcollection->get_collections($collectArray);
assign('usr_collects',$usr_collections);
$collectArray['count_only'] = TRUE;

2
upload/player/pak_player/pak_player.php
View file

@ -75,7 +75,7 @@ if(!function_exists("pak_player"))
if(!strstr($in['height'],"\%"))
$in['height'] = $in['height'].'px';
if($in['autoplay'] =='yes' || $in['autoplay']===true)
if($in['autoplay'] =='yes' || $in['autoplay']===true || ($_COOKIE['auto_play_playlist'] && $_GET['playlist']))
{
$in['autoplay'] = true;
}else{

4
upload/styles/cbv2new/layout/blocks/collection_form.html
View file

@ -1,6 +1,6 @@
<!-- Add To Collection This {$type} -->
<div id="collection_form" class="action_box" style="display:none">
<div class="action_box_title">Add this {$params.type} to collection {if $params.type=='video'} or playlist{/if} &#8212; <span class="cancel"><a href="javascript:void(0)" onclick="$('#collection_form').slideUp();">cancel</a></span></div>
<div id="collection_form" class="action_box" >
<div class="action_box_title">Add this {$params.type} to collection {if $params.type=='video'} or playlist{/if}</span></div>
<div class="form_container" align="center">
<div class="form_result" id="collection_form_result" style="display:none"></div>

4
upload/styles/cbv2new/layout/blocks/share_form.html
View file

@ -1,7 +1,7 @@
<!-- Share This {$type} -->
<div id="share_form" class="action_box share_form clearfix" style="display:none">
<div class="action_box_title">Share {if $params.type=='v' || $params.type =='video'}or Embed{/if} this {$params.type} &#8212; <span class="cancel"><a href="javascript:void(0)" onclick="$('#share_form').slideUp();">cancel</a></span></div>
{if $params.type=='v' || $params.type =='video'}
<div class="action_box_title">Share {if $params.type=='v' || $params.type =='video' || $params.type =='Video'}or Embed{/if} this {$params.type} &#8212; <span class="cancel"><a href="javascript:void(0)" onclick="$('#share_form').slideUp();">cancel</a></span></div>
{if $params.type=='v' || $params.type =='video' || $params.type =='Video'}
<div style="margin:0px 0px 5px 0px">

42
upload/styles/cbv2new/layout/watch_video.html
View file

@ -41,7 +41,7 @@
<li><a href="javascript:void(0)" onclick="slide_up_watch_video('#video_action_result_cont');add_to_fav('video','{$vdo.videoid}');"><img src="{$imageurl}/dot.gif" class="add_to_fav" />{lang code='add_to_favs'}</a></li>
<li><a href="javascript:void(0)" onclick="slide_up_watch_video('#share_form');$('#share_form').slideToggle();"><img src="{$imageurl}/dot.gif" class="share_this" />{lang code='share_embed'}</a></li>
<li><a href="javascript:void(0)" onclick="slide_up_watch_video('#playlist_form,#collection_form');$('#playlist_form,#collection_form').slideToggle();"><img src="{$imageurl}/dot.gif" class="add_to_play" />{lang code='add_to_playlist'}</a></li>
<li><a href="javascript:void(0)" onclick="slide_up_watch_video('#playlist_form');$('#playlist_form').slideToggle();"><img src="{$imageurl}/dot.gif" class="add_to_play" />{lang code='add_to_playlist'}</a></li>
<li><a href="javascript:void(0)" onclick="slide_up_watch_video('#flag_item');$('#flag_item').slideToggle();"><img src="{$imageurl}/dot.gif" class="report_this" />{lang code='report_this'}</a></li>
</ul>
@ -57,7 +57,7 @@
{show_flag_form id=$vdo.videoid type=Video}
<div class="action_box" style="display:none" id="video_action_result_cont"></div>
{show_playlist_form id=$vdo.videoid type=Video}
{show_collection_form id=$vdo.videoid type=Video}
</div>
<!-- Action Result Container End-->
@ -134,24 +134,46 @@
<div class="ads">{AD place=ad_300x250}</div>
{if $Cbucket->configs.video_download==1 && $cbvid->downloadable($vdo)}<div class="video_details videosharing" align="left">
<strong>
<label><a href="{videoLink vdetails=$vdo type=download}">{lang code='click_to_download_video'}</a></label>
{if $Cbucket->configs.video_download==1 && $cbvid->downloadable($vdo)}<div class="video_details" align="left">
<label><a href="{videoLink vdetails=$vdo type=download}">{lang code='click_to_download_video'}</a></label>
</strong></div> {/if}
</div> {/if}
{ANCHOR place="watch_video_right" data=$vdo}
<!-- Collections -->
{if userid()}
<span class="watch_vids_head watch_vids_head_closed"
onclick='$(this).toggleClass("watch_vids_head_closed");$("#vid_collections").slideToggle("fast")'>Collections</span>
<div class="watch_vids_cont" id="vid_collections" style="display:none">
{assign var=collections value=$cbvid->collection->getCollectionFromItem($vdo.videoid)}
{if $collections}
This video is found in following collections
{foreach from=$collections item=collection name=collect}
<div class="watch_collect_item">
{$smarty.foreach.collect.iteration}. <a href="#">{$collection.collection_name}</a>
</div>
{/foreach}
{/if}
<div class="clearfix"></div>
{show_collection_form id=$vdo.videoid type=Video}
</div>
{/if}
<!-- Collections -->
<!-- Playlist -->
{include file="$style_dir/blocks/watch_video/playlist_box.html" selected=$vdo.videoid }
<!-- Playlist End-->
<!-- Getting List user videos -->
{assign var=videos_items_columns value=func->config(videos_items_columns)}
{get_videos user=$vdo.userid limit=$videos_items_columns assign=user_vids exclude=$vdo.videoid}

3
upload/styles/cbv2new/theme/main.css
View file

@ -470,6 +470,9 @@ display:inline-block; width:18px; height:18px; line-height:18px; text-align:cent
.video_actions_cont .actions a:hover{text-decoration:underline}
.video_actions_cont .actions a img{margin-right:5px; float:left; border:none; }
.watch_collect_item{margin:5px; margin-top:0px; border-bottom:1px solid #CCC; padding-bottom:5px}
.watch_collect_item a{font-size:12px; font-weight:bold; text-decoration:none}
.playlist_item,.add_comment_box .input,.add_comment_box,.comment,.video_details,.form_container .form_result,.action_box{border-radius:10px;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px; background-color:#F0F0F0; padding:10px}
.action_box{margin-top:10px}
.action_box .action_box_title{color:#333; font-size:16px;font-weight:bold; text-transform:uppercase; font-family:arial; border-bottom:1px solid #CCC}

2
upload/watch_video.php
View file

@ -58,7 +58,7 @@ if(video_playable($vkey))
assign('user',$userquery->get_user_details($vdo['userid']));
assign('uc',$u_collects);
subtitle($vdo['title']);
}else
$Cbucket->show_page = false;