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-16 11:31:27 +00:00
parent 71f1288c35
commit e7afc7181b
8 changed files with 102 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
upload/edit_account.php
View file

@ -74,7 +74,7 @@ switch($mode)
case 'account':
{
assign('on','account');
assign('mode','profile_settings');
assign('mode','account_settings');
}
break;
case 'profile':
@ -92,6 +92,14 @@ switch($mode)
}
break;
case 'channel_bg':
{
Assign('extensions', $Cbucket->get_extensions());
assign("coverPhoto", $userquery->getCover(userid()));
assign('mode','channel_bg');
}
break;
case 'change_cover':
{

2
upload/includes/classes/user.class.php
View file

@ -3107,7 +3107,7 @@ class userquery extends CBCategory{
lang('account_settings') =>'edit_account.php?mode=account',
lang('user_profile_settings') =>'edit_account.php?mode=profile',
lang('change_avatar') => 'edit_account.php?mode=avatar_bg',
lang('change_bg') => 'edit_account.php?mode=avatar_bg',
lang('change_bg') => 'edit_account.php?mode=channel_bg',
);
if(isSectionEnabled('videos'))

3
upload/js/functions.js
View file

@ -3,6 +3,7 @@
var page = baseurl+'/ajax.php';
var loading_img = "<img style='vertical-align:middle' src='"+imageurl+"/ajax-loader.gif'>";
var loading = loading_img+" Loading...";
var loading_img_2 = "<img style='vertical-align:middle' src='"+imageurl+"/ajax-loader-big.gif'>";
function Confirm_Delete(delUrl) {
if (confirm("Are you sure you want to delete")) {
@ -1372,7 +1373,7 @@ function channelObjects(object,div,type,user,assign)
type : "POST",
dataType : "json",
data : ({ mode : "channelObjects", content : type, user : user, assign : assign}),
beforeSend : function() { obj.append(loading_img) },
beforeSend : function() { obj.append(loading_img_2) },
success : function(data)
{
obj.find('img').remove();

24
upload/styles/cb_27/layout/blocks/common/rating.html
View file

@ -6,16 +6,10 @@
<div>
<div class="newRating clearfix mbm">
<ul class="like-dislike-block clearfix">
<li><a {if !$disable} onclick="rate('{$id}','5','{$type}')"{/if} href="javascript:voide(0)">Like</a></li>
<li><a {if !$disable} onclick="rate('{$id}','5','{$type}')"{/if} href="javascript:void(0)">Like</a></li>
<li><span class="_percentage">{$perc}</span></li>
<li><a {if !$disable} onclick="rate('{$id}','1','{$type}')"{/if} href="javascript:voide(0)">Dislike</a></li>
<li><a {if !$disable} onclick="rate('{$id}','1','{$type}')"{/if} href="javascript:void(0)">Dislike</a></li>
</ul>
<!-- <div class="newLike">
<i class="glyphicon glyphicon-thumbs-up big"></i>
</div>
<div class="newDislike">
<i class="glyphicon glyphicon-thumbs-down"></i>
</div> -->
</div>
<div class="cleafix like-dislike-text">
{$likes} Likes &nbsp;|&nbsp; {$dislikes} Dislikes
@ -29,19 +23,17 @@
{else}
<!--photos likes section-->
<div id="" class="pull-right clearfix full-width">
<div class="newRating clearfix mbm">
<ul class="like-dislike-block clearfix">
<li><a {if !$disable} onclick="rate('{$id}','5','{$type}')"{/if} href="javascript:voide(0)">Like</a></li>
<li><a {if !$disable} onclick="rate('{$id}','5','{$type}')"{/if} href="javascript:void(0)">Like</a></li>
<li><span class="_percentage">{$perc}</span></li>
<li><a {if !$disable} onclick="rate('{$id}','1','{$type}')"{/if} href="javascript:voide(0)">Dislike</a></li>
<li><a {if !$disable} onclick="rate('{$id}','1','{$type}')"{/if} href="javascript:void(0)">Dislike</a></li>
</ul>
<!-- <div class="newLike"> <i class="glyphicon glyphicon-thumbs-up big"></i>
</div>
<div class="newDislike">
<i class="glyphicon glyphicon-thumbs-down"></i>
</div> -->
</div>
<div class="clearfix like-dislike-text">
{$likes} Likes &nbsp;|&nbsp; {$dislikes} Dislikes
@ -51,12 +43,12 @@
</div>
</div>
{/if}
<script type="text/javascript">
var _percent = '{$perc}';
var _numb = parseInt(_percent);

1
upload/styles/cb_27/layout/blocks/view_channel/channel_header.html
View file

@ -62,6 +62,7 @@
<button id="channelVoteUp" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-thumbs-up"></i> <b>Do you like this channel ?</b></button>
{/if}
</div>
</div>
<div class="clearfix"></div>
<div id="result_cont" class="marginTop"></div>

56
upload/styles/cb_27/layout/edit_account.html
View file

@ -2,27 +2,28 @@
<div class="container marginBottom">
{include file="$style_dir/blocks/manage/account_menu.html"}
{if $mode=='profile_settings'}
{if $mode=='profile_settings' || $mode=='account_settings'}
<div class="cb-box row">
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 hidden-xs">
{include file="$style_dir/blocks/manage/userMenuLeft.html"}
</div>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
<div class="tabbable">
<ul class="nav nav-tabs" id="myTab">
<li class="active">
<a data-toggle="tab" href="#cpsetting">
<li class="{if $mode=='profile_settings'}active{/if}">
<a href="{$baseurl}/edit_account.php?mode=profile">
<h5>{lang code='channel_profile_settings'}</h5>
</a>
</li>
<li class="">
<a data-toggle="tab" href="#asettings">
<li class="{if $mode=='account_settings'}active{/if}">
<a href="{$baseurl}/edit_account.php?mode=account">
<h5>{lang code='account_settings'}</h5>
</a>
</li>
</ul>
<div class="tab-content">
<div id="cpsetting" class="tab-pane active">
<div id="cpsetting" class="tab-pane {if $mode=='profile_settings'}active{/if}">
<form method="post" class="accountForm">
<div class="channelSettings col-md-10">
{$channel_profile_fields = $userquery->load_user_fields($p)}
@ -56,7 +57,7 @@
</div>
</form>
</div>
<div id="asettings" class="tab-pane">
<div id="asettings" class="tab-pane {if $mode=='account_settings'}active{/if}">
<form method="post" class="accountForm">
<div class="accountSettings col-md-6">
<!--- CHANGING USER ACCOUNT AND PROFILE -->
@ -147,7 +148,7 @@
</div>
</div>
{/if}
{if $mode == 'avatar_bg'}
{if $mode == 'avatar_bg' || $mode == 'channel_bg'}
<div class="row cb-box">
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 hidden-xs">
{include file="$style_dir/blocks/manage/userMenuLeft.html"}
@ -155,19 +156,19 @@
<div class="col-md-9">
<div class="tabbable">
<ul class="nav nav-tabs" id="myTab1">
<li class="active">
<a data-toggle="tab" href="#uavatar">
<li class="{if $mode == 'avatar_bg'} active {/if}">
<a href="{$baseurl}/edit_account.php?mode=avatar_bg">
<h5>{lang code='User Avatar'}</h5>
</a>
</li>
<li class="">
<a data-toggle="tab" href="#cbackground">
<li class="{if $mode == 'channel_bg'} active {/if}">
<a href="{$baseurl}/edit_account.php?mode=channel_bg">
<h5>{lang code='Channel Background'}</h5>
</a>
</li>
</ul>
<div class="tab-content">
<div id="uavatar" class="tab-pane active">
<div id="uavatar" class="tab-pane {if $mode == 'avatar_bg'} active {/if}">
<form method="post" enctype="multipart/form-data">
<legend>{lang code='user_user_avatar'}</legend>
<div class="show-image">
@ -200,7 +201,7 @@
</div>
</form>
</div>
<div id="cbackground" class="tab-pane">
<div id="cbackground" class="tab-pane {if $mode == 'channel_bg'} active {/if}">
<form method="post" enctype="multipart/form-data">
<div class="avatar_bg">
@ -290,31 +291,32 @@
<div class="col-md-8">
<div class="tabbable">
<ul class="nav nav-tabs" id="myTab2">
<li class="active">
<a data-toggle="tab" href="#busers">
<li class="{if $mode =='block_users'}active {/if}">
<a href="{$baseurl}/edit_account.php?mode=block_users">
<h5>{lang code='Block Users'}</h5>
</a>
</li>
<li class="">
<a data-toggle="tab" href="#cpassword">
<li class="{if $mode =='change_password'}active {/if}">
<a href="{$baseurl}/edit_account.php?mode=change_password">
<h5>{lang code='Change Password'}</h5>
</a>
</li>
<li class="">
<a data-toggle="tab" href="#cemail">
<li class="{if $mode =='change_email'}active {/if}">
<a href="{$baseurl}/edit_account.php?mode=change_email">
<h5>{lang code='Change Email'}</h5>
</a>
</li>
<li class="">
<a data-toggle="tab" href="#msubscription">
<li class="{if $mode =='subs'}active {/if}">
<a href="{$baseurl}/edit_account.php?mode=subscriptions">
<h5>{lang code='Manage Subscription'}</h5>
</a>
</li>
</ul>
<div class="tab-content">
<div id="busers" class="tab-pane active">
<div id="busers" class="tab-pane {if $mode =='block_users'}active {/if}">
<h2>{lang code='block_users'}</h2>
<form method="post" name="ban_users">
@ -331,7 +333,7 @@
</form>
</div>
<div id="cpassword" class="tab-pane">
<div id="cpassword" class="tab-pane {if $mode =='change_password'}active {/if}">
<h2>{lang code='user_change_pass'}</h2>
<form method="post" name="edit_profile">
<div class="form-group">
@ -356,7 +358,7 @@
</div>
</form>
</div>
<div id="cemail" class="tab-pane">
<div id="cemail" class="tab-pane {if $mode =='change_email'}active {/if}">
<h2>{lang code='user_change_email'}</h2>
<form method="post" name="edit_profile">
<div class="form-group">
@ -382,7 +384,7 @@
</div>
</form>
</div>
<div id="msubscription" class="tab-pane">
<div id="msubscription" class="tab-pane {if $mode =='subs'}active {/if}">
<h2>{lang code='com_manage_subs'}</h2>
{if $subs}
<table class="table table-striped table-bordered">

3
upload/styles/cb_27/layout/global_header.html
View file

@ -65,8 +65,9 @@
<link href="{$theme}/css/jquery.mCustomScrollbar.css" rel="stylesheet" />
<link rel="stylesheet" href="{$theme}/css/font-awesome.min.css">
{if this_page('watch_video') || this_page('view_item')}
{if this_page('watch_video') || this_page('view_item') || this_page('view_channel')}
<link rel="stylesheet" href="{$theme}/css/watch-video.css">
{/if}
{if this_page('view_channel')}

50
upload/styles/cb_27/layout/user_photos.html Normal file
View file

@ -0,0 +1,50 @@
{lang code='channel' assign='object_type'}
{include file="$style_dir/global_header.html"}
{include file="$style_dir/header.html"}
<div class="container">
<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)}
{$u.username|capitalize}</a> ({$category.category_name})
<div class="btn-group pull-right" style="margin-right: 10px">
{if !$isSubscribed && $p.allow_subscription!='no'}
<button class="btn btn-primary btn-sm" onclick="subscriber('{$u.userid}','subscribe_user','video_detail_result_cont')">{lang code='subscribe'}</button>
{elseif $isSubscribed}
<a class="btn btn-primary btn-sm" href="javascript:void(0)"
onClick="subscriber('{$u.userid}','unsubscribe_user','result_cont')">{lang code='unsubscribe'}</a>
{/if}
{assign var='channel_action_links' value=$userquery->get_channel_action_links($u)}
{foreach from=$channel_action_links item=link key=link_title}
<a class="btn btn-primary btn-sm" href="edit_account.php?mode=block_users" {if $link.onclick}onClick="{$link.onclick}"{/if}>{$link_title}</a>
{/foreach}
</div>
</span>
<div class="action_box" id="video_detail_result_cont" style="display:none; margin-left: 25px"></div>
<br><br>
<hr style="margin-bottom: 6px; margin-top: 8px">
<div class="col-md-3">
{include file="$style_dir/blocks/view_channel/channel_right.html"}
</div>
<div class="col-md-9">
<h3>User Photos</h3>
{foreach $photos as $photo}
{include file="$style_dir/blocks/photo.html"}
{/foreach}
<div class="clearfix"></div>
<div class="col-md-4 pull-right">
{include file="$style_dir/blocks/pagination.html"}
</div>
</div>
</div>
<div class="footer">
&copy; {$title} {$smarty.now|date_format:"%Y"}
</div>
</div>
</div>
{include file="$style_dir/footer.html"}