[Isocial-svn] SF.net SVN: isocial: [268]
Status: Pre-Alpha
Brought to you by:
aguidrevitch
From: <di...@us...> - 2008-07-04 14:46:03
|
Revision: 268 http://isocial.svn.sourceforge.net/isocial/?rev=268&view=rev Author: dim0s77 Date: 2008-07-04 07:46:11 -0700 (Fri, 04 Jul 2008) Log Message: ----------- added menu to the group members. paginate group members view Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/views/groupapp/group/browse.tpl app/views/groupapp/group/edit_members.tpl app/views/groupapp/group/members.tpl app/views/groupapp/group/show_group.tpl public/stylesheets/common/MiniTab.css Added Paths: ----------- app/views/groupapp/group/_membersbar.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-07-04 14:44:59 UTC (rev 267) +++ app/controllers/groupapp/group_controller.php 2008-07-04 14:46:11 UTC (rev 268) @@ -247,7 +247,7 @@ $type_id = $this->subgroup_type_id > 0 ? " = " . $this->subgroup_type_id : " BETWEEN " . $this->group_type_id * 100 . " and " . ($this->group_type_id + 1) * 100; - $_filter_pagination = array('items_per_page' => 2, 'count_conditions' => "type_id" . $type_id ); + $_filter_pagination = array('items_per_page' => 10, 'count_conditions' => "type_id" . $type_id ); $group_pages = $this->pagination_helper->getPaginator($this->GroupappGroup, $_filter_pagination);// paginator $this->first_group = ($group_pages->getCurrentPage() - 1) * $group_pages->getItemsPerPage() + 1; $this->last_group = ($group_pages->getCurrentPage() * $group_pages->getItemsPerPage() < $group_pages->getItemCount()) ? @@ -262,30 +262,46 @@ function show_members () { $this->step = 'show_members'; + $this->members_role = 4; $this->_members(); - $this->renderAction('members.tpl'); } function show_moderators () { $this->step = 'show_moderators'; + $this->members_role = 3; $this->_members(); - $this->renderAction('members.tpl'); } function show_administrators () { $this->step = 'show_administrators'; + $this->members_role = 2; $this->_members(); - $this->renderAction('members.tpl'); } - function show_owners () { - $this->step = 'show_owners'; - $this->_members(); - $this->renderAction('members.tpl'); - } - function _members () { $this->_calcGroupMembersCount(); + + if (!count($this->group_members)) { + $this->renderAction('members.tpl'); + return; + } + + $members = array(); + foreach ($this->group_members as $group_member) { + if ($this->members_role == 4 || + ($this->members_role == 3 && $group_member->groupapp_member_role_id == $this->members_role) || + ($this->members_role <= 2 && $group_member->groupapp_member_role_id <= $this->members_role) + ) { + $members[] = $group_member; + } + } + + $_filter_pagination = array('items_per_page' => 10); + $member_pages = $this->array_pagination_helper->getPaginator("groupapp_member_pages", $members, $_filter_pagination);// paginator + $this->pages_links = $member_pages->links(); + $this->members = $this->array_pagination_helper->getPageItems("groupapp_member_pages", $members); + + $this->renderAction('members.tpl'); } function show_board () { Added: app/views/groupapp/group/_membersbar.tpl =================================================================== --- app/views/groupapp/group/_membersbar.tpl (rev 0) +++ app/views/groupapp/group/_membersbar.tpl 2008-07-04 14:46:11 UTC (rev 268) @@ -0,0 +1,27 @@ +<div class="minitabs"> + <div class="left"> + <ul class="toggle_minitabs"> + {?members_count} + <li><a href="/groupapp/group/show_members/{group.id?}" class="<?= !empty($step) && $step == 'show_members' ? 'selected' : '' ?> right_border">_{All Members}: {members_count}</a> + {else} + <li class="empty right_border">_{All Members}: 0 + {end} + {?moderators_count} + </li><li><a href="/groupapp/group/show_moderators/{group.id?}" class="<?= !empty($step) && $step == 'show_moderators' ? 'selected' : '' ?> right_border">_{Moderators}: {moderators_count}</a> + {else} + <li class="empty right_border">_{Moderators}: 0 + {end} + <? if ($admins_count || $owners_count): ?> + </li><li><a href="/groupapp/group/show_administrators/{group.id?}" class="<?= !empty($step) && $step == 'show_administrators' ? 'selected' : '' ?>">_{Administrators}: <?= $admins_count + $owners_count ?></a></li> + <? else: ?> + <li class="empty right_border">_{Administrators}: 0 + <? endif ?> + </ul> + </div> + <div class="right"> + <ul class="toggle_minitabs"> + {pages_links?} + </ul> + </div> +</div> +<div class="clearfix"> </div> Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-07-04 14:44:59 UTC (rev 267) +++ app/views/groupapp/group/browse.tpl 2008-07-04 14:46:11 UTC (rev 268) @@ -14,6 +14,8 @@ <?= $controller->renderPartial("menu") ?> +<?= $controller->renderErrors() ?> + {?all_groups_count} <div class="groups_list"> <div class="head"> Modified: app/views/groupapp/group/edit_members.tpl =================================================================== --- app/views/groupapp/group/edit_members.tpl 2008-07-04 14:44:59 UTC (rev 267) +++ app/views/groupapp/group/edit_members.tpl 2008-07-04 14:46:11 UTC (rev 268) @@ -7,6 +7,8 @@ <?= $controller->renderPartial("editbar") ?> +<?= $controller->renderErrors() ?> + <div class="formwrapper"> <form action="/groupapp/group/edit_members/{group.id?}" method="post"> <div class="invite_column"> Modified: app/views/groupapp/group/members.tpl =================================================================== --- app/views/groupapp/group/members.tpl 2008-07-04 14:44:59 UTC (rev 267) +++ app/views/groupapp/group/members.tpl 2008-07-04 14:46:11 UTC (rev 268) @@ -9,26 +9,31 @@ <?= $controller->renderPartial("membersbar") ?> -{?group_members} +<?= $controller->renderErrors() ?> + +{?members} <div class="groups_list"> <div class="container"> - {loop group_members} + {loop members} <div class="group_row"> <div class="actions wide"> <ul class="actions_list"> - <li><a href="/profile/show/{group_member.id?}">_{View Profile}</a></li> - <li><a href="/message/send/{group_member.id?}">_{Send a Message}</a></li> - <li><a href="/friend/{group_member.id?}">_{View Friends}</a></li> + <li><a href="/profile/show/{member.id?}">_{View Profile}</a></li> + <li><a href="/message/send/{member.id?}">_{Send a Message}</a></li> + <li><a href="/friend/{member.id?}">_{View Friends}</a></li> </ul> </div> <div class="avatar"> - <a href="/profile/show/{group_member.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> + <a href="/profile/show/{member.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> </div> <div class="info"> - <div class="other"><span class="param">_{Name}:</span> <span class="name"><a href="/profile/show/{group_member.id?}">{group_member.user.name?}</a></span></div> + <div class="other"> + <span class="param">_{Name}:</span> + <span class="name"><a href="/profile/show/{member.id?}">{member.user.name?}</a></span> + </div> </div> <div class="clearfix"></div> Modified: app/views/groupapp/group/show_group.tpl =================================================================== --- app/views/groupapp/group/show_group.tpl 2008-07-04 14:44:59 UTC (rev 267) +++ app/views/groupapp/group/show_group.tpl 2008-07-04 14:46:11 UTC (rev 268) @@ -5,6 +5,8 @@ </div> <div class="clearfix"></div> +<?= $controller->renderErrors() ?> + <div class="two_column"> <div class="right_small"> <div class="right_content"> @@ -137,7 +139,7 @@ <div class="box_title">_{Members}</div> </div> <div class="menu"> - <div class="action"><a href="/groupapp/group/members/{group.id?}">_{See all}</a></div> + <div class="action"><a href="/groupapp/group/show_members/{group.id?}">_{See all}</a></div> <div class="info">_{Members count}: {members_count?}</div> </div> <div class="clearfix"></div> Modified: public/stylesheets/common/MiniTab.css =================================================================== --- public/stylesheets/common/MiniTab.css 2008-07-04 14:44:59 UTC (rev 267) +++ public/stylesheets/common/MiniTab.css 2008-07-04 14:46:11 UTC (rev 268) @@ -31,13 +31,29 @@ margin: 0px; } +.toggle_minitabs li.empty { + color: #777777; + display: block; + float: left; + padding: 5px; + margin-bottom: 1px; +} + +.toggle_minitabs li.empty.right_border { + border-right: 1px solid #cccccc; +} + .toggle_minitabs li a { display: block; color: #3b5998; - padding: 5px 4px 5px 4px; - margin: 0px 4px 1px 4px; + padding: 5px; + margin-bottom: 1px; } +.toggle_minitabs li a.right_border { + border-right: 1px solid #cccccc; +} + .toggle_minitabs li a:focus { outline: 0px; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |