[Isocial-svn] SF.net SVN: isocial: [228]
Status: Pre-Alpha
Brought to you by:
aguidrevitch
From: <di...@us...> - 2008-05-29 17:21:58
|
Revision: 228 http://isocial.svn.sourceforge.net/isocial/?rev=228&view=rev Author: dim0s77 Date: 2008-05-29 10:22:03 -0700 (Thu, 29 May 2008) Log Message: ----------- added more info to group info page Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/locales/groupapp/group/ru.php app/models/groupapp_group.php app/models/groupapp_member.php app/views/groupapp/group/show_group.tpl public/stylesheets/common/Application.css public/stylesheets/groupapp/Group.css public/stylesheets/groupapp/Groupapp.css timesheet/dim0s77.txt Removed Paths: ------------- app/views/groupapp/group/group_info.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-05-25 14:19:54 UTC (rev 227) +++ app/controllers/groupapp/group_controller.php 2008-05-29 17:22:03 UTC (rev 228) @@ -145,15 +145,45 @@ 'include' => 'user')); } - function group_info () { - if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - $this->group = $this->GroupappGroup->find($this->params['id']); - } - } - function show_group () { if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { $this->group = $this->GroupappGroup->find($this->params['id']); + $this->members = $this->_getGroupMembers($this->group); + $this->members_count = count($this->members); + $this->admins = array(); + foreach ($this->members as $member) { + if ($member->groupapp_member_role_id < 3) { + $member->role->load(); + $this->admins[] = $member; + } + } + $this->group_type = $this->group->group_type->load()->get('name'); + $messages = $this->GroupappMessage->find('all', + array( + 'conditions' => array("groupapp_group_id = ?", $this->group->getId()), + ) + ); + $topics = array(); + $persons = array(); + if(!empty($messages)) { + foreach ($messages as $message) { + if (!isset($topics[$message->topic_id])) { + $topics[$message->topic_id]['first'] = $message; + } + isset($topics[$message->topic_id]['posts']) ? + $topics[$message->topic_id]['posts']++ : + $topics[$message->topic_id]['posts'] = 1; + if (!isset($persons[$message->topic_id][$message->user_id])) { + $persons[$message->topic_id][$message->user_id] = 1; + isset($topics[$message->topic_id]['persons']) ? + $topics[$message->topic_id]['persons']++ : + $topics[$message->topic_id]['persons'] = 1; + } + $topics[$message->topic_id]['last'] = $message; + $topics[$message->topic_id]['last'] = $message; + } + } + $this->topics = $topics; } } Modified: app/locales/groupapp/group/ru.php =================================================================== --- app/locales/groupapp/group/ru.php 2008-05-25 14:19:54 UTC (rev 227) +++ app/locales/groupapp/group/ru.php 2008-05-29 17:22:03 UTC (rev 228) @@ -15,6 +15,12 @@ $dictionary['Start a New Group'] = 'Начать новую группу'; $dictionary['Find a Group'] = 'Найти группу'; $dictionary['Search Groups'] = 'Поиск групп'; +$dictionary['Type'] = 'Тип'; +$dictionary['Updated on'] = 'Обновлена'; +$dictionary['posts'] = 'сообщений'; +$dictionary['persons'] = 'участников'; +$dictionary['Start New Topic'] = 'Начать новую тему'; +$dictionary['Topics count'] = 'Обсуждаемых тем'; $dictionary['Step'] = 'Шаг'; $dictionary['Group Info'] = 'Инфо о группе'; @@ -73,6 +79,12 @@ 'Для присоединения нового участника требуется разрешение администраторов. Информацию о группе может увидеть только участник группы. Только участники группы смогут увидеть форум, доску объявлений, видео и фото.'; $dictionary['The group will not appear in search results or in the profiles of its members. Membership is by invitation only, and only members can see the group information. Only the members will be able to see the following: the discussion board, the wall, videos and photos.'] = 'Эта группа не будет отображаться в результатах поиска или в профилях своих участников. Членство в группе возможно только по приглашению, и только участники группы могут видеть информацию о группе. Только участники смогут увидеть форум, доску объявлений, видео и фото.'; +$dictionary['This is an open group. Anyone can join and invite others to join.'] = + 'Это открытая группа. Каждый может присоединиться и пригласить других.'; +$dictionary['This is a closed group. Members must be invited or approved by an admin.'] = + 'Это закрытая группа. Для присоединения нового участника требуется разрешение администраторов.'; +$dictionary['This is a secret group. It will not show up in your profile, and only admins can invite members.'] = + 'Это засекреченная группа. Эта группа не будет отображаться в результатах поиска или в профилях своих участников.'; $dictionary['Publicize'] = 'Опубликовать'; $dictionary['Show this group in search results'] = 'Показывать эту группу в результатах поиска'; Modified: app/models/groupapp_group.php =================================================================== --- app/models/groupapp_group.php 2008-05-25 14:19:54 UTC (rev 227) +++ app/models/groupapp_group.php 2008-05-29 17:22:03 UTC (rev 228) @@ -9,7 +9,7 @@ 'foreign_key' => 'groupapp_group_id') ); var $belongs_to = array('group_type' => array('class_name' => 'GroupappGroupType', - 'primary_key_name' => 'type_id') + 'primary_key_name' => 'type_id') ); Modified: app/models/groupapp_member.php =================================================================== --- app/models/groupapp_member.php 2008-05-25 14:19:54 UTC (rev 227) +++ app/models/groupapp_member.php 2008-05-29 17:22:03 UTC (rev 228) @@ -4,7 +4,7 @@ { var $belongs_to = array('user' => array('class_name' => 'User', 'primary_key_name' => 'user_id'), - 'role' => array('class_name' => 'GroupMemberRole', + 'role' => array('class_name' => 'GroupappMemberRole', 'primary_key_name' => 'groupapp_member_role_id'), 'group' => array('class_name' => 'GroupappGroup', 'primary_key_name' => 'groupapp_group_id') Deleted: app/views/groupapp/group/group_info.tpl =================================================================== --- app/views/groupapp/group/group_info.tpl 2008-05-25 14:19:54 UTC (rev 227) +++ app/views/groupapp/group/group_info.tpl 2008-05-29 17:22:03 UTC (rev 228) @@ -1 +0,0 @@ -<?= $controller->renderPartial("menu") ?> \ No newline at end of file Modified: app/views/groupapp/group/show_group.tpl =================================================================== --- app/views/groupapp/group/show_group.tpl 2008-05-25 14:19:54 UTC (rev 227) +++ app/views/groupapp/group/show_group.tpl 2008-05-29 17:22:03 UTC (rev 228) @@ -9,6 +9,10 @@ <div class="right_small"> <div class="right_content"> + <div class="group_avatar"> + <img src="/images/nophoto_men_sm.gif" alt="" class=""> + </div> + <ul class="actions_list"> <li><a href="/groupapp/">_{Message All Members}</a></li> <li><a href="/groupapp/group/edit_info/{group.id?}">_{Edit Group}</a></li> @@ -19,9 +23,18 @@ <div class="box"> <div class="header"> - <div class="edit"><a href="#">_{edit}</a></div> + <div class="edit"><a href="/groupapp/group/edit_customize/{group.id?}">_{edit}</a></div> <div class="box_title">_{Group Type}</div> </div> + <div class="body"> + <? if ($group->access == 0) { ?> + _{This is an open group. Anyone can join and invite others to join.} + <? } else if ($group->access == 1) { ?> + _{This is a closed group. Members must be invited or approved by an admin.} + <? } else if ($group->access == 2) { ?> + _{This is a secret group. It will not show up in your profile, and only admins can invite members.} + <? } ?> + </div> <div class="clearfix"></div> </div> @@ -29,6 +42,13 @@ <div class="header"> <div class="box_title">_{Administrators}</div> </div> + <div class="body"> + <ul class="simple_list"> + {loop admins} + <li><a href="/groupapp/">{admin.user.name?}</a> <span>(<?= $admin->role->get('name') ?>)</span></li> + {end} + </ul> + </div> <div class="clearfix"></div> </div> @@ -39,12 +59,17 @@ <div class="box"> <div class="header"> - <div class="edit"><a href="#">_{edit}</a></div> - <div class="box_title">_{Information}</div> + <div class="edit"><a href="/groupapp/group/edit_info/{group.id?}">_{edit}</a></div> + <div class="box_title">_{Group Info}</div> </div> <div class="clearfix"></div> <div class="body"> - Group Info + <div class="other param">_{Type}:</div> + <div class="other value">{group_type?}</div> + <div class="clearfix"></div> + <div class="other param">_{Description}:</div> + <div class="other value">{group.description}</div> + <div class="clearfix"></div> </div> </div> @@ -72,20 +97,35 @@ <div class="header"> <div class="box_title">_{Discussion board}</div> </div> - <div class="clearfix"></div> + {?topics} + <div class="menu"> + <div class="action"><a href="/groupapp/board/start_topic/{group.id?}">_{Start New Topic}</a></div> + <div class="info">_{Topics count}: <a href="/groupapp/board/{group.id?}">1</a></div> + </div> + <div class="simple_list"> + {loop topics} + <div class="row"> + <div class="box_title">{topic-first.subject?}</div> + <div class="subtext black">_{posts}: {topic-posts?}; _{persons}: {topic-persons?}</div> + <div class="subtext">_{Updated on} {topic-last.created_at?}</div> + </div> + {end} + </div> + {else} <div class="emptyblock"> - _{There are no discussions}.<br><a href="#">_{Start the first topic}</a>. + _{There are no discussions}.<br><a href="/groupapp/board/start_topic/{group.id?}">_{Start the first topic}</a>. </div> + {end} </div> <div class="box"> <div class="header"> - <div class="edit"><a href="#">_{edit}</a></div> + <div class="edit"><a href="/groupapp/group/edit_members/{group.id?}">_{edit}</a></div> <div class="box_title">_{Members}</div> </div> <div class="menu"> <div class="action"><a href="#">_{See all}</a></div> - <div class="info">_{Members count}: 1</div> + <div class="info">_{Members count}: {members_count?}</div> </div> <div class="clearfix"></div> <div class="body"> Modified: public/stylesheets/common/Application.css =================================================================== --- public/stylesheets/common/Application.css 2008-05-25 14:19:54 UTC (rev 227) +++ public/stylesheets/common/Application.css 2008-05-29 17:22:03 UTC (rev 228) @@ -279,19 +279,17 @@ } .box .header { - color: #3b5998; background: #d8dfea; - padding: 3px 0px 3px 0px; + padding: 3px 10px 3px 10px; } -.box .header .box_title { +.box_title { + color: #3b5998; font-weight: bold; - margin-left: 10px; } .box .header .edit { float: right; - margin-right: 10px; } .box .menu { @@ -314,6 +312,11 @@ padding: 10px; } +.box .simple_list .row { + border-bottom: 1px solid #aaaaaa; + padding: 10px ; +} + .box .emptyblock { border-top: 1px solid #aaaaaa; border-bottom: 1px solid #aaaaaa; @@ -352,6 +355,21 @@ color: #777777; } +.simple_list { + margin: 0px; + padding: 0px; +} + +.simple_list li { + list-style: square outside; + color: #3b5998; + margin: 0px 0px 5px 5px; +} + +.simple_list li span { + color: black; +} + .footer { float: left; display: block; Modified: public/stylesheets/groupapp/Group.css =================================================================== --- public/stylesheets/groupapp/Group.css 2008-05-25 14:19:54 UTC (rev 227) +++ public/stylesheets/groupapp/Group.css 2008-05-29 17:22:03 UTC (rev 228) @@ -178,12 +178,12 @@ margin-bottom: 10px; } -.groups_list .container .row .info .other { +.other { float: left; margin-bottom: 3px; } -.groups_list .container .row .info .other.param { +.other.param { color: #999999; margin-right: 5px; } @@ -192,3 +192,14 @@ float: right; width: 125px; } + +.subtext { + padding: 2px 5px 0px 0px; + font-size: 9px; + color: #777777; +} + +.subtext.black { + color: #000000; + float: left; +} Modified: public/stylesheets/groupapp/Groupapp.css =================================================================== --- public/stylesheets/groupapp/Groupapp.css 2008-05-25 14:19:54 UTC (rev 227) +++ public/stylesheets/groupapp/Groupapp.css 2008-05-29 17:22:03 UTC (rev 228) @@ -45,3 +45,7 @@ border-bottom: solid 1px #cccccc; } +.group_avatar { + text-align: center; + margin-bottom: 5px; +} \ No newline at end of file Modified: timesheet/dim0s77.txt =================================================================== --- timesheet/dim0s77.txt 2008-05-25 14:19:54 UTC (rev 227) +++ timesheet/dim0s77.txt 2008-05-29 17:22:03 UTC (rev 228) @@ -27,3 +27,5 @@ 2008-05-17,10:50,11:40,groupapp,RT:3,"discussion board: reply to post" 2008-05-25,09:00,16:35,groupapp,RT:3,"groupapp" + +2008-05-29,18:25,20:20,groupapp,RT:3,"groupapp: adding more info to group info page" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |