diff --git a/upload/styles/cb_2014/layout/blocks/group/group_left.html b/upload/styles/cb_2014/layout/blocks/group/group_left.html index cf57bffb..e6ce66bc 100755 --- a/upload/styles/cb_2014/layout/blocks/group/group_left.html +++ b/upload/styles/cb_2014/layout/blocks/group/group_left.html @@ -1,6 +1,6 @@
- +
{isGroupAdmin @@ -32,4 +32,48 @@ {if $remove_group_link}
  • {$remove_group_link}
    • {/if} {/if} -
    \ No newline at end of file + +
    +
    {lang code="Group Members"}
    +
    + {assign var=users_items_group_page value=config(users_items_group_page)} + {assign var=members value=$cbgroup->get_members($group.group_id,"yes",$users_items_group_page)} + {if $members} +
    + {foreach from=$members item=member} + {include file="$style_dir/blocks/user.html" user=$member block_type='friends'} + {/foreach} +
    + {/if} +
    +
    +
    +
    {lang code="Options"}
    + + +
    + + diff --git a/upload/styles/cb_2014/layout/blocks/group/group_right.html b/upload/styles/cb_2014/layout/blocks/group/group_right.html index 69fcbb8e..c4a73f97 100755 --- a/upload/styles/cb_2014/layout/blocks/group/group_right.html +++ b/upload/styles/cb_2014/layout/blocks/group/group_right.html @@ -1,38 +1,29 @@ -
    -

    {lang code="members"}

    -
    - {assign var=users_items_group_page value=config(users_items_group_page)} - {assign var=members value=$cbgroup->get_members($group.group_id,"yes",$users_items_group_page)} - {if $members} -
    - {foreach from=$members item=member} - {include file="$style_dir/blocks/user.html" user=$member block_type='friends'} - {/foreach} -
    - {/if} +
    + +
    {lang code="Suggested Groups"}
    + {foreach $groups as $key => $group} +
    +
    +
    + + + +
    +
    +
    +
    {$group.group_name}
    +
    + {$group.total_members|number_format} + {lang code='members'} +
    +
    + {$join_link=$cbgroup->group_opt_link($group,'join'," class='btn btn-primary btn-sm line-height-1' ")} + {if $join_link}{$join_link}{/if} +
    +
    +
    -

    {lang code="Options"}

    -
      - {assign var=join_link value=$cbgroup->group_opt_link($group,'join')} - {if $join_link} - {$join_link} - {/if} - - {assign var=invite_link value=$cbgroup->group_opt_link($group,'invite')} - {if $invite_link} - {* onClick="groupsAjax(event,this);" *} - {$invite_link} - {/if} - - {assign var=leave_link value=$cbgroup->group_opt_link($group,'leave')} - {if $leave_link} - {$leave_link} - {/if} - {if isSectionEnabled('videos')} - {assign var=add_videos_link value=$cbgroup->group_opt_link($group,'add_videos')} - {if $add_videos_link} - {$add_videos_link} - {/if} - {/if} -
    +
    + {/foreach} +
    \ No newline at end of file diff --git a/upload/styles/cb_2014/layout/blocks/user.html b/upload/styles/cb_2014/layout/blocks/user.html index b27a58ea..07f993fb 100755 --- a/upload/styles/cb_2014/layout/blocks/user.html +++ b/upload/styles/cb_2014/layout/blocks/user.html @@ -49,9 +49,9 @@ {/if} {if $block_type == "friends"} -
    + {/if} diff --git a/upload/styles/cb_2014/layout/view_group.html b/upload/styles/cb_2014/layout/view_group.html index fabc9404..2eee37c7 100644 --- a/upload/styles/cb_2014/layout/view_group.html +++ b/upload/styles/cb_2014/layout/view_group.html @@ -2,25 +2,14 @@ {$leftMenuLinks = array_slice($myAccountLinks, 7)}
    {include file="$style_dir/blocks/manage/account_menu.html"} -
    - {include file="$style_dir/blocks/group/group_left.html"} +
    +
    -
    -
      - {foreach $leftMenuLinks as $key => $value} -
    • - {$key} -
        - {foreach $value as $subKey => $subValue} -
      • {$subKey}
        • - {/foreach} -
      -
      • - {/foreach} -
    +
    + {include file="$style_dir/blocks/group/group_left.html"}
    -
    -

    {$group.group_name|htmlspecialchars_decode}

    +
    +
    {$group.group_name|htmlspecialchars_decode}
    {lang code="info"} @@ -38,7 +27,7 @@ {lang code='report'}
    -
    +
    {if $mode == "" || $mode == "main"}

    {lang code="basic_info"}

    @@ -52,7 +41,7 @@ - + @@ -158,9 +147,12 @@
    {lang code="Report"} {lang code="group"}
    {show_flag_form id=$group.group_id type=Group display="block"} {/if} - - {include file="$style_dir/blocks/group/group_right.html"} + + +
    + {include file="$style_dir/blocks/group/group_right.html" group=$groups}
    - \ No newline at end of file + +
    \ No newline at end of file diff --git a/upload/styles/cb_2014/theme/css/groups.css b/upload/styles/cb_2014/theme/css/groups.css index e8a2c8ae..44f5e073 100644 --- a/upload/styles/cb_2014/theme/css/groups.css +++ b/upload/styles/cb_2014/theme/css/groups.css @@ -39,10 +39,44 @@ padding-left: 2px; .nomargin { margin: 0px !important; + color: #5a595a; + } .line-height-1{ line-height:1 !important; } .margin-bottom-10{ margin-bottom: 10px; +} +.user_on_right{ + +padding-bottom: 5px; +padding-top: 5px; +border-bottom: 1px solid #DDDDDD; + +} +.theme_color , .theme_color a { + color: #0099CC !important; +} +h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6{ + color: #5a595a; +} +.group_thumb_member{ + height: 34px; + margin: 1px; + width: 34px; +} +.friendsBox{ + margin-top: 7px; +} +.cb_img_thum{ + border: 2px solid #DDDDDD; + padding: 0; + width: 100%; +} +.margin-top-25{ + margin-top: 25px !important; +} +.basic-color{ + color: #5a595a; } \ No newline at end of file diff --git a/upload/view_group.php b/upload/view_group.php index 22228098..fa13d12d 100644 --- a/upload/view_group.php +++ b/upload/view_group.php @@ -104,6 +104,12 @@ if($details) e(lang("grp_exist_error")); $Cbucket->show_page = false; } +//pr($details,true); +//exit; +$glist['exclude'] = $details['group_id']; +$glist['limit'] = 10; +$groups = $cbgroup->get_groups($glist); +Assign('groups', $groups); template_files('view_group.html');
    {lang code="category"}{$group.category|categories:group}{$group.category|categories:group}
    {lang code="tags"}