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

Browse source
This commit is contained in:
Fahad Abbas 2014-12-12 14:34:03 +00:00
parent 067e9ce2bd
commit fdd2b2da59
5 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
upload/includes/functions_playlist.php
View file

@ -109,7 +109,7 @@ function get_playlist_thumb ( $playlist ) {
$thumb = get_thumb( $first_item, 'big' );
if ( strpos( 'processing', $thumb ) !== false ) {
if ( strpos( $thumb, 'processing' ) === false ) {
return $thumb;
}
}

11
upload/styles/cb_27/layout/blocks/playlist.html
View file

@ -1,10 +1,16 @@
<div class="row" >
<div class="row" >
<div class="col-md-10" style="border-bottom: 1px solid #E3E3E3; margin:20px 20px 20px 30px;">
<div class="row">
<div class="col-md-3" style="margin-bottom:10px;">
<label class="label label-info">{$playlist.playlist_name}</label>
</div>
<img src="{get_playlist_thumb($playlist)}" />
{$list_id=$playlist.playlist_id}
{$first=get_playlist_items($list_id,1)}
{if $first}
<a href="{videoLink vdetails=$first[0]}" >{lang code='play_now'}</a>
{/if}
<div class="col-md-9">
<span class="maccountlabels"> <strong>{$playlist.date_added|niceTime}</strong>
@ -13,5 +19,6 @@
</div>
</div>
</div>
</div>

2
upload/styles/cb_27/layout/blocks/videos/video.html
View file

@ -6,7 +6,7 @@
<span class="video_duration">{if
$video.duration>1}{$video.duration|SetTime}{else}00:00{/if}{*$video.duration|date_format:$config.time*}
</span>
<img class="" src="{getThumb vdetails=$video size='171x120'} " border="1" />
<img class="" src="{getThumb vdetails=$video } " border="1" height="110" width="171" />
</a>
</div>
<h5>

10
upload/styles/cb_27/layout/user_videos.html
View file

@ -2,7 +2,7 @@
{include file="$style_dir/global_header.html"}
{include file="$style_dir/header.html"}
<div class="container">
<div class="cb-box marginBottom">
<div class="cb-box marginBottom" style="margin-bottom:30px;">
<div class="row">
<span style="margin-left: 24px">
{assign var=category value=$userquery->get_category($u.category)}
@ -37,7 +37,12 @@
<div class="col-md-3" style="margin-bottom:10px;">
<label class="label label-info">{$playlist.playlist_name}</label>
</div>
<img src="{get_playlist_thumb($playlist)}" />
{$list_id=$playlist.playlist_id}
{$first=get_playlist_items($list_id,1)}
{if $first}
<a href="{videoLink vdetails=$first[0]}" >{lang code='play_now'}</a>
{/if}
<div class="col-md-9">
<span class="maccountlabels"> <strong>{$playlist.date_added|niceTime}</strong>
@ -46,7 +51,6 @@
</div>
</div>
</div>
</div>
{/foreach}
<div class="col-md-4 pull-right">

13
upload/user_videos.php
View file

@ -64,17 +64,10 @@ if($udetails)
$get_limit = create_query_limit($page,10);
$params = array('userid'=>$udetails['userid'],'limit'=>$get_limit);
$playlists = get_playlists($params);
/*$first_item = array();
foreach ($playlists as $playlist) {
$first_item_ = json_decode($playlist['first_item'],true);
$first_item[] = $first_item_;
}
//pr($first_item,true);
//pr($playlists,true);
//$result = array_merge($first_item,$playlists);
*/
/*$items = $cbvid->get_playlist_items( $pid, 'playlist_items.date_added DESC' );
pr($items,true);
assign('items',$items);*/
assign('playlist_mode','on');
assign('playlists', $playlists);