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

updated: issue groups(view group, view topic)

Browse source
This commit is contained in:
Fahad Abbas 2015-06-02 12:30:43 +00:00
parent 19c4261efb
commit 8bdb1af1e0
5 changed files with 52 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
upload/styles/cb_27/layout/add_group_videos.html
View file

@ -5,7 +5,7 @@
{include file="$style_dir/blocks/manage/account_menu.html"} {include file="$style_dir/blocks/manage/account_menu.html"}
<div class="cb-box marginBottom row"> <div class="cb-box marginBottom row">
<div class="col-md-2 leftSidebar"> <div class="col-md-2">
{include file="$style_dir/blocks/group/group_left.html"} {include file="$style_dir/blocks/group/group_left.html"}
</div> </div>
<div class="col-md-7 nopadding "> <div class="col-md-7 nopadding ">

54
upload/styles/cb_27/layout/blocks/group/group_topics.html
View file

@ -4,26 +4,38 @@
{/if} {/if}
{if $topics} {if $topics}
{foreach from=$topics item=topic} <ul style="padding-left:0px;">
{assign var=user value=$userquery->get_user_details($topic.userid)} {foreach from=$topics item=topic}
{if $topic.last_poster} {assign var=user value=$userquery->get_user_details($topic.userid)}
{assign var=last_poster value=$userquery->get_user_details($topic.last_poster)} {if $topic.last_poster}
{else} {assign var=last_poster value=$userquery->get_user_details($topic.last_poster)}
{assign var=last_poster value=''} {else}
{/if} {assign var=last_poster value=''}
<li class="topicRow clearfix"> {/if}
<div class="topicStarterAvatar moveL"> <li class="topicRow clearfix" style="border-bottom:1px solid #ccc; padding:15px 0;">
<i class="topicStarterAvatarBG" style="background:url({avatar details=$user }) center no-repeat; width:48px; height:48px;"><a href="{$userquery->profile_link($user)}">{$user.username}</a></i> <!-- <div class="topicStarterAvatar moveL">
</div> <i class="topicStarterAvatarBG" style="background:url({avatar details=$user }) center no-repeat; width:48px; height:48px;"><a href="{$userquery->profile_link($user)}">{$user.username}</a></i>
<div class="moveR" style="width:90%;"> </div>
<h2 class="topicStarter"><a href="{$userquery->profile_link($user)}">{$user.username}</a></h2>
<div class="topicPreviewContainer clearfix"> <div class="itemdiv">
<h4 class="topicTitle"><a href="{$cbgroup->topic_link($topic)}">{$topic.topic_title}</a></h4> <div class="user">
<div style="height:2px;"></div> <a href="{$userquery->profile_link($user)}">
<div class="topicPreview">{$topic.topic_post|description|strip_tags|truncate:100}</div> <span>{$user.username}</span>
<img class="img-circle" src="{avatar details=$user }">
</a>
</div>
</div>-->
<div class="moveR" style="width:90%;">
<!-- <h2 class="topicStarter" style="margin:0;"><a href="{$userquery->profile_link($user)}">{$user.username}</a></h2> -->
<div class="topicPreviewContainer clearfix">
<h4 class="topicTitle"><a href="{$cbgroup->topic_link($topic)}">{$topic.topic_title}</a></h4>
<div style="height:2px;"></div>
<div class="topicPreview">{$topic.topic_post|description|strip_tags|truncate:100}</div>
</div>
<span style="font:normal 10px Tahoma; color:#464646">{$topic.date_added|niceTime} &ndash; Added by <a href="{$userquery->profile_link($user)}"> {$user.username} </a> &ndash;{if $last_poster}{lang code="last_reply"} {lang code="by"} <a href="{$userquery->profile_link($last_poster)}">{$last_poster.username}</a> ({$topic.last_post_time|niceTime}){else}<a href="{$cbgroup->topic_link($topic)}">Participate</a>{/if} {if has_access('admin_access') || $topic.userid == $userquery->userid} &ndash; <a href="javascript:void(0)" id="delete_topic-{$topic.topic_id}" onmousedown="delete_item('delete_topic','{$topic.topic_id}','{lang code="tp_del_confirm"}','?mode=view_topics&amp;topic_action=delete&amp;topic_id={$topic.topic_id}&amp;url={$group.group_url}');">Delete</a>{/if}</span>
</div> </div>
<span style="font:normal 10px Tahoma; color:#464646">{$topic.date_added|niceTime} &ndash; {if $last_poster}{lang code="last_reply"} {lang code="by"} <a href="{$userquery->profile_link($last_poster)}">{$last_poster.username}</a> ({$topic.last_post_time|niceTime}){else}<a href="{$cbgroup->topic_link($topic)}">Participate</a>{/if} {if has_access('admin_access') || $topic.userid == $userquery->userid} &ndash; <a href="javascript:void(0)" id="delete_topic-{$topic.topic_id}" onmousedown="delete_item('delete_topic','{$topic.topic_id}','{lang code="tp_del_confirm"}','?mode=view_topics&amp;topic_action=delete&amp;topic_id={$topic.topic_id}&amp;url={$group.group_url}');">Delete</a>{/if}</span> </li>
</div> {/foreach}
</li> </ul>
{/foreach}
{/if} {/if}

2
upload/styles/cb_27/layout/view_group.html
View file

@ -5,7 +5,7 @@
<div class="cb-box marginBottom row"> <div class="cb-box marginBottom row">
<div class="row"> <div class="row">
<div class="col-md-2 leftSidebar"> <div class="col-md-2">
{include file="$style_dir/blocks/group/group_left.html"} {include file="$style_dir/blocks/group/group_left.html"}
</div> </div>
<div class="col-md-7 nopadding "> <div class="col-md-7 nopadding ">

10
upload/styles/cb_27/theme/css/groups.css
View file

@ -229,6 +229,16 @@ overflow: hidden;
.dropdown-submenu:hover>a:after{border-left-color:#ffffff;} .dropdown-submenu:hover>a:after{border-left-color:#ffffff;}
.dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} .dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}
.topic_title{font-weight:bold; display:block; color:#000000; border-bottom:1px solid #aaa; padding-bottom:5px; margin-bottom:5px;}
.topic_title a{font-weight:bold; display:block; color:#333; text-decoration:none}
.topic_title a:hover{color:#06c}
.add_topic{padding:5px; height:18px; line-height:16px; display:inline-block; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; background-color:#E6F0FF; margin-bottom:5px; cursor:pointer;font-weight:bold;}
.add_topic:hover{color:#06c}
.add_topic img{display:inline; float:left; margin-right:5px 0px; }
.add_topic_container{margin:auto;background:#FFF url(../images/simple_gradient.png) repeat-x bottom; border:1px solid #ccc; padding:5px; margin-bottom:10px}
@media (max-width: 981px) { @media (max-width: 981px) {
.groups-view { .groups-view {
min-height: 160px; min-height: 160px;

7
upload/view_topic.php
View file

@ -34,8 +34,15 @@ if($tdetails)
//Calling all functions when a topic is called //Calling all functions when a topic is called
call_view_topic_functions($tdetails); call_view_topic_functions($tdetails);
} }
$glist['exclude'] = $tdetails['group_id'];
$glist['limit'] = 10;
$groups = $cbgroup->get_groups($glist);
Assign('groups', $groups);
} }
template_files('view_topic.html'); template_files('view_topic.html');
display_it(); display_it();
?> ?>