From 8bdb1af1e072d214d46db773b6f34947076db507 Mon Sep 17 00:00:00 2001 From: Fahad Abbas Date: Tue, 2 Jun 2015 12:30:43 +0000 Subject: [PATCH] updated: issue groups(view group, view topic) --- .../styles/cb_27/layout/add_group_videos.html | 2 +- .../layout/blocks/group/group_topics.html | 54 +++++++++++-------- upload/styles/cb_27/layout/view_group.html | 2 +- upload/styles/cb_27/theme/css/groups.css | 10 ++++ upload/view_topic.php | 7 +++ 5 files changed, 52 insertions(+), 23 deletions(-) diff --git a/upload/styles/cb_27/layout/add_group_videos.html b/upload/styles/cb_27/layout/add_group_videos.html index af559128..e1157a1a 100644 --- a/upload/styles/cb_27/layout/add_group_videos.html +++ b/upload/styles/cb_27/layout/add_group_videos.html @@ -5,7 +5,7 @@ {include file="$style_dir/blocks/manage/account_menu.html"}
-
+
{include file="$style_dir/blocks/group/group_left.html"}
diff --git a/upload/styles/cb_27/layout/blocks/group/group_topics.html b/upload/styles/cb_27/layout/blocks/group/group_topics.html index 9963e2b3..b99ac32f 100644 --- a/upload/styles/cb_27/layout/blocks/group/group_topics.html +++ b/upload/styles/cb_27/layout/blocks/group/group_topics.html @@ -4,26 +4,38 @@ {/if} {if $topics} -{foreach from=$topics item=topic} -{assign var=user value=$userquery->get_user_details($topic.userid)} -{if $topic.last_poster} - {assign var=last_poster value=$userquery->get_user_details($topic.last_poster)} -{else} - {assign var=last_poster value=''} -{/if} -
  • -
    - {$user.username} -
    -
    -

    {$user.username}

    -
    -

    {$topic.topic_title}

    -
    -
    {$topic.topic_post|description|strip_tags|truncate:100}
    +
      + {foreach from=$topics item=topic} + {assign var=user value=$userquery->get_user_details($topic.userid)} + {if $topic.last_poster} + {assign var=last_poster value=$userquery->get_user_details($topic.last_poster)} + {else} + {assign var=last_poster value=''} + {/if} +
    • + +
      + +
      +

      {$topic.topic_title}

      +
      +
      {$topic.topic_post|description|strip_tags|truncate:100}
      +
      + {$topic.date_added|niceTime} – Added by {$user.username} –{if $last_poster}{lang code="last_reply"} {lang code="by"} {$last_poster.username} ({$topic.last_post_time|niceTime}){else}Participate{/if} {if has_access('admin_access') || $topic.userid == $userquery->userid} – Delete{/if}
      - {$topic.date_added|niceTime} – {if $last_poster}{lang code="last_reply"} {lang code="by"} {$last_poster.username} ({$topic.last_post_time|niceTime}){else}Participate{/if} {if has_access('admin_access') || $topic.userid == $userquery->userid} – Delete{/if} -
    -
    • -{/foreach} + + {/foreach} + {/if} \ No newline at end of file diff --git a/upload/styles/cb_27/layout/view_group.html b/upload/styles/cb_27/layout/view_group.html index c80d9626..1b9ff9ba 100644 --- a/upload/styles/cb_27/layout/view_group.html +++ b/upload/styles/cb_27/layout/view_group.html @@ -5,7 +5,7 @@
    -
    +
    {include file="$style_dir/blocks/group/group_left.html"}
    diff --git a/upload/styles/cb_27/theme/css/groups.css b/upload/styles/cb_27/theme/css/groups.css index b116107b..bc59af01 100644 --- a/upload/styles/cb_27/theme/css/groups.css +++ b/upload/styles/cb_27/theme/css/groups.css @@ -229,6 +229,16 @@ overflow: hidden; .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;} +.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) { .groups-view { min-height: 160px; diff --git a/upload/view_topic.php b/upload/view_topic.php index 9d43ec6b..4bf75647 100644 --- a/upload/view_topic.php +++ b/upload/view_topic.php @@ -34,8 +34,15 @@ if($tdetails) //Calling all functions when a topic is called 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'); display_it(); ?> \ No newline at end of file