isocial-svn Mailing List for isocial (Page 3)
Status: Pre-Alpha
Brought to you by:
aguidrevitch
You can subscribe to this list here.
2008 |
Jan
|
Feb
(11) |
Mar
(80) |
Apr
(22) |
May
(90) |
Jun
(28) |
Jul
(33) |
Aug
(12) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
---|
From: <di...@us...> - 2008-06-26 17:36:42
|
Revision: 254 http://isocial.svn.sourceforge.net/isocial/?rev=254&view=rev Author: dim0s77 Date: 2008-06-26 10:36:48 -0700 (Thu, 26 Jun 2008) Log Message: ----------- Upgraded group's browse Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/installers/groupapp/russian_installer.php app/locales/groupapp/group/ru.php app/views/groupapp/board/index.tpl app/views/groupapp/group/browse.tpl app/views/groupapp/group/index.tpl public/stylesheets/common/Layout.css public/stylesheets/groupapp/Group.css Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-26 10:43:07 UTC (rev 253) +++ app/controllers/groupapp/group_controller.php 2008-06-26 17:36:48 UTC (rev 254) @@ -254,24 +254,32 @@ if (!($this->all_groups_count = count($all_groups))) { return; } $all_group_types = $this->GroupappGroupType->find('all'); if ($all_group_types) { - $this->group_id = 2; - $this->subgroup_id = 0; + $this->group_type_id = 2; + $this->subgroup_type_id = 0; foreach($all_group_types as $group_type) { $gt = array("id" => $group_type->id, "parent_id" => $group_type->parent_id, "name" => $group_type->get('name')); - if ($group_type->parent_id == 0) { + if ($group_type->parent_id == 0) { // groups $this->group_types[] = $gt; - } else if (!empty($this->params['g'])) { + } else if (!empty($this->params['g'])) { // group selected if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) { - $this->group_id = $this->params['g']; + $this->group_type_id = $this->params['g']; $this->subgroup_types[] = $gt; - if (isset($this->params['sg']) && is_numeric($this->params['sg'])) { - $this->subgroup_id = $this->params['sg']; + if (isset($this->params['sg']) && is_numeric($this->params['sg'])) { // subgroup selected + $this->subgroup_type_id = $this->params['sg']; } } - } else if ($group_type->parent_id == 2) { + } else if ($group_type->parent_id == 2) { // no group selected $this->subgroup_types[] = $gt; } } + $type_id = $this->subgroup_type_id > 0 ? $this->subgroup_type_id : $this->group_type_id; + + $_filter_pagination = array('items_per_page' => 10, 'count_conditions' => "type_id =" . $type_id ); + $this->group_pages = $this->pagination_helper->getPaginator($this->GroupappGroup, $_filter_pagination);// paginator + + $_filter = array('conditions' => "type_id =" . $type_id); + $options = array_merge($_filter, $this->pagination_helper->getFindOptions($this->GroupappGroup)); + $this->groups = $this->GroupappGroup->find('all', $options); } } Modified: app/installers/groupapp/russian_installer.php =================================================================== --- app/installers/groupapp/russian_installer.php 2008-06-26 10:43:07 UTC (rev 253) +++ app/installers/groupapp/russian_installer.php 2008-06-26 17:36:48 UTC (rev 254) @@ -130,7 +130,7 @@ $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Религиозные организации' WHERE id = 810"); $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Волонтерские организации' WHERE id = 811"); - $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Рекламное' WHERE id = 901"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Спонсорство' WHERE id = 901"); $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Автомобили и Рэйсинг' WHERE id = 1001"); $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Группы поддержки' WHERE id = 1002"); Modified: app/locales/groupapp/group/ru.php =================================================================== --- app/locales/groupapp/group/ru.php 2008-06-26 10:43:07 UTC (rev 253) +++ app/locales/groupapp/group/ru.php 2008-06-26 17:36:48 UTC (rev 254) @@ -144,4 +144,10 @@ $dictionary['Create first group'] = 'Создать первую группу'; $dictionary['All'] = 'Все'; +$dictionary['Search groups'] = 'Поиск групп'; +$dictionary['Search by name'] = 'Поиск по имени'; +$dictionary['Filter groups by'] = 'Фильтровать группы по'; +$dictionary['subtype'] = 'подтипу'; +$dictionary['type'] = 'типу'; + ?> Modified: app/views/groupapp/board/index.tpl =================================================================== --- app/views/groupapp/board/index.tpl 2008-06-26 10:43:07 UTC (rev 253) +++ app/views/groupapp/board/index.tpl 2008-06-26 17:36:48 UTC (rev 254) @@ -1,3 +1,17 @@ +<script> +function on_search_topic_click(element) { + if (element.value == '_{Search all topics}') { + element.value = ''; + } +} + +function on_search_topic_blur(element) { + if (element.value == '') { + element.value = '_{Search all topics}'; + } +} +</script> + <?= $controller->renderPartial("head") ?> <div class="submenu"> @@ -63,17 +77,3 @@ </div> {end} <div class="clearfix"></div> - -<script> -function on_search_topic_click(element) { - if (element.value == '_{Search all topics}') { - element.value = ''; - } -} - -function on_search_topic_blur(element) { - if (element.value == '') { - element.value = '_{Search all topics}'; - } -} -</script> Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-26 10:43:07 UTC (rev 253) +++ app/views/groupapp/group/browse.tpl 2008-06-26 17:36:48 UTC (rev 254) @@ -1,76 +1,97 @@ +<script> +function on_search_group_click(element) { + if (element.value == '_{Search by name}') { + element.value = ''; + } +} + +function on_search_group_blur(element) { + if (element.value == '') { + element.value = '_{Search by name}'; + } +} +</script> + <?= $controller->renderPartial("menu") ?> {?all_groups_count} -<div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div> - <div class="groups_list"> -<div class="container"> + <div class="head">_{Groups paginator description}: </div> -<div class="two_column"> - <div class="right_small"> - <div class="right_content"> - <div class="filter_text">_{Filter groups by}:</div> - <div class="filter_name">_{Type}</div> - <?= $form_options_helper->select('browse_groups', 'g', $PoliticalView->collect($PoliticalView->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Political Views:')) )?> - <ul class="actions_list"> - {loop group_types} - <li><a href="/groupapp/group/browse?g={group_type-id?}">{group_type-name}</a></li> - {end} - </ul> - <div class="filter_name">_{Subtype}</div> - <ul class="subgroups_list"> - <? if ($subgroup_id == 0) { ?> - <li><strong>_{All}</strong></li> - <? } else { ?> - <li><a href="/groupapp/group/browse?g={group_id?}">_{All}</a></li> - <? } ?> - {loop subgroup_types} - <? if ($subgroup_id == $subgroup_type["id"]) { ?> - <li><strong>{subgroup_type-name?}</strong></li> - <? } else { ?> - <li><a href="/groupapp/group/browse?g={subgroup_type-parent_id?}&sg={subgroup_type-id?}">{subgroup_type-name?}</a></li> - <? } ?> - {end} - </ul> + <div class="two_column"> + <div class="right_small"> + <div class="right_content"> + + <div class="title_text">_{Search groups}:</div> + <form> + <input class="mediumtextinput search" id="searchfield" name="" type="text" value="_{Search by name}" onclick="on_search_group_click(this)" onblur="on_search_group_blur(this)" /> + </form> + + <div class="or_text">_{or}</div> + + <div class="title_text">_{Filter groups by}:</div> + <div class="filter_name">_{type}</div> + <select id="group_type_id" onchange="javascript: window.location.href='?g=' + this.options[this.selectedIndex].value"> + {loop group_types} + <option <? if($group_type['id'] == $group_type_id): ?>selected="selected" <? endif ?>value="{group_type-id?}">{group_type-name?}</option> + {end} + </select> + + <div class="filter_name">_{subtype}</div> + <ul class="subgroups_list"> + <? if ($subgroup_type_id == 0): ?> + <li><strong>_{All}</strong></li> + <? else: ?> + <li><a href="/groupapp/group/browse?g={group_type_id?}">_{All}</a></li> + <? endif ?> + {loop subgroup_types} + <? if ($subgroup_type_id == $subgroup_type["id"]): ?> + <li><strong>{subgroup_type-name?}</strong></li> + <? else: ?> + <li><a href="/groupapp/group/browse?g={subgroup_type-parent_id?}&sg={subgroup_type-id?}">{subgroup_type-name?}</a></li> + <? endif ?> + {end} + </ul> + </div> </div> - </div> - <div class="left_big"> - {loop user_groups} - <div class="row"> + <div class="left_big"> + <div class="left_content"> + {loop groups} + <div class="group_row"> + <div class="actions"> <ul class="actions_list"> - <li><a href="/groupapp/group/edit_info/{user_group.id?}">_{Edit Group}</a></li> - <li><a href="#">_{Leave Group}</a></li> + <li><a href="#">_{Join Group}</a></li> </ul> </div> <div class="avatar"> - <a href="/groupapp/group/show_group/{user_group.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> + <a href="/groupapp/group/show_group/{group.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> </div> <div class="info"> - <div class="name"><a href="/groupapp/group/show_group/{user_group.id?}">{user_group.name}</a></div> - <div class="other param">_{Members count}:</div> - <div class="other value">{user_group.members_count}</div> - <div class="clearfix"></div> - <div class="other param">_{Type}:</div> - <div class="other value"><? $id = $user_group->type_id; echo $gt[$id]; ?></div> - <div class="clearfix"></div> + <div class="name"><a href="/groupapp/group/show_group/{group.id?}">{group.name}</a></div> + <div class="other"><span class="param">_{Members count}:</span> {group.members_count}</div> + <div class="other"><span class="param">_{Type}:</span> </div> </div> - <div class="clearfix"></div> </div> + {end} + + </div> + </div> + </div> + <div class="clearfix"></div> + <div class="foot"> </div> </div> -</div> -</div> +{else} -{else} <div class="nogroups"> _{Groups are not found}. <a href="/groupapp/group/create">_{Create first group}!</a> </div> Modified: app/views/groupapp/group/index.tpl =================================================================== --- app/views/groupapp/group/index.tpl 2008-06-26 10:43:07 UTC (rev 253) +++ app/views/groupapp/group/index.tpl 2008-06-26 17:36:48 UTC (rev 254) @@ -33,38 +33,35 @@ <div class="clearfix"></div> <div class="groups_list"> - <div class="info">_{You are in groups}: <?= count($user_groups); ?></div> + <div class="head">_{You are in groups}: <?= count($user_groups); ?></div> <div class="container"> - {loop user_groups} - <div class="row"> + {loop user_groups} + <div class="group_row"> <div class="actions"> <ul class="actions_list"> <li><a href="/groupapp/group/edit_info/{user_group.id?}">_{Edit Group}</a></li> <li><a href="#">_{Leave Group}</a></li> - </ul> + </ul> </div> - + <div class="avatar"> <a href="/groupapp/group/show_group/{user_group.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> </div> <div class="info"> <div class="name"><a href="/groupapp/group/show_group/{user_group.id?}">{user_group.name}</a></div> - <div class="other param">_{Members count}:</div> - <div class="other value">{user_group.members_count}</div> - <div class="clearfix"></div> - <div class="other param">_{Type}:</div> - <div class="other value"><? $id = $user_group->type_id; echo $gt[$id]; ?></div> - <div class="clearfix"></div> + <div class="other"><span class="param">_{Members count}:</span> {user_group.members_count}</div> + <div class="other"><span class="param">_{Type}:</span> <? $id = $user_group->type_id; echo $gt[$id]; ?></div> </div> <div class="clearfix"></div> </div> - {end} + {end} </div> - + <div class="clearfix"></div> + <div class="foot"> </div> </div> {else} <div class="nogroups"> Modified: public/stylesheets/common/Layout.css =================================================================== --- public/stylesheets/common/Layout.css 2008-06-26 10:43:07 UTC (rev 253) +++ public/stylesheets/common/Layout.css 2008-06-26 17:36:48 UTC (rev 254) @@ -20,7 +20,7 @@ } .left_content { - padding: 10px 5px 10px 20px; + padding: 10px 5px 10px 10px; } .right_content { Modified: public/stylesheets/groupapp/Group.css =================================================================== --- public/stylesheets/groupapp/Group.css 2008-06-26 10:43:07 UTC (rev 253) +++ public/stylesheets/groupapp/Group.css 2008-06-26 17:36:48 UTC (rev 254) @@ -138,45 +138,57 @@ } .groups_list { - float: left; width: 100%; + background: #f7f7f7; } -.groups_list .info { +.groups_list .head { padding: 10px 10px 5px 20px; + border-bottom: solid 1px #dddddd; + background: #ffffff; } -.groups_list .container { +.groups_list .foot { background: #f7f7f7; - padding: 5px; - border-top: solid 1px #dddddd; border-bottom: solid 1px #dddddd; } -.groups_list .container .row { +.groups_list .container { + padding: 5px 10px 5px 10px; +} + +.group_row { + float: left; + width: 100%; background: #ffffff; border: 1px solid #cccccc; - display: block; - margin: 3px; - padding: 10px 20px 10px 20px; + margin: 5px 0px 5px 0px; } -.groups_list .container .row .avatar { - float: left; +.group_row .avatar { + position: absolute; width: 100px; + padding: 10px 5px 10px 5px; + text-align: center; } -.groups_list .container .row .info { - float: left; - width: 300px; - padding: 0px 5px 0px 5px; +.group_row .info { + padding: 10px 5px 10px 5px; + margin-left: 110px; + position: relative; } -.groups_list .container .row .info .name { +.group_row .info .name { padding: 0px; margin-bottom: 10px; } +.group_row .actions { + float: right; + width: 125px; + padding: 10px 5px 10px 0px; +} + .subgroups_list { list-style: none; margin: 0px 0px 10px 0px; @@ -188,20 +200,14 @@ } .other { - float: left; - margin-bottom: 3px; + margin: 5px 0px 5px 0px; } -.other.param { +.other .param { color: #999999; - margin-right: 5px; + margin: 0px 5px 0px 0px; } -.groups_list .container .row .actions { - float: right; - width: 125px; -} - .subtext { padding: 2px 5px 0px 0px; font-size: 9px; @@ -212,3 +218,22 @@ color: #000000; float: left; } + +.title_text { + color: #333333; + font-weight: bold; + font-size: 12px; + padding: 5px 0px 0px 0px; +} + +.or_text { + color: #777777; + padding: 5px 0px 5px 0px; +} + +.filter_name { + color: #777777; + font-weight: bold; + font-size: 12px; + padding: 10px 0px 3px 0px; +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-26 10:43:00
|
Revision: 253 http://isocial.svn.sourceforge.net/isocial/?rev=253&view=rev Author: dim0s77 Date: 2008-06-26 03:43:07 -0700 (Thu, 26 Jun 2008) Log Message: ----------- minor fixes Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/views/groupapp/group/browse.tpl public/stylesheets/common/Layout.css public/stylesheets/groupapp/Group.css Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-25 19:06:47 UTC (rev 252) +++ app/controllers/groupapp/group_controller.php 2008-06-26 10:43:07 UTC (rev 253) @@ -262,6 +262,7 @@ $this->group_types[] = $gt; } else if (!empty($this->params['g'])) { if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) { + $this->group_id = $this->params['g']; $this->subgroup_types[] = $gt; if (isset($this->params['sg']) && is_numeric($this->params['sg'])) { $this->subgroup_id = $this->params['sg']; Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-25 19:06:47 UTC (rev 252) +++ app/views/groupapp/group/browse.tpl 2008-06-26 10:43:07 UTC (rev 253) @@ -9,12 +9,16 @@ <div class="two_column"> <div class="right_small"> <div class="right_content"> + <div class="filter_text">_{Filter groups by}:</div> + <div class="filter_name">_{Type}</div> + <?= $form_options_helper->select('browse_groups', 'g', $PoliticalView->collect($PoliticalView->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Political Views:')) )?> <ul class="actions_list"> {loop group_types} <li><a href="/groupapp/group/browse?g={group_type-id?}">{group_type-name}</a></li> {end} </ul> - <ul class="groups_list"> + <div class="filter_name">_{Subtype}</div> + <ul class="subgroups_list"> <? if ($subgroup_id == 0) { ?> <li><strong>_{All}</strong></li> <? } else { ?> Modified: public/stylesheets/common/Layout.css =================================================================== --- public/stylesheets/common/Layout.css 2008-06-25 19:06:47 UTC (rev 252) +++ public/stylesheets/common/Layout.css 2008-06-26 10:43:07 UTC (rev 253) @@ -24,5 +24,5 @@ } .right_content { - padding: 10px 20px 10px 5px; + padding: 10px 10px 10px 5px; } Modified: public/stylesheets/groupapp/Group.css =================================================================== --- public/stylesheets/groupapp/Group.css 2008-06-25 19:06:47 UTC (rev 252) +++ public/stylesheets/groupapp/Group.css 2008-06-26 10:43:07 UTC (rev 253) @@ -177,15 +177,14 @@ margin-bottom: 10px; } -.groups_list ul { +.subgroups_list { list-style: none; - padding-left: 0px; - margin: 0px; + margin: 0px 0px 10px 0px; + padding: 0px; } -.groups_list li { - display: block; - padding: 5px 10px 5px 10px; +.subgroups_list li { + padding: 5px 0px 5px 0px; } .other { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-25 19:06:41
|
Revision: 252 http://isocial.svn.sourceforge.net/isocial/?rev=252&view=rev Author: dim0s77 Date: 2008-06-25 12:06:47 -0700 (Wed, 25 Jun 2008) Log Message: ----------- minor changes Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/locales/groupapp/group/ru.php app/views/groupapp/group/browse.tpl public/stylesheets/common/Layout.css public/stylesheets/groupapp/Group.css Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-25 18:33:10 UTC (rev 251) +++ app/controllers/groupapp/group_controller.php 2008-06-25 19:06:47 UTC (rev 252) @@ -254,6 +254,8 @@ if (!($this->all_groups_count = count($all_groups))) { return; } $all_group_types = $this->GroupappGroupType->find('all'); if ($all_group_types) { + $this->group_id = 2; + $this->subgroup_id = 0; foreach($all_group_types as $group_type) { $gt = array("id" => $group_type->id, "parent_id" => $group_type->parent_id, "name" => $group_type->get('name')); if ($group_type->parent_id == 0) { @@ -262,10 +264,10 @@ if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) { $this->subgroup_types[] = $gt; if (isset($this->params['sg']) && is_numeric($this->params['sg'])) { - $this->subgroup = $this->params['sg']; + $this->subgroup_id = $this->params['sg']; } } - } else if ($group_type->parent_id == 1) { + } else if ($group_type->parent_id == 2) { $this->subgroup_types[] = $gt; } } Modified: app/locales/groupapp/group/ru.php =================================================================== --- app/locales/groupapp/group/ru.php 2008-06-25 18:33:10 UTC (rev 251) +++ app/locales/groupapp/group/ru.php 2008-06-25 19:06:47 UTC (rev 252) @@ -142,5 +142,6 @@ $dictionary['Groups are not found'] = 'Ни одной группы не найдено'; $dictionary['Create first group'] = 'Создать первую группу'; +$dictionary['All'] = 'Все'; ?> Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-25 18:33:10 UTC (rev 251) +++ app/views/groupapp/group/browse.tpl 2008-06-25 19:06:47 UTC (rev 252) @@ -3,6 +3,9 @@ {?all_groups_count} <div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div> +<div class="groups_list"> +<div class="container"> + <div class="two_column"> <div class="right_small"> <div class="right_content"> @@ -11,10 +14,15 @@ <li><a href="/groupapp/group/browse?g={group_type-id?}">{group_type-name}</a></li> {end} </ul> - <ul> + <ul class="groups_list"> + <? if ($subgroup_id == 0) { ?> + <li><strong>_{All}</strong></li> + <? } else { ?> + <li><a href="/groupapp/group/browse?g={group_id?}">_{All}</a></li> + <? } ?> {loop subgroup_types} - <? if (isset($subgroup) && $subgroup == $subgroup_type["id"]) { ?> - <li><b>{subgroup_type-name?}</b></li> + <? if ($subgroup_id == $subgroup_type["id"]) { ?> + <li><strong>{subgroup_type-name?}</strong></li> <? } else { ?> <li><a href="/groupapp/group/browse?g={subgroup_type-parent_id?}&sg={subgroup_type-id?}">{subgroup_type-name?}</a></li> <? } ?> @@ -24,9 +32,6 @@ </div> <div class="left_big"> - <div class="groups_list"> - - <div class="container"> {loop user_groups} <div class="row"> @@ -54,12 +59,13 @@ <div class="clearfix"></div> </div> {end} - </div> - - </div> </div> - + <div class="clearfix"></div> </div> + +</div> +</div> + {else} <div class="nogroups"> _{Groups are not found}. <a href="/groupapp/group/create">_{Create first group}!</a> Modified: public/stylesheets/common/Layout.css =================================================================== --- public/stylesheets/common/Layout.css 2008-06-25 18:33:10 UTC (rev 251) +++ public/stylesheets/common/Layout.css 2008-06-25 19:06:47 UTC (rev 252) @@ -1,5 +1,4 @@ #content .two_column { - background: #ffffff; } #content .two_column .left_small { Modified: public/stylesheets/groupapp/Group.css =================================================================== --- public/stylesheets/groupapp/Group.css 2008-06-25 18:33:10 UTC (rev 251) +++ public/stylesheets/groupapp/Group.css 2008-06-25 19:06:47 UTC (rev 252) @@ -139,7 +139,6 @@ .groups_list { float: left; - background: #ffffff; width: 100%; } @@ -178,6 +177,17 @@ margin-bottom: 10px; } +.groups_list ul { + list-style: none; + padding-left: 0px; + margin: 0px; +} + +.groups_list li { + display: block; + padding: 5px 10px 5px 10px; +} + .other { float: left; margin-bottom: 3px; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-25 18:33:23
|
Revision: 251 http://isocial.svn.sourceforge.net/isocial/?rev=251&view=rev Author: dim0s77 Date: 2008-06-25 11:33:10 -0700 (Wed, 25 Jun 2008) Log Message: ----------- added rus translate of subgroup names Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/installers/groupapp/russian_installer.php app/views/groupapp/group/browse.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-25 16:35:09 UTC (rev 250) +++ app/controllers/groupapp/group_controller.php 2008-06-25 18:33:10 UTC (rev 251) @@ -251,26 +251,21 @@ function browse () { $all_groups = $this->GroupappGroup->find('all'); - $this->all_groups_count = count($all_groups); - if (!empty($this->params['g'])) { - $all_group_types = $this->GroupappGroupType->find('all'); + if (!($this->all_groups_count = count($all_groups))) { return; } + $all_group_types = $this->GroupappGroupType->find('all'); + if ($all_group_types) { foreach($all_group_types as $group_type) { + $gt = array("id" => $group_type->id, "parent_id" => $group_type->parent_id, "name" => $group_type->get('name')); if ($group_type->parent_id == 0) { - $gt = array("id" => $group_type->id, "name" => $group_type->get('name')); $this->group_types[] = $gt; - } else if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) { - $this->subgroup_types[] = $group_type; - } - } - } else { - $all_group_types = $this->GroupappGroupType->find('all'); - $this->group_types = array(); - foreach($all_group_types as $group_type) { - if ($group_type->parent_id == 0) { - $gt = array("name" => $group_type->get('name'), "id" => $group_type->id); - $this->group_types[] = $gt; + } else if (!empty($this->params['g'])) { + if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) { + $this->subgroup_types[] = $gt; + if (isset($this->params['sg']) && is_numeric($this->params['sg'])) { + $this->subgroup = $this->params['sg']; + } + } } else if ($group_type->parent_id == 1) { - $gt = array("id" => $group_type->id, "name" => $group_type->get('name')); $this->subgroup_types[] = $gt; } } Modified: app/installers/groupapp/russian_installer.php =================================================================== --- app/installers/groupapp/russian_installer.php 2008-06-25 16:35:09 UTC (rev 250) +++ app/installers/groupapp/russian_installer.php 2008-06-25 18:33:10 UTC (rev 251) @@ -18,6 +18,166 @@ $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Отдых и Спорт' WHERE id = 10"); $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Студенческие группы' WHERE id = 11"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Предприятия' WHERE id = 101"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Группы потребителей' WHERE id = 102"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Служба и работа' WHERE id = 103"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 104"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Домашний бизнес' WHERE id = 105"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Инвестиции' WHERE id = 106"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Маркетинг и реклама' WHERE id = 107"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Связи с общественностью' WHERE id = 108"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Недвижимость' WHERE id = 109"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Активный отдых' WHERE id = 201"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Возраст' WHERE id = 202"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Красота' WHERE id = 203"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Доверие и благотворительность' WHERE id = 204"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Актуальные события' WHERE id = 205"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Знакомства и взаимоотношения' WHERE id = 206"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Семья' WHERE id = 207"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Продовольствие и напитки' WHERE id = 208"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Друзья' WHERE id = 209"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Садоводство' WHERE id = 210"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Здоровье и благополучие' WHERE id = 211"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='История' WHERE id = 212"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Хобби и ремесла' WHERE id = 213"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Языки' WHERE id = 214"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Домашние животные и звери' WHERE id = 215"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Философия' WHERE id = 216"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Политика' WHERE id = 217"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Религия и духовность' WHERE id = 218"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Наука' WHERE id = 219"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Самопомощь' WHERE id = 220"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Сексуальность' WHERE id = 221"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Путешествия' WHERE id = 222"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Вино' WHERE id = 223"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Книги и литература' WHERE id = 301"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Знаменитости' WHERE id = 302"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Комиксы и анимация' WHERE id = 303"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Танцы' WHERE id = 304"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Мода' WHERE id = 305"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Изобразительное искусство' WHERE id = 306"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 307"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Юмор' WHERE id = 308"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Кино' WHERE id = 309"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Ночная жизнь' WHERE id = 310"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Online-медия' WHERE id = 311"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Performing Arts' WHERE id = 312"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Радио' WHERE id = 313"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Телевидение' WHERE id = 314"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Театр' WHERE id = 315"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Города' WHERE id = 401"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Страны' WHERE id = 402"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 403"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Соседи' WHERE id = 404"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Места' WHERE id = 405"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Области' WHERE id = 406"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Дороги и транспорт' WHERE id = 407"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Государства' WHERE id = 408"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Компьютеры и комплектующие' WHERE id = 501"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Киберкультура' WHERE id = 502"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Гаджеты' WHERE id = 503"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Игры' WHERE id = 504"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 505"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Языки программирования' WHERE id = 506"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Мобильные устройства' WHERE id = 507"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Мультимедиа' WHERE id = 508"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Новости' WHERE id = 509"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Программное обеспечение' WHERE id = 510"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Сайты' WHERE id = 511"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Классика PROJECT_NAME' WHERE id = 601"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Фан-клубы' WHERE id = 602"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Шутки' WHERE id = 603"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Иностранные утверждения' WHERE id = 604"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Слишком много информации' WHERE id = 605"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Сплошной бред' WHERE id = 606"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Флуд' WHERE id = 607"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Блюз' WHERE id = 701"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Классика' WHERE id = 702"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Кантри' WHERE id = 703"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Танцевальная' WHERE id = 704"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Электронная' WHERE id = 705"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Фольклор' WHERE id = 706"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 707"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Инди' WHERE id = 708"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Инструментальная' WHERE id = 709"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Интернациональная' WHERE id = 710"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Джаз' WHERE id = 711"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Латино' WHERE id = 712"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Живая музыка' WHERE id = 713"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Металл' WHERE id = 714"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='R&B и Soul' WHERE id = 715"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Рэп и Хип-Хоп' WHERE id = 716"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Рэгги' WHERE id = 717"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Религиозная' WHERE id = 718"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Рок' WHERE id = 719"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Звукозапись' WHERE id = 720"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Академические организации' WHERE id = 801"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Правозащитные организации' WHERE id = 802"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Клубы и общества' WHERE id = 803"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общественные организации' WHERE id = 804"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 805"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Некомерческие организации' WHERE id = 806"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Благотворительные организации' WHERE id = 807"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Политические организации' WHERE id = 808"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Профессиональные организации' WHERE id = 809"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Религиозные организации' WHERE id = 810"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Волонтерские организации' WHERE id = 811"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Рекламное' WHERE id = 901"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Автомобили и Рэйсинг' WHERE id = 1001"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Группы поддержки' WHERE id = 1002"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Коллежский спорт' WHERE id = 1003"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Танцы' WHERE id = 1004"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Экстремальный спорт' WHERE id = 1005"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Фэнтези спорт' WHERE id = 1006"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Фитнесс и физкультура' WHERE id = 1007"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Изартные игры' WHERE id = 1008"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Игры' WHERE id = 1009"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общий спорт' WHERE id = 1010"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Университетский спорт' WHERE id = 1011"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Интернациональный спорт' WHERE id = 1012"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Спорт в помещении' WHERE id = 1013"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Боевые искусства' WHERE id = 1014"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Олимпийский спорт' WHERE id = 1015"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Спорт на отрытом воздухе' WHERE id = 1016"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Профессиональный спорт' WHERE id = 1017"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Развлекательный спорт' WHERE id = 1018"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Спортивные лиги' WHERE id = 1019"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Водный спорт' WHERE id = 1020"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Тяжелая атлетика и бодибилдинг' WHERE id = 1021"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Зимний спорт' WHERE id = 1022"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Йога' WHERE id = 1023"); + + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Заграничные/иностранные группы' WHERE id = 1101"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Академические группы' WHERE id = 1102"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Консультационные группы' WHERE id = 1103"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Выпускные группы' WHERE id = 1104"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Классы и факультеты' WHERE id = 1105"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Клубы и общества' WHERE id = 1106"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Сообщества' WHERE id = 1107"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Творческие группы' WHERE id = 1108"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общежития и резиденции' WHERE id = 1109"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Этнические/культурные группы' WHERE id = 1110"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Содружества и соратничества' WHERE id = 1111"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Общее' WHERE id = 1112"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Журналистские группы' WHERE id = 1113"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Музыкальные группы' WHERE id = 1114"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Политические группы' WHERE id = 1115"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Полупрофессиональные группы' WHERE id = 1116"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Религиозные группы' WHERE id = 1117"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Группы по оказанию услуг' WHERE id = 1118"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Социальные группы' WHERE id = 1119"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Студенческое управление' WHERE id = 1120"); + $this->execute("UPDATE groupapp_group_types set {$locale}_name ='Студенческие группы' WHERE id = 1121"); + $this->execute("ALTER TABLE groupapp_member_roles ADD COLUMN {$locale}_name char(100) NOT NULL AFTER en_name"); $this->execute("UPDATE groupapp_member_roles set {$locale}_name ='Владелец' WHERE id = 1"); $this->execute("UPDATE groupapp_member_roles set {$locale}_name ='Администратор' WHERE id = 2"); Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-25 16:35:09 UTC (rev 250) +++ app/views/groupapp/group/browse.tpl 2008-06-25 18:33:10 UTC (rev 251) @@ -2,14 +2,24 @@ {?all_groups_count} <div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div> + <div class="two_column"> <div class="right_small"> <div class="right_content"> <ul class="actions_list"> {loop group_types} - <li><a href="#">{group_type-name}</a></li> + <li><a href="/groupapp/group/browse?g={group_type-id?}">{group_type-name}</a></li> {end} </ul> + <ul> + {loop subgroup_types} + <? if (isset($subgroup) && $subgroup == $subgroup_type["id"]) { ?> + <li><b>{subgroup_type-name?}</b></li> + <? } else { ?> + <li><a href="/groupapp/group/browse?g={subgroup_type-parent_id?}&sg={subgroup_type-id?}">{subgroup_type-name?}</a></li> + <? } ?> + {end} + </ul> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-25 16:35:03
|
Revision: 250 http://isocial.svn.sourceforge.net/isocial/?rev=250&view=rev Author: dim0s77 Date: 2008-06-25 09:35:09 -0700 (Wed, 25 Jun 2008) Log Message: ----------- hot fixes Modified Paths: -------------- app/controllers/groupapp/group_controller.php Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-25 16:23:46 UTC (rev 249) +++ app/controllers/groupapp/group_controller.php 2008-06-25 16:35:09 UTC (rev 250) @@ -121,7 +121,7 @@ $this->admins_count = 0; $this->moderators_count = 0; $this->members_count = 0; - if ($members) { + if ($this->members) { foreach ($this->members as $member) { if ($member->groupapp_member_role_id == 1) $this->owners_count++; elseif ($member->groupapp_member_role_id == 2) $this->admins_count++; @@ -198,7 +198,7 @@ $this->is_member = false; $this->is_guest = true; $current_user_id = $this->current_user->getId(); - if ($members) { + if ($this->members) { $this->members_count = count($this->members); foreach ($this->members as $member) { if ($member->groupapp_member_role_id < 3) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-25 16:23:39
|
Revision: 249 http://isocial.svn.sourceforge.net/isocial/?rev=249&view=rev Author: dim0s77 Date: 2008-06-25 09:23:46 -0700 (Wed, 25 Jun 2008) Log Message: ----------- remove DB triggers. Stabled group's work Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/helpers/auto_complete_helper.php app/installers/groupapp/group_installer.php app/locales/groupapp/group/ru.php app/models/groupapp_member.php app/views/groupapp/group/browse.tpl app/views/groupapp/group/customize.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-24 17:45:34 UTC (rev 248) +++ app/controllers/groupapp/group_controller.php 2008-06-25 16:23:46 UTC (rev 249) @@ -14,17 +14,21 @@ $this->is_guest = true; if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - if ($this->group = $this->GroupappGroup->findFirst(array( 'id = ?' => $this->params['id'] ))) { - $members = $this->_getGroupMembers($this->group); + $group = $this->GroupappGroup->find( $this->params['id'] ); + if (isset($group) && $group) { + $this->group = $group; + $members = $this->_getGroupMembers($this->group->getId()); $current_user_id = $this->current_user->getId(); - foreach ($members as $member) { - if ($member->groupapp_member_role_id < 3 && $current_user_id == $member->getId()) { - $this->is_admin = true; + if ($members) { + foreach ($members as $member) { + if ($member->groupapp_member_role_id < 3 && $current_user_id == $member->getId()) { + $this->is_admin = true; + } + if ($current_user_id == $member->getId()) { + $this->is_member = true; + $this->is_guest = false; + } } - if ($current_user_id == $member->getId()) { - $this->is_member = true; - $this->is_guest = false; - } } } } @@ -46,6 +50,7 @@ $this->step = 'group_info'; if (!empty($this->params['group'])){ $this->GroupappGroup->setAttributes($this->params['group']); + $this->GroupappGroup->members_count = 1; if ($this->Request->isPost() && $this->GroupappGroup->save()){ $owner = $this->GroupappMemberRole->find(1); $group_member = $this->GroupappGroup->group_member->build(); @@ -54,10 +59,11 @@ if ($group_member->save()) { $this->step = 'group_customize'; $this->redirectTo(array('action' => 'customize', 'id' => $this->GroupappGroup->getId())); + } else { + $this->GroupappGroup->destroy(); } - } else { - $this->importErrors( $this->GroupappGroup->getErrors() ); } + $this->importErrors( $this->GroupappGroup->getErrors() ); } } @@ -109,18 +115,22 @@ if ($this->Request->isPost() && $this->GroupappGroup->save()){ return; } - } else if ($this->group) { - $this->members = $this->_getGroupMembers($this->group); + } else if (isset($this->group)) { + $this->members = $this->_getGroupMembers($this->group->getId()); $this->owners_count = 0; $this->admins_count = 0; $this->moderators_count = 0; $this->members_count = 0; - foreach ($this->members as $member) { - if ($member->groupapp_member_role_id == 1) $this->owners_count++; - elseif ($member->groupapp_member_role_id == 2) $this->admins_count++; - elseif ($member->groupapp_member_role_id == 3) $this->moderators_count++; - elseif ($member->groupapp_member_role_id == 4) $this->members_count++; + if ($members) { + foreach ($this->members as $member) { + if ($member->groupapp_member_role_id == 1) $this->owners_count++; + elseif ($member->groupapp_member_role_id == 2) $this->admins_count++; + elseif ($member->groupapp_member_role_id == 3) $this->moderators_count++; + elseif ($member->groupapp_member_role_id == 4) $this->members_count++; + } } + } else { + $this->redirectTo(array('action' => 'index')); } $this->importErrors( $this->GroupappGroup->getErrors() ); } @@ -130,11 +140,22 @@ !empty($this->params['groupapp_member_role_id']) && !empty($this->params['list_id'])) { $this->group = $this->GroupappGroup->find($this->params['groupapp_group_id']); - $this->GroupappMember->destroyAll("id = " . $this->params['member_id']); - $members = $this->_getGroupMembers(); + if (!$this->group) { return; } + $this->group->members_count -= 1; + if (!$this->group->save()) { return; } + if (!$this->GroupappMember->destroy($this->params['member_id'])) { + $this->group->members_count += 1; + $this->group->save(); + $this->importErrors( $this->GroupappMember->getErrors() ); + return; + }; + + $members = $this->_getGroupMembers($this->group->getId()); $members_count = 0; - foreach ($members as $member) { - if ($member->groupapp_member_role_id == $this->params['groupapp_member_role_id']) { $members_count++; } + if ($members) { + foreach ($members as $member) { + if ($member->groupapp_member_role_id == $this->params['groupapp_member_role_id']) { $members_count++; } + } } $members_group_name = ''; $empty_message = ''; @@ -163,33 +184,37 @@ } } - function _getGroupMembers () { + function _getGroupMembers ($group_id) { return $this->GroupappMember->find('all', array('conditions' => array("groupapp_group_id = ?", - $this->group->getId()), + $group_id), 'include' => 'user')); } function show_group () { if (isset($this->group)) { - $this->members = $this->_getGroupMembers($this->group); - $this->members_count = count($this->members); + $this->members = $this->_getGroupMembers($this->group->getId()); $this->admins = array(); $this->is_admin = false; $this->is_member = false; $this->is_guest = true; $current_user_id = $this->current_user->getId(); - foreach ($this->members as $member) { - if ($member->groupapp_member_role_id < 3) { - $member->role->load(); - $this->admins[] = $member; + if ($members) { + $this->members_count = count($this->members); + foreach ($this->members as $member) { + if ($member->groupapp_member_role_id < 3) { + $member->role->load(); + $this->admins[] = $member; + if ($current_user_id == $member->getId()) { + $this->is_admin = true; + } + } if ($current_user_id == $member->getId()) { - $this->is_admin = true; + $this->is_member = true; + $this->is_guest = false; } } - if ($current_user_id == $member->getId()) { - $this->is_member = true; - $this->is_guest = false; - } + } else { + $this->members_count = 0; } $this->group_type = $this->group->group_type->load()->get('name'); $messages = $this->GroupappMessage->find('all', @@ -225,9 +250,30 @@ } function browse () { + $all_groups = $this->GroupappGroup->find('all'); + $this->all_groups_count = count($all_groups); if (!empty($this->params['g'])) { - $this->group_types = $this->GroupappGroupType->find('all', array('conditions' => array("parent_id = 0"))); + $all_group_types = $this->GroupappGroupType->find('all'); + foreach($all_group_types as $group_type) { + if ($group_type->parent_id == 0) { + $gt = array("id" => $group_type->id, "name" => $group_type->get('name')); + $this->group_types[] = $gt; + } else if (is_numeric($this->params['g']) && $group_type->parent_id == $this->params['g']) { + $this->subgroup_types[] = $group_type; + } + } } else { + $all_group_types = $this->GroupappGroupType->find('all'); + $this->group_types = array(); + foreach($all_group_types as $group_type) { + if ($group_type->parent_id == 0) { + $gt = array("name" => $group_type->get('name'), "id" => $group_type->id); + $this->group_types[] = $gt; + } else if ($group_type->parent_id == 1) { + $gt = array("id" => $group_type->id, "name" => $group_type->get('name')); + $this->subgroup_types[] = $gt; + } + } } } Modified: app/helpers/auto_complete_helper.php =================================================================== --- app/helpers/auto_complete_helper.php 2008-06-24 17:45:34 UTC (rev 248) +++ app/helpers/auto_complete_helper.php 2008-06-25 16:23:46 UTC (rev 249) @@ -53,22 +53,22 @@ $this->value = ''; if ($this->object) { - $id = $this->object->get($method); - if ($id) { - $model = @$completion_options['model']; - if (!$model) { - foreach ($this->object->getAssociated('belongsTo') as $name => $association) { - if ($association->getAssociationOption('primary_key_name') == $method) { - $model = $association; - break; - } - } - } - $dep = $model->find($id); - if (!empty($dep)) { + $id = $this->object->get($method); + if ($id) { + $model = @$completion_options['model']; + if (!$model) { + foreach ($this->object->getAssociated('belongsTo') as $name => $association) { + if ($association->getAssociationOption('primary_key_name') == $method) { + $model = $association; + break; + } + } + } + $dep = $model->find($id); + if (!empty($dep)) { $this->value = $dep->name; - } - } + } + } } $tag_options = array_merge(array( Modified: app/installers/groupapp/group_installer.php =================================================================== --- app/installers/groupapp/group_installer.php 2008-06-24 17:45:34 UTC (rev 248) +++ app/installers/groupapp/group_installer.php 2008-06-25 16:23:46 UTC (rev 249) @@ -233,20 +233,6 @@ ) ENGINE=InnoDB"); $this->execute( - "CREATE TRIGGER gapp_group_insert AFTER INSERT ON groupapp_members - FOR EACH ROW BEGIN - UPDATE `groupapp_groups` SET members_count = members_count + 1 WHERE id = NEW.groupapp_group_id; - END; - "); - - $this->execute( - "CREATE TRIGGER gapp_group_delete AFTER DELETE ON groupapp_members - FOR EACH ROW BEGIN - UPDATE `groupapp_groups` SET members_count = members_count - 1 WHERE id = OLD.groupapp_group_id; - END; - "); - - $this->execute( "CREATE TABLE `groupapp_messages` ( `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, `groupapp_group_id` int(11) NOT NULL DEFAULT '0', Modified: app/locales/groupapp/group/ru.php =================================================================== --- app/locales/groupapp/group/ru.php 2008-06-24 17:45:34 UTC (rev 248) +++ app/locales/groupapp/group/ru.php 2008-06-25 16:23:46 UTC (rev 249) @@ -63,7 +63,7 @@ $dictionary['Group type is missing'] = 'Тип группы отсутствует'; $dictionary['please enter the group category'] = 'выберите, пожалуйста, категорию группы'; -$dictionary['Edit'] = 'Редактирование'; +$dictionary['Edit group'] = 'Редактирование группы'; $dictionary['Website'] = 'Адрес сайта'; $dictionary['Options'] = 'Настройки'; $dictionary['Show related groups'] = 'Показывать похожие группы'; Modified: app/models/groupapp_member.php =================================================================== --- app/models/groupapp_member.php 2008-06-24 17:45:34 UTC (rev 248) +++ app/models/groupapp_member.php 2008-06-25 16:23:46 UTC (rev 249) @@ -12,6 +12,7 @@ var $has_many = array( 'messages' => array('class_name' => 'GroupappMessage', 'foreign_key' => 'user_id') ); + } ?> Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-24 17:45:34 UTC (rev 248) +++ app/views/groupapp/group/browse.tpl 2008-06-25 16:23:46 UTC (rev 249) @@ -1,17 +1,20 @@ <?= $controller->renderPartial("menu") ?> -{?groups} - +{?all_groups_count} +<div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div> <div class="two_column"> <div class="right_small"> <div class="right_content"> - blablabla + <ul class="actions_list"> + {loop group_types} + <li><a href="#">{group_type-name}</a></li> + {end} + </ul> </div> </div> <div class="left_big"> <div class="groups_list"> - <div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div> <div class="container"> {loop user_groups} Modified: app/views/groupapp/group/customize.tpl =================================================================== --- app/views/groupapp/group/customize.tpl 2008-06-24 17:45:34 UTC (rev 248) +++ app/views/groupapp/group/customize.tpl 2008-06-25 16:23:46 UTC (rev 249) @@ -2,7 +2,7 @@ <div class="title_bar"> <div class="head"> - <div class="name groupapp">_{Edit} {group.name?}</div> + <div class="name groupapp">_{Edit group} '{group.name?}'</div> </div> </div> <div class="clearfix"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-24 17:45:25
|
Revision: 248 http://isocial.svn.sourceforge.net/isocial/?rev=248&view=rev Author: dim0s77 Date: 2008-06-24 10:45:34 -0700 (Tue, 24 Jun 2008) Log Message: ----------- minor changes Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/locales/groupapp/group/ru.php app/views/groupapp/group/browse.tpl app/views/groupapp/group/help.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-24 16:27:00 UTC (rev 247) +++ app/controllers/groupapp/group_controller.php 2008-06-24 17:45:34 UTC (rev 248) @@ -225,6 +225,10 @@ } function browse () { + if (!empty($this->params['g'])) { + $this->group_types = $this->GroupappGroupType->find('all', array('conditions' => array("parent_id = 0"))); + } else { + } } function show_board () { Modified: app/locales/groupapp/group/ru.php =================================================================== --- app/locales/groupapp/group/ru.php 2008-06-24 16:27:00 UTC (rev 247) +++ app/locales/groupapp/group/ru.php 2008-06-24 17:45:34 UTC (rev 248) @@ -140,4 +140,7 @@ $dictionary['Invite People to Join'] = 'Пригласить людей присоединиться'; $dictionary['Leave Group'] = 'Покинуть группу'; +$dictionary['Groups are not found'] = 'Ни одной группы не найдено'; +$dictionary['Create first group'] = 'Создать первую группу'; + ?> Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-24 16:27:00 UTC (rev 247) +++ app/views/groupapp/group/browse.tpl 2008-06-24 17:45:34 UTC (rev 248) @@ -1 +1,55 @@ <?= $controller->renderPartial("menu") ?> + +{?groups} + +<div class="two_column"> + <div class="right_small"> + <div class="right_content"> + blablabla + </div> + </div> + + <div class="left_big"> + <div class="groups_list"> + <div class="info">_{You are in groups}: <? if (isset($user_groups)) echo count($user_groups); else echo 0; ?></div> + + <div class="container"> + {loop user_groups} + <div class="row"> + + <div class="actions"> + <ul class="actions_list"> + <li><a href="/groupapp/group/edit_info/{user_group.id?}">_{Edit Group}</a></li> + <li><a href="#">_{Leave Group}</a></li> + </ul> + </div> + + <div class="avatar"> + <a href="/groupapp/group/show_group/{user_group.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> + </div> + + <div class="info"> + <div class="name"><a href="/groupapp/group/show_group/{user_group.id?}">{user_group.name}</a></div> + <div class="other param">_{Members count}:</div> + <div class="other value">{user_group.members_count}</div> + <div class="clearfix"></div> + <div class="other param">_{Type}:</div> + <div class="other value"><? $id = $user_group->type_id; echo $gt[$id]; ?></div> + <div class="clearfix"></div> + </div> + + <div class="clearfix"></div> + </div> + {end} + </div> + + </div> + </div> + +</div> +{else} +<div class="nogroups"> + _{Groups are not found}. <a href="/groupapp/group/create">_{Create first group}!</a> +</div> +{end} +<div class="clearfix"></div> Modified: app/views/groupapp/group/help.tpl =================================================================== --- app/views/groupapp/group/help.tpl 2008-06-24 16:27:00 UTC (rev 247) +++ app/views/groupapp/group/help.tpl 2008-06-24 17:45:34 UTC (rev 248) @@ -1 +1,2 @@ +<?= $controller->renderPartial("menu") ?> Group Help \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-24 16:27:15
|
Revision: 247 http://isocial.svn.sourceforge.net/isocial/?rev=247&view=rev Author: dim0s77 Date: 2008-06-24 09:27:00 -0700 (Tue, 24 Jun 2008) Log Message: ----------- Added subgroups Modified Paths: -------------- app/installers/groupapp/group_installer.php Modified: app/installers/groupapp/group_installer.php =================================================================== --- app/installers/groupapp/group_installer.php 2008-06-24 14:58:01 UTC (rev 246) +++ app/installers/groupapp/group_installer.php 2008-06-24 16:27:00 UTC (rev 247) @@ -24,6 +24,166 @@ $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (10, 0, 'Sports & Recreation')"); $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (11, 0, 'Student Group')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (101, 1, 'Companies')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (102, 1, 'Consumer Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (103, 1, 'Employment & Work')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (104, 1, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (105, 1, 'Home Business')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (106, 1, 'Investing')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (107, 1, 'Marketing & Advertising')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (108, 1, 'Public Relations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (109, 1, 'Real Estate')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (201, 2, 'Activities')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (202, 2, 'Age')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (203, 2, 'Beauty')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (204, 2, 'Beliefs & Causes')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (205, 2, 'Current Events')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (206, 2, 'Dating & Relationships')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (207, 2, 'Families')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (208, 2, 'Food & Drink')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (209, 2, 'Friends')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (210, 2, 'Gardening')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (211, 2, 'Health & Wellness')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (212, 2, 'History')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (213, 2, 'Hobbies & Crafts')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (214, 2, 'Languages')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (215, 2, 'Pets & Animals')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (216, 2, 'Philosophy')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (217, 2, 'Politics')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (218, 2, 'Religion & Spirituality')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (219, 2, 'Science')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (220, 2, 'Self-help')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (221, 2, 'Sexuality')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (222, 2, 'Travel')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (223, 2, 'Wine')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (301, 3, 'Books & Literature')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (302, 3, 'Celebrities')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (303, 3, 'Comics & Animation')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (304, 3, 'Dance')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (305, 3, 'Fashion')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (306, 3, 'Fine Arts')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (307, 3, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (308, 3, 'Humor')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (309, 3, 'Movies')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (310, 3, 'Nightlife')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (311, 3, 'Online Media')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (312, 3, 'Performing Arts')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (313, 3, 'Radio')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (314, 3, 'Television')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (315, 3, 'Theater')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (401, 4, 'Cities')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (402, 4, 'Countries')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (403, 4, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (404, 4, 'Neighborhoods')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (405, 4, 'Places')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (406, 4, 'Regions')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (407, 4, 'Ridesharing & Transportation')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (408, 4, 'States')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (501, 5, 'Computers & Hardware')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (502, 5, 'Cyberculture')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (503, 5, 'Gadgets')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (504, 5, 'Gaming')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (505, 5, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (506, 5, 'Languages & Formats')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (507, 5, 'Mobile')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (508, 5, 'Multimedia')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (509, 5, 'News')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (510, 5, 'Software')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (511, 5, 'Websites')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (601, 6, 'PROJECT_NAME Classics')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (602, 6, 'Fan Clubs')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (603, 6, 'Inside Jokes')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (604, 6, 'Outlandish Statements')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (605, 6, 'Too Much Information')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (606, 6, 'Totally Pointless')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (607, 6, 'Totally Random')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (701, 7, 'Blues')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (702, 7, 'Classical')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (703, 7, 'Country')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (704, 7, 'Dance')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (705, 7, 'Electronic')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (706, 7, 'Folk')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (707, 7, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (708, 7, 'Indie')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (709, 7, 'Instruments')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (710, 7, 'International')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (711, 7, 'Jazz')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (712, 7, 'Latin')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (713, 7, 'Live Music')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (714, 7, 'Metal')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (715, 7, 'R&B & Soul')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (716, 7, 'Rap & Hip Hop')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (717, 7, 'Reggae')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (718, 7, 'Religious')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (719, 7, 'Rock')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (720, 7, 'Songwriting')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (801, 8, 'Academic Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (802, 8, 'Advocacy Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (803, 8, 'Clubs & Societies')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (804, 8, 'Community Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (805, 8, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (806, 8, 'Non-Profit Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (807, 8, 'Philanthropic Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (808, 8, 'Political Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (809, 8, 'Professional Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (810, 8, 'Religious Organizations')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (811, 8, 'Volunteer Organizations')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (901, 9, 'Sponsored')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1001, 10, 'Automotive & Racing')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1002, 10, 'Cheerleading')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1003, 10, 'College Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1004, 10, 'Dance')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1005, 10, 'Extreme Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1006, 10, 'Fantasy Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1007, 10, 'Fitness & Exercise')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1008, 10, 'Gambling')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1009, 10, 'Games')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1010, 10, 'General Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1011, 10, 'High School Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1012, 10, 'International Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1013, 10, 'Intramural Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1014, 10, 'Martial Arts')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1015, 10, 'Olympic Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1016, 10, 'Outdoor Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1017, 10, 'Professional Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1018, 10, 'Recreational Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1019, 10, 'Sports Leagues')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1020, 10, 'Water Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1021, 10, 'Weightlifting & Bodybuilding')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1022, 10, 'Winter Sports')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1023, 10, 'Yoga')"); + + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1101, 11, 'Abroad/Overseas Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1102, 11, 'Academic Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1103, 11, 'Advising Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1104, 11, 'Alumni Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1105, 11, 'Classes & Departments')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1106, 11, 'Clubs & Societies')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1107, 11, 'Community Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1108, 11, 'Creative Arts Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1109, 11, 'Dorms & Residences')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1110, 11, 'Ethnic/Cultural Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1111, 11, 'Fraternities & Sororities')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1112, 11, 'General')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1113, 11, 'Media/Publication Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1114, 11, 'Musical Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1115, 11, 'Political Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1116, 11, 'Pre-Professional Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1117, 11, 'Religious Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1118, 11, 'Service Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1119, 11, 'Social Groups')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1120, 11, 'Student Government')"); + $this->execute("INSERT INTO `groupapp_group_types` (id, parent_id, en_name) VALUES (1121, 11, 'Study Groups')"); + $this->execute( "CREATE TABLE `groupapp_groups` ( `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-24 14:57:56
|
Revision: 246 http://isocial.svn.sourceforge.net/isocial/?rev=246&view=rev Author: dim0s77 Date: 2008-06-24 07:58:01 -0700 (Tue, 24 Jun 2008) Log Message: ----------- popular groups tab utilized, since will show popular group in browse tab Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/views/groupapp/group/_menu.tpl app/views/groupapp/group/browse.tpl Removed Paths: ------------- app/views/groupapp/group/popular.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-24 14:27:06 UTC (rev 245) +++ app/controllers/groupapp/group_controller.php 2008-06-24 14:58:01 UTC (rev 246) @@ -227,9 +227,6 @@ function browse () { } - function popular () { - } - function show_board () { } Modified: app/views/groupapp/group/_menu.tpl =================================================================== --- app/views/groupapp/group/_menu.tpl 2008-06-24 14:27:06 UTC (rev 245) +++ app/views/groupapp/group/_menu.tpl 2008-06-24 14:58:01 UTC (rev 246) @@ -3,7 +3,6 @@ <ul class="toggle_tabs"> <li class="first"><a href="/groupapp" class="<?= $controller->getActionName() == 'index' ? 'selected' : '' ?>">_{My Groups}</a></li><? ?><li><a href="/groupapp/group/browse" class="last <?= $controller->getActionName() == 'browse' ? 'selected' : '' ?>">_{Browse Groups}</a></li><? - ?><li><a href="/groupapp/group/popular" class="<?= $controller->getActionName() == 'popular' ? 'selected' : '' ?>">_{Popular Groups}</a></li><? ?><li><a href="/groupapp/group/create" class="last <?= $controller->getActionName() == 'create' ? 'selected' : '' ?>">_{Create Group}</a></li> </ul> </div> Modified: app/views/groupapp/group/browse.tpl =================================================================== --- app/views/groupapp/group/browse.tpl 2008-06-24 14:27:06 UTC (rev 245) +++ app/views/groupapp/group/browse.tpl 2008-06-24 14:58:01 UTC (rev 246) @@ -1 +1 @@ -Browse Groups \ No newline at end of file +<?= $controller->renderPartial("menu") ?> Deleted: app/views/groupapp/group/popular.tpl =================================================================== --- app/views/groupapp/group/popular.tpl 2008-06-24 14:27:06 UTC (rev 245) +++ app/views/groupapp/group/popular.tpl 2008-06-24 14:58:01 UTC (rev 246) @@ -1 +0,0 @@ -Popular Groups \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-24 14:27:12
|
Revision: 245 http://isocial.svn.sourceforge.net/isocial/?rev=245&view=rev Author: dim0s77 Date: 2008-06-24 07:27:06 -0700 (Tue, 24 Jun 2008) Log Message: ----------- cosmetic changes. fixed minor bugZ Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/locales/groupapp/board/ru.php app/locales/groupapp/group/ru.php app/views/groupapp/board/_head.tpl app/views/groupapp/board/index.tpl app/views/groupapp/group/_editbar.tpl app/views/groupapp/group/edit_members.tpl app/views/groupapp/group/index.tpl app/views/groupapp/group/show_group.tpl public/stylesheets/common/Application.css public/stylesheets/groupapp/Board.css Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-20 15:13:32 UTC (rev 244) +++ app/controllers/groupapp/group_controller.php 2008-06-24 14:27:06 UTC (rev 245) @@ -14,18 +14,18 @@ $this->is_guest = true; if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - $this->group = $this->GroupappGroup->findFirst(array( 'id = ?' => $this->params['id'] )); - // $this->group = $this->GroupappGroup->find($this->params['id']); - $members = $this->_getGroupMembers($this->group); - $current_user_id = $this->current_user->getId(); - foreach ($members as $member) { - if ($member->groupapp_member_role_id < 3 && $current_user_id == $member->getId()) { - $this->is_admin = true; + if ($this->group = $this->GroupappGroup->findFirst(array( 'id = ?' => $this->params['id'] ))) { + $members = $this->_getGroupMembers($this->group); + $current_user_id = $this->current_user->getId(); + foreach ($members as $member) { + if ($member->groupapp_member_role_id < 3 && $current_user_id == $member->getId()) { + $this->is_admin = true; + } + if ($current_user_id == $member->getId()) { + $this->is_member = true; + $this->is_guest = false; + } } - if ($current_user_id == $member->getId()) { - $this->is_member = true; - $this->is_guest = false; - } } } } @@ -62,26 +62,34 @@ } function customize () { - $this->step = 'group_customize'; - if (!empty($this->params['group']) && $this->group){ - $this->group->setAttributes($this->params['group']); - if ($this->Request->isPost() && $this->group->save()) { - $this->step = 'group_members'; - $this->redirectTo(array('action' => 'edit_members', 'id' => $this->group->getId())); - return; + if (isset($this->group)) { + $this->step = 'group_customize'; + if (!empty($this->params['group'])){ + $this->group->setAttributes($this->params['group']); + if ($this->Request->isPost() && $this->group->save()) { + $this->step = 'group_members'; + $this->redirectTo(array('action' => 'edit_members', 'id' => $this->group->getId())); + return; + } } + $this->importErrors( $this->GroupappGroup->getErrors() ); + } else { + $this->redirectTo(array('action' => 'index')); } - $this->importErrors( $this->GroupappGroup->getErrors() ); } function edit_group () { - if (!empty($this->params['group']) && $this->group){ - $this->group->setAttributes($this->params['group']); - if ($this->Request->isPost() && $this->group->save()) { - return; + if (isset($this->group)) { + if (!empty($this->params['group'])){ + $this->group->setAttributes($this->params['group']); + if ($this->Request->isPost() && $this->group->save()) { + return; + } } + $this->importErrors( $this->GroupappGroup->getErrors() ); + } else { + $this->redirectTo(array('action' => 'index')); } - $this->importErrors( $this->GroupappGroup->getErrors() ); } function edit_info () { @@ -162,7 +170,7 @@ } function show_group () { - if ($this->group) { + if (isset($this->group)) { $this->members = $this->_getGroupMembers($this->group); $this->members_count = count($this->members); $this->admins = array(); @@ -196,12 +204,12 @@ if (!isset($topics[$message->topic_id])) { $topics[$message->topic_id]['first'] = $message; } - isset($topics[$message->topic_id]['posts']) ? + 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']) ? + isset($topics[$message->topic_id]['persons']) ? $topics[$message->topic_id]['persons']++ : $topics[$message->topic_id]['persons'] = 1; } @@ -211,6 +219,8 @@ } $this->topics = $topics; $this->topics_count = count($this->topics); + } else { + $this->redirectTo(array('action' => 'index')); } } Modified: app/locales/groupapp/board/ru.php =================================================================== --- app/locales/groupapp/board/ru.php 2008-06-20 15:13:32 UTC (rev 244) +++ app/locales/groupapp/board/ru.php 2008-06-24 14:27:06 UTC (rev 245) @@ -3,6 +3,7 @@ // File created on: 2008-03-20 10:58:51 $dictionary = array(); +$dictionary['Group'] = 'Группа'; $dictionary['Discussions'] = 'Обсуждения'; $dictionary['Back to group'] = 'Обратно в группу'; $dictionary['Discussion Board'] = 'Список обсуждений'; Modified: app/locales/groupapp/group/ru.php =================================================================== --- app/locales/groupapp/group/ru.php 2008-06-20 15:13:32 UTC (rev 244) +++ app/locales/groupapp/group/ru.php 2008-06-24 14:27:06 UTC (rev 245) @@ -4,6 +4,7 @@ $dictionary = array(); $dictionary['Groups'] = 'Группы'; +$dictionary['Group'] = 'Группа'; $dictionary['My Groups'] = 'Мои группы'; $dictionary['Browse Groups'] = 'Поиск групп'; $dictionary['Popular Groups'] = 'Популярные группы'; @@ -21,6 +22,11 @@ $dictionary['persons'] = 'участников'; $dictionary['Start New Topic'] = 'Начать новую тему'; $dictionary['Topics count'] = 'Обсуждаемых тем'; +$dictionary['All groups'] = 'Все Ваши группы'; +$dictionary['Recently Updated'] = 'Обновленные последними'; +$dictionary['By Group Member Size'] = 'По количеству пользователей'; +$dictionary['Groups You Admin'] = 'Администрируемые Вами'; +$dictionary['You are in groups'] = 'Число групп, в которых Вы состоите'; $dictionary['Step'] = 'Шаг'; $dictionary['Group Info'] = 'Инфо о группе'; @@ -88,7 +94,7 @@ $dictionary['Publicize'] = 'Опубликовать'; $dictionary['Show this group in search results'] = 'Показывать эту группу в результатах поиска'; -$dictionary['Invite people to'] = 'Пригласить людей в'; +$dictionary['Invite people to group'] = 'Пригласить людей в группу'; $dictionary['Show'] = 'Показать'; $dictionary['Invite Friends'] = 'Пригласить друзей'; $dictionary['Invite Friends on PROJECT_NAME'] = 'Пригласить друзей по PROJECT_NAME'; @@ -96,7 +102,7 @@ $dictionary['Group has no owner'] = 'У группы нет владельца'; $dictionary['Group has no administrators'] = 'В группе нет администраторов'; $dictionary['Group has no moderators'] = 'В группе нет модераторов'; -$dictionary['Could not find any members. Invite some more people.'] = +$dictionary['Could not find any members. Invite some more people.'] = 'Не удалось найти ни одного участника. Пригласите больше людей.'; $dictionary['change status'] = 'изменить статус'; $dictionary['remove'] = 'удалить'; Modified: app/views/groupapp/board/_head.tpl =================================================================== --- app/views/groupapp/board/_head.tpl 2008-06-20 15:13:32 UTC (rev 244) +++ app/views/groupapp/board/_head.tpl 2008-06-24 14:27:06 UTC (rev 245) @@ -4,10 +4,10 @@ </div> <div class="info"> <div class="header"> - <div class="name groupapp">{group_name?}: _{Discussions}</div> + <div class="name groupapp">_{Group} '{group_name?}': _{Discussions}</div> </div> <div class="clearfix"></div> - <div class="subheader"><a href="/groupapp/group/show_group/{group.id?}">_{Back to group} {group_name?}</a></div> + <div class="subheader"><a href="/groupapp/group/show_group/{group.id?}">_{Back to group} '{group_name?}'</a></div> </div> </div> <div class="clearfix"></div> Modified: app/views/groupapp/board/index.tpl =================================================================== --- app/views/groupapp/board/index.tpl 2008-06-20 15:13:32 UTC (rev 244) +++ app/views/groupapp/board/index.tpl 2008-06-24 14:27:06 UTC (rev 245) @@ -36,7 +36,7 @@ <div class="container"> {loop topics} - <div class="row<? if ($topic_loop_counter == 1) echo ' first'; ?>"> + <div class="row<? if ($topic_loop_counter != 1) echo ' notfirst'; ?>"> <div class="topic_info"> <div class="subject"><a href="/groupapp/board/show_topic/{topic-first.topic_id?}">{topic-first.subject?}</a></div> Modified: app/views/groupapp/group/_editbar.tpl =================================================================== --- app/views/groupapp/group/_editbar.tpl 2008-06-20 15:13:32 UTC (rev 244) +++ app/views/groupapp/group/_editbar.tpl 2008-06-24 14:27:06 UTC (rev 245) @@ -8,7 +8,7 @@ </div> <div class="right"> <ul class="toggle_minitabs"> - <li><a href="/groupapp/group/show_group/{group.id?}">_{Back to} {group.name?}</a></li> + <li><a href="/groupapp/group/show_group/{group.id?}">_{Back to} '{group.name?}'</a></li> </ul> </div> </div> Modified: app/views/groupapp/group/edit_members.tpl =================================================================== --- app/views/groupapp/group/edit_members.tpl 2008-06-20 15:13:32 UTC (rev 244) +++ app/views/groupapp/group/edit_members.tpl 2008-06-24 14:27:06 UTC (rev 245) @@ -1,6 +1,6 @@ <div class="title_bar"> <div class="head"> - <div class="name groupapp">_{Invite people to} {group.name?}</div> + <div class="name groupapp">_{Invite people to group} '{group.name?}'</div> </div> </div> <div class="clearfix"></div> @@ -42,7 +42,7 @@ <span class="change_status"> <a href="#" onclick="change_member_status(this, {group.id}, 'moderators_list', 1); return false;" name="{member.id}">_{change status}</a> </span> - <a href="#" onclick="remove_member(this, {group.id}, 'owners_list', 1); return false;" name="{member.id}">_{remove}</a> + <a href="#" onclick="remove_member(this, {group.id?}, 'owners_list', 1); return false;" name="{member.id?}">_{remove}</a> </li> <? } ?> {end}{end} @@ -131,23 +131,24 @@ <script> function remove_member (element, groupapp_group_id, list_id, role) { - new Dialog.Box('dlg', { - reference: element, - title: '_{Remove member}?', - body: '_{Are you sure you want to remove this member from group}?', - yes: '_{Remove}', - cancel: '_{Cancel}', - onYes : function () { - new Ajax.Updater(list_id, - '/groupapp/group/remove_member', - { method:'post', - asynchronous:true, - parameters: - 'groupapp_group_id=' + groupapp_group_id + - '&list_id=' + list_id + - '&member_id=' + element.name + - '&groupapp_member_role_id=' + role - }); + new Dialog.Box(element, { + classname: 'delete_dialog', + title: '_{Remove member}?', + body: '_{Are you sure you want to remove this member from group}?', + yes: '_{Remove}', + cancel: '_{Cancel}', + hfloat: 'right', + onYes : function () { + new Ajax.Updater(list_id, + '/groupapp/group/remove_member', + { method:'post', + asynchronous:true, + parameters: + 'groupapp_group_id=' + groupapp_group_id + + '&list_id=' + list_id + + '&member_id=' + element.name + + '&groupapp_member_role_id=' + role + }); } }); Modified: app/views/groupapp/group/index.tpl =================================================================== --- app/views/groupapp/group/index.tpl 2008-06-20 15:13:32 UTC (rev 244) +++ app/views/groupapp/group/index.tpl 2008-06-24 14:27:06 UTC (rev 245) @@ -85,11 +85,11 @@ <tbody> <? $counter = 0; ?> {loop group_types} - <? if ($group_type_loop_counter % 3 == 1) { ?><tr><td><a href=""><?= $group_type->get('name') ?></a></td> + <? if ($group_type_loop_counter % 3 == 1) { ?><tr><td><a href=""><?= $group_type->get('name') ?></a></td> <? } ?> - <? if ($group_type_loop_counter % 3 == 2) { ?><td><a href=""><?= $group_type->get('name') ?></a></td> + <? if ($group_type_loop_counter % 3 == 2) { ?><td><a href=""><?= $group_type->get('name') ?></a></td> <? } ?> - <? if ($group_type_loop_counter % 3 == 0) { ?><td><a href=""><?= $group_type->get('name') ?></a></td></tr> + <? if ($group_type_loop_counter % 3 == 0) { ?><td><a href=""><?= $group_type->get('name') ?></a></td></tr> <? } ?> <? $counter++; ?> {end} @@ -101,7 +101,7 @@ ?> </tbody> </table> - <form action="/groupapp/group/search" method="post"> + <form action="/groupapp/group/browse" method="post"> <span class="query_field"><?= $form_helper->text_field('group', 'type', array('class' => 'textinput'))?></span> <span class="query_button"><input class="submitinput" type="submit" value="_{Search Groups}"></span> </form> Modified: app/views/groupapp/group/show_group.tpl =================================================================== --- app/views/groupapp/group/show_group.tpl 2008-06-20 15:13:32 UTC (rev 244) +++ app/views/groupapp/group/show_group.tpl 2008-06-24 14:27:06 UTC (rev 245) @@ -1,6 +1,6 @@ <div class="title_bar"> <div class="head"> - <div class="name groupapp">_{Group} {group.name?}</div> + <div class="name groupapp">_{Group} '{group.name?}'</div> </div> </div> <div class="clearfix"></div> @@ -35,13 +35,13 @@ <div class="box_title">_{Group Type}</div> </div> <div class="body"> - <? if ($group->access == 0) { ?> + <? if (isset($group)) { 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> @@ -76,7 +76,7 @@ <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="other value">{group.description?}</div> <div class="clearfix"></div> </div> </div> Modified: public/stylesheets/common/Application.css =================================================================== --- public/stylesheets/common/Application.css 2008-06-20 15:13:32 UTC (rev 244) +++ public/stylesheets/common/Application.css 2008-06-24 14:27:06 UTC (rev 245) @@ -235,9 +235,9 @@ .clearfix { clear: both; - height: 0px; - width: 0px; - line-height: 0px; + height: 0px; + width: 0px; + line-height: 0px; overflow: hidden; } Modified: public/stylesheets/groupapp/Board.css =================================================================== --- public/stylesheets/groupapp/Board.css 2008-06-20 15:13:32 UTC (rev 244) +++ public/stylesheets/groupapp/Board.css 2008-06-24 14:27:06 UTC (rev 245) @@ -41,8 +41,8 @@ padding: 10px 20px 10px 20px; } -.messages_list .container .row.first { - border-bottom: 0px; +.messages_list .container .row.notfirst { + border-top: 0px; } .messages_list .container .row .topic_info { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-20 15:13:23
|
Revision: 244 http://isocial.svn.sourceforge.net/isocial/?rev=244&view=rev Author: fsnobody Date: 2008-06-20 08:13:32 -0700 (Fri, 20 Jun 2008) Log Message: ----------- step by step, blog is coming (design list , view) Modified Paths: -------------- app/controllers/blogapp/post_controller.php app/views/blogapp/post/_menu.tpl app/views/blogapp/post/index.tpl Added Paths: ----------- app/views/blogapp/post/view.tpl Modified: app/controllers/blogapp/post_controller.php =================================================================== --- app/controllers/blogapp/post_controller.php 2008-06-20 12:56:44 UTC (rev 243) +++ app/controllers/blogapp/post_controller.php 2008-06-20 15:13:32 UTC (rev 244) @@ -19,6 +19,19 @@ } } + function view () { + $post = $this->BlogappPost->find($this->params['id']); + if ($this->current_user->getId() == $post->user_id ){ + $post->media_item->load(); + $post->attachments = $post->attachment->load(); + foreach ($post->attachments as $k => $attach) { + $attach->stored_file->load(); + } + $this->post = $post; + } + + } + function create () { if (!empty($this->params['post']) && $this->Request->isPost() ){ $post = $this->BlogappPost; Modified: app/views/blogapp/post/_menu.tpl =================================================================== --- app/views/blogapp/post/_menu.tpl 2008-06-20 12:56:44 UTC (rev 243) +++ app/views/blogapp/post/_menu.tpl 2008-06-20 15:13:32 UTC (rev 244) @@ -2,7 +2,7 @@ <div class="left"> <ul class="toggle_tabs"> <li class="first"><a href="/blogapp" class="<?= $controller->getActionName() == 'index' ? 'selected' : '' ?>">_{My Posts}</a></li><? - ?><li><a href="/blogapp" class="<?= in_array($controller->getActionName(), array('edit', 'create')) ? 'selected' : '' ?>">_{Edit / Create Post}</a></li><? + ?><li><a href="/blogapp" class="<?= in_array($controller->getActionName(), array('view', 'edit', 'create')) ? 'selected' : '' ?>">_{Edit / Create Post}</a></li><? ?><li><a href="/blogapp" class="last <?= $controller->getActionName() == 'smth' ? 'selected' : '' ?>">_{Smth}</a></li> </ul> </div> Modified: app/views/blogapp/post/index.tpl =================================================================== --- app/views/blogapp/post/index.tpl 2008-06-20 12:56:44 UTC (rev 243) +++ app/views/blogapp/post/index.tpl 2008-06-20 15:13:32 UTC (rev 244) @@ -36,7 +36,7 @@ </div> </div> <div class="clearfix"></div> - <div class="info">Автор:Капитолина Блоговая | Комментарии (7) | Комментировать</div> + <div class="info">Автор: OWNER | Комментарии (7) | Комментировать</div> </div> {end} </div> Added: app/views/blogapp/post/view.tpl =================================================================== --- app/views/blogapp/post/view.tpl (rev 0) +++ app/views/blogapp/post/view.tpl 2008-06-20 15:13:32 UTC (rev 244) @@ -0,0 +1,24 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<div class="container"> + + <div class="post_item"> + <div class="title"><?= $post->media_item->get('title');?> + <div class="created"><?= $post->media_item->created_at;?></div> + </div> + <div class="clearfix"></div> + <div class="body"> + <div class="text"> + <?= $post->media_item->get('body');?> + </div> + + </div> + <div class="clearfix"></div> + <div class="info">Автор: OWNER | Комментарии (7) | Комментировать</div> + </div> + +</div> + +<div class="clearfix"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-20 12:56:46
|
Revision: 243 http://isocial.svn.sourceforge.net/isocial/?rev=243&view=rev Author: fsnobody Date: 2008-06-20 05:56:44 -0700 (Fri, 20 Jun 2008) Log Message: ----------- **SPAM** Modified Paths: -------------- app/controllers/blogapp/post_controller.php app/views/blogapp/post/index.tpl public/stylesheets/blogapp/Post.css Modified: app/controllers/blogapp/post_controller.php =================================================================== --- app/controllers/blogapp/post_controller.php 2008-06-20 07:54:35 UTC (rev 242) +++ app/controllers/blogapp/post_controller.php 2008-06-20 12:56:44 UTC (rev 243) @@ -9,12 +9,13 @@ //$this->debug($this->posts); for ($i = 0 ; $i < count($this->posts) ; $i++) { $this->posts[$i]->media_item->load(); +/* $this->posts[$i]->attachments = $this->posts[$i]->attachment->load(); foreach ($this->posts[$i]->attachments as $k => $attach) { $attach->stored_file->load(); } - //$this->debug( count($this->posts[$i]->attachment->load())); - //$this->debug($this->posts[$i]->media_item->find()); +*/ + } } Modified: app/views/blogapp/post/index.tpl =================================================================== --- app/views/blogapp/post/index.tpl 2008-06-20 07:54:35 UTC (rev 242) +++ app/views/blogapp/post/index.tpl 2008-06-20 12:56:44 UTC (rev 243) @@ -11,18 +11,33 @@ <div class="name blogapp">_{My Posts}</div> </div> <div class="clearfix"></div> - <div class="subheader red"><a href="/blogapp/post/create">_{Create a New Post}</a></div> + <div class="subheader"><a href="/blogapp/post/create">_{Create a New Post}</a></div> </div> <div class="clearfix"></div> </div> <div class="container"> {loop posts} - <div><?= $post->getId();?></div> - <div><?= $post->media_item->get('title');?></div> - <div><?= $post->attachments[0]->get('base_file_id');?></div> - <div><?= $post->attachments[0]->stored_file->get('name');?></div> - + <div class="post_item"> + <div class="title"><?= $post->media_item->get('title');?> + <div class="created"><?= $post->media_item->created_at;?></div> + </div> + <div class="clearfix"></div> + <div class="body"> + <div class="text"> + <?= $post->media_item->get('body');?> + </div> + <div class="links"> + <ul class="actions_list"> + <li><a href="/blogapp/post/edit/<?= $post->getId()?>">_{Edit post}</a></li> + <li><a href="/blogapp/post/view/<?= $post->getId()?>">_{View post}</a></li> + <li><a href="/blogapp/post/delete/<?= $post->getId()?>">_{Delete post}</a></li> + </ul> + </div> + </div> + <div class="clearfix"></div> + <div class="info">Автор:Капитолина Блоговая | Комментарии (7) | Комментировать</div> + </div> {end} </div> Modified: public/stylesheets/blogapp/Post.css =================================================================== --- public/stylesheets/blogapp/Post.css 2008-06-20 07:54:35 UTC (rev 242) +++ public/stylesheets/blogapp/Post.css 2008-06-20 12:56:44 UTC (rev 243) @@ -1 +1,34 @@ -.x {} \ No newline at end of file +.x {} +.post_item { + padding: 10px 10px 20px 10px; +} + +.post_item .title { + font-size: 16px; + color: #000000; +} + +.post_item .body .text{ + font-size: 13px; + color: #000000; + float: left; + +} + +.post_item .body .links{ + width: 200px; + float: right; +} + + +.post_item .created { + float: right; + width: 180px; + color: #aeaeae; +} + +.post_item .info { + font-size: 12px; + color: #aeaeae; + padding: 10px 0px 0px 0px; +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-20 07:54:27
|
Revision: 242 http://isocial.svn.sourceforge.net/isocial/?rev=242&view=rev Author: fsnobody Date: 2008-06-20 00:54:35 -0700 (Fri, 20 Jun 2008) Log Message: ----------- hot kakoj nit da camit Modified Paths: -------------- app/controllers/blogapp/post_controller.php app/installers/blogapp/blog_installer.php app/models/blogapp_attachment.php app/models/blogapp_post.php app/views/blogapp/post/index.tpl Modified: app/controllers/blogapp/post_controller.php =================================================================== --- app/controllers/blogapp/post_controller.php 2008-06-17 09:22:52 UTC (rev 241) +++ app/controllers/blogapp/post_controller.php 2008-06-20 07:54:35 UTC (rev 242) @@ -5,11 +5,23 @@ var $models = array('blogapp', 'blogapp_post', 'blogapp_attachment'); function index () { + $this->posts = $this->BlogappPost->find('all', array('conditions' => array('user_id = ' . $this->current_user->getId()))); + //$this->debug($this->posts); + for ($i = 0 ; $i < count($this->posts) ; $i++) { + $this->posts[$i]->media_item->load(); + $this->posts[$i]->attachments = $this->posts[$i]->attachment->load(); + foreach ($this->posts[$i]->attachments as $k => $attach) { + $attach->stored_file->load(); + } + //$this->debug( count($this->posts[$i]->attachment->load())); + //$this->debug($this->posts[$i]->media_item->find()); + } } function create () { if (!empty($this->params['post']) && $this->Request->isPost() ){ $post = $this->BlogappPost; + $post->user_id = $this->current_user->getId(); $post->media_item->build(); $post->media_item->user_id = $this->current_user->getId(); $post->media_item->setAttributes($this->params['post']); Modified: app/installers/blogapp/blog_installer.php =================================================================== --- app/installers/blogapp/blog_installer.php 2008-06-17 09:22:52 UTC (rev 241) +++ app/installers/blogapp/blog_installer.php 2008-06-20 07:54:35 UTC (rev 242) @@ -9,6 +9,7 @@ "CREATE TABLE `blogapp_posts` ( `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, `media_item_id` int(11) NOT NULL, + `user_id` int(11) NOT NULL, FOREIGN KEY (media_item_id) REFERENCES media_items(id) ) ENGINE=InnoDB"); Modified: app/models/blogapp_attachment.php =================================================================== --- app/models/blogapp_attachment.php 2008-06-17 09:22:52 UTC (rev 241) +++ app/models/blogapp_attachment.php 2008-06-20 07:54:35 UTC (rev 242) @@ -3,12 +3,13 @@ class BlogappAttachment extends ActiveRecord { - var $belongs_to = array('post' => array('class_name' => 'BlogappPost', - 'primary_key_name' => 'post_id') + var $belongs_to = array( + 'post' => array('class_name' => 'BlogappPost', 'primary_key_name' => 'post_id'), + 'stored_file' => array('class_name' => 'StoredFile', 'primary_key_name' => 'base_file_id') ); - var $has_many = array( 'stored_files' => array('class_name' => 'StoredFile', 'foreign_key' => 'base_file_id') ); +// var $has_many = array( 'stored_files' => array('class_name' => 'StoredFile', 'foreign_key' => 'base_file_id') ); } ?> Modified: app/models/blogapp_post.php =================================================================== --- app/models/blogapp_post.php 2008-06-17 09:22:52 UTC (rev 241) +++ app/models/blogapp_post.php 2008-06-20 07:54:35 UTC (rev 242) @@ -2,15 +2,21 @@ class BlogappPost extends ActiveRecord { - +/* var $has_one = array('media_item' => array('class_name' => 'MediaItem', 'foreign_key' => 'media_item_id') ); +*/ + var $belongs_to = array('media_item' => array('class_name' => 'MediaItem', + 'primary_key_name' => 'media_item_id') + ); + var $has_many = array( 'attachments' => array('class_name' => 'BlogappAttachment', 'foreign_key' => 'post_id') ); + function validateOnCreate () { } Modified: app/views/blogapp/post/index.tpl =================================================================== --- app/views/blogapp/post/index.tpl 2008-06-17 09:22:52 UTC (rev 241) +++ app/views/blogapp/post/index.tpl 2008-06-20 07:54:35 UTC (rev 242) @@ -16,4 +16,14 @@ <div class="clearfix"></div> </div> +<div class="container"> + {loop posts} + <div><?= $post->getId();?></div> + <div><?= $post->media_item->get('title');?></div> + <div><?= $post->attachments[0]->get('base_file_id');?></div> + <div><?= $post->attachments[0]->stored_file->get('name');?></div> + + {end} +</div> + <div class="clearfix"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-17 09:22:44
|
Revision: 241 http://isocial.svn.sourceforge.net/isocial/?rev=241&view=rev Author: dim0s77 Date: 2008-06-17 02:22:52 -0700 (Tue, 17 Jun 2008) Log Message: ----------- minor fixes Modified Paths: -------------- app/controllers/message_controller.php app/views/message/show.tpl Modified: app/controllers/message_controller.php =================================================================== --- app/controllers/message_controller.php 2008-06-16 18:39:40 UTC (rev 240) +++ app/controllers/message_controller.php 2008-06-17 09:22:52 UTC (rev 241) @@ -105,7 +105,7 @@ $this->last_box = !empty($this->params['from']) ? $this->params['from'] : 'inbox'; $thread = $this->Message->findFirst(array('thread_id' => $this->params['id'] )); $user_id = $this->current_user->getId(); - if ($thread->sender_id == $user_id || $thread->recipient_id == $user_id ) { + if ($thread && ($thread->sender_id == $user_id || $thread->recipient_id == $user_id) ) { $recipient_id = $thread->sender_id == $user_id ? $thread->recipient_id : $thread->sender_id; $this->interlocutor = $this->User->findFirst(array( 'id' => $recipient_id)); $messages = $this->Message->find('all', array('conditions' => array('thread_id' => $thread->getId()), Modified: app/views/message/show.tpl =================================================================== --- app/views/message/show.tpl 2008-06-16 18:39:40 UTC (rev 240) +++ app/views/message/show.tpl 2008-06-17 09:22:52 UTC (rev 241) @@ -4,23 +4,25 @@ <div class="messages_thread"> <div id="messages"> + {?interlocutor} {?messages} <?= $controller->render(array('partial' =>'thread', 'locals' => array('interlocutor' => $interlocutor, - 'messages' => $messages))); ?> + 'messages' => $messages))) ?> + {end} {end} </div> <div class="reply_container"> <form id="reply_message_form" action="/message/show" method="post" onsubmit="return false;"> <label>_{Reply}:</label> <textarea class="textinput" cols="40" id="message_body" name="message[body]" rows="20"></textarea> - <input id="message_recipient" name="message[recipient]" type="hidden" value="{interlocutor.id}" /> - <input id="message_thread_id" name="message[thread_id]" type="hidden" value="{messages-0.thread_id}" /> - <input id="message_subject" name="message[subject]" type="hidden" value="re: {messages-0.subject}" /> + <input id="message_recipient" name="message[recipient]" type="hidden" value="{interlocutor.id?}" /> + <input id="message_thread_id" name="message[thread_id]" type="hidden" value="{messages-0.thread_id?}" /> + <input id="message_subject" name="message[subject]" type="hidden" value="re: {messages-0.subject?}" /> <div class="divide_line"> </div> <div class="submits"> <input class="submitinput" type="submit" value="_{Send}" onclick="new Ajax.Updater('messages', '/message/reply', { method:'post', asynchronous:true, parameters:Form.serialize('reply_message_form')}); $('message_body').clear(); return false;"> <input class="cancelinput" type="button" value="_{Back} <? if ($last_box == 'outbox') { ?>_{to Outbox}<? } else { ?>_{to Inbox}<? } ?>" onclick="change_location('{last_box}')"> </div> - <div class="sub_controls"><a href="#" onclick="delete_single_thread(this)" name="{messages-0.id}">_{Delete}</a></div> + <div class="sub_controls"><a href="#" onclick="delete_single_thread(this)" name="{messages-0.id?}">_{Delete}</a></div> </form> </div> <div class="clearfix"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-16 18:39:39
|
Revision: 240 http://isocial.svn.sourceforge.net/isocial/?rev=240&view=rev Author: dim0s77 Date: 2008-06-16 11:39:40 -0700 (Mon, 16 Jun 2008) Log Message: ----------- Define group user status before actions Modified Paths: -------------- app/controllers/groupapp/group_controller.php Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-15 13:11:54 UTC (rev 239) +++ app/controllers/groupapp/group_controller.php 2008-06-16 18:39:40 UTC (rev 240) @@ -6,6 +6,30 @@ 'GroupappMember', 'GroupappMemberRole', 'GroupappMessage', 'User'); + function beforeAction ( $method = '' ) { + parent::beforeAction($method); + + $this->is_admin = false; + $this->is_member = false; + $this->is_guest = true; + + if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { + $this->group = $this->GroupappGroup->findFirst(array( 'id = ?' => $this->params['id'] )); + // $this->group = $this->GroupappGroup->find($this->params['id']); + $members = $this->_getGroupMembers($this->group); + $current_user_id = $this->current_user->getId(); + foreach ($members as $member) { + if ($member->groupapp_member_role_id < 3 && $current_user_id == $member->getId()) { + $this->is_admin = true; + } + if ($current_user_id == $member->getId()) { + $this->is_member = true; + $this->is_guest = false; + } + } + } + } + function index () { $this->group_types = $this->GroupappGroupType->find('all', array('conditions' => array("parent_id = 0"))); $this->user_groups = $this->current_user->groupapp_group->load(); @@ -39,30 +63,23 @@ function customize () { $this->step = 'group_customize'; - if (!empty($this->params['group']) && !empty($this->params['id'])){ - $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['id'] )); - $group->setAttributes($this->params['group']); - if ($this->Request->isPost() && $group->save()) { + if (!empty($this->params['group']) && $this->group){ + $this->group->setAttributes($this->params['group']); + if ($this->Request->isPost() && $this->group->save()) { $this->step = 'group_members'; - $this->redirectTo(array('action' => 'edit_members', 'id' => $group->getId())); + $this->redirectTo(array('action' => 'edit_members', 'id' => $this->group->getId())); return; } - } else if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - $this->group = $this->GroupappGroup->findFirst($this->params['id']); } $this->importErrors( $this->GroupappGroup->getErrors() ); } function edit_group () { - if (!empty($this->params['group']) && !empty($this->params['id'])){ - $group = $this->GroupappGroup->findFirst(array( 'id = ?' => $this->params['id'] )); - $group->setAttributes($this->params['group']); - if ($this->Request->isPost() && $group->save()) { - $this->group = $group; + if (!empty($this->params['group']) && $this->group){ + $this->group->setAttributes($this->params['group']); + if ($this->Request->isPost() && $this->group->save()) { return; } - } else if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - $this->group = $this->GroupappGroup->find($this->params['id']); } $this->importErrors( $this->GroupappGroup->getErrors() ); } @@ -84,8 +101,7 @@ if ($this->Request->isPost() && $this->GroupappGroup->save()){ return; } - } else if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - $this->group = $this->GroupappGroup->find($this->params['id']); + } else if ($this->group) { $this->members = $this->_getGroupMembers($this->group); $this->owners_count = 0; $this->admins_count = 0; @@ -146,8 +162,7 @@ } function show_group () { - if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) { - $this->group = $this->GroupappGroup->find($this->params['id']); + if ($this->group) { $this->members = $this->_getGroupMembers($this->group); $this->members_count = count($this->members); $this->admins = array(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-15 13:11:46
|
Revision: 239 http://isocial.svn.sourceforge.net/isocial/?rev=239&view=rev Author: dim0s77 Date: 2008-06-15 06:11:54 -0700 (Sun, 15 Jun 2008) Log Message: ----------- enable limit accesing to few actions for user Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/views/groupapp/group/show_group.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-15 11:50:47 UTC (rev 238) +++ app/controllers/groupapp/group_controller.php 2008-06-15 13:11:54 UTC (rev 239) @@ -151,11 +151,22 @@ $this->members = $this->_getGroupMembers($this->group); $this->members_count = count($this->members); $this->admins = array(); + $this->is_admin = false; + $this->is_member = false; + $this->is_guest = true; + $current_user_id = $this->current_user->getId(); foreach ($this->members as $member) { if ($member->groupapp_member_role_id < 3) { $member->role->load(); $this->admins[] = $member; + if ($current_user_id == $member->getId()) { + $this->is_admin = true; + } } + if ($current_user_id == $member->getId()) { + $this->is_member = true; + $this->is_guest = false; + } } $this->group_type = $this->group->group_type->load()->get('name'); $messages = $this->GroupappMessage->find('all', Modified: app/views/groupapp/group/show_group.tpl =================================================================== --- app/views/groupapp/group/show_group.tpl 2008-06-15 11:50:47 UTC (rev 238) +++ app/views/groupapp/group/show_group.tpl 2008-06-15 13:11:54 UTC (rev 239) @@ -14,11 +14,19 @@ </div> <ul class="actions_list"> + {?is_admin} <li><a href="/groupapp/">_{Message All Members}</a></li> <li><a href="/groupapp/group/edit_info/{group.id?}">_{Edit Group}</a></li> <li><a href="/groupapp/group/edit_members/{group.id?}">_{Edit Members}</a></li> + {end} + {?is_member} <li><a href="/groupapp/group/edit_members/{group.id?}">_{Invite People to Join}</a></li> <li><a href="#">_{Leave Group}</a></li> + {end} + {?is_guest} + <li><a href="#">_{View Discussion Board}</a></li> + <li><a href="#">_{Join this Group}</a></li> + {end} </ul> <div class="box"> @@ -59,7 +67,7 @@ <div class="box"> <div class="header"> - <div class="edit"><a href="/groupapp/group/edit_info/{group.id?}">_{edit}</a></div> + {?is_admin}<div class="edit"><a href="/groupapp/group/edit_info/{group.id?}">_{edit}</a></div>{end} <div class="box_title">_{Group Info}</div> </div> <div class="clearfix"></div> @@ -117,14 +125,15 @@ </div> {else} <div class="emptyblock"> - _{There are no discussions}.<br><a href="/groupapp/board/start_topic/{group.id?}">_{Start the first topic}</a>. + _{There are no discussions}.<br> + {?is_member}<a href="/groupapp/board/start_topic/{group.id?}">_{Start the first topic}</a>.{end} </div> {end} </div> <div class="box"> <div class="header"> - <div class="edit"><a href="/groupapp/group/edit_members/{group.id?}">_{edit}</a></div> + {?is_admin}<div class="edit"><a href="/groupapp/group/edit_members/{group.id?}">_{edit}</a></div>{end} <div class="box_title">_{Members}</div> </div> <div class="menu"> @@ -143,7 +152,7 @@ </div> <div class="clearfix"></div> <div class="emptyblock"> - _{No one has said anything...yet}. <a href="#">_{Write something}</a>. + _{No one has said anything...yet}. {?is_member}<a href="#">_{Write something}</a>.{end} </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-15 11:50:45
|
Revision: 238 http://isocial.svn.sourceforge.net/isocial/?rev=238&view=rev Author: dim0s77 Date: 2008-06-15 04:50:47 -0700 (Sun, 15 Jun 2008) Log Message: ----------- hide photos and videos in the Groups Modified Paths: -------------- app/installers/groupapp/group_installer.php app/views/groupapp/group/_customize.tpl app/views/groupapp/group/show_group.tpl Modified: app/installers/groupapp/group_installer.php =================================================================== --- app/installers/groupapp/group_installer.php 2008-06-15 11:43:32 UTC (rev 237) +++ app/installers/groupapp/group_installer.php 2008-06-15 11:50:47 UTC (rev 238) @@ -40,9 +40,9 @@ `show_related_groups` tinyint(1) NOT NULL DEFAULT '1', `show_discussion_board` tinyint(1) NOT NULL DEFAULT '1', `show_wall` tinyint(1) NOT NULL DEFAULT '1', - `show_photos` tinyint(1) NOT NULL DEFAULT '1', + `show_photos` tinyint(1) NOT NULL DEFAULT '0', `photo_member` tinyint(1) NOT NULL DEFAULT '0', - `show_videos` tinyint(1) NOT NULL DEFAULT '1', + `show_videos` tinyint(1) NOT NULL DEFAULT '0', `video_member` tinyint(1) NOT NULL DEFAULT '0', `access` int(1) UNSIGNED NOT NULL DEFAULT '0', `show_in_search` tinyint(1) NOT NULL DEFAULT '1', Modified: app/views/groupapp/group/_customize.tpl =================================================================== --- app/views/groupapp/group/_customize.tpl 2008-06-15 11:43:32 UTC (rev 237) +++ app/views/groupapp/group/_customize.tpl 2008-06-15 11:50:47 UTC (rev 238) @@ -36,43 +36,43 @@ <div class="clearfix"></div> </div> - <div class="formrow"> - <label> </label> - <div class="formcol"> - <label class="checkbox"><?= $form_helper->check_box('group', 'show_photos', array('class' => 'checkboxinput')) ?>_{Enable photos}.</label> - </div> - <div class="clearfix"></div> - </div> - <div class="formrow"> - <label> </label> - <div class="formcol"> - <div class="formblock border"> - <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{Allow all members to upload photos}.</label> - <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '1', array('class' => 'radioinput')) ?>_{Only allow admins to upload photos}.</label> - <div class="clearfix"></div> - </div> - </div> - <div class="clearfix"></div> - </div> +<!-- <div class="formrow"> --> +<!-- <label> </label> --> +<!-- <div class="formcol"> --> +<!-- <label class="checkbox"><?= $form_helper->check_box('group', 'show_photos', array('class' => 'checkboxinput')) ?>_{Enable photos}.</label> --> +<!-- </div> --> +<!-- <div class="clearfix"></div> --> +<!-- </div> --> +<!-- <div class="formrow"> --> +<!-- <label> </label> --> +<!-- <div class="formcol"> --> +<!-- <div class="formblock border"> --> +<!-- <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{Allow all members to upload photos}.</label> --> +<!-- <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '1', array('class' => 'radioinput')) ?>_{Only allow admins to upload photos}.</label> --> +<!-- <div class="clearfix"></div> --> +<!-- </div> --> +<!-- </div> --> +<!-- <div class="clearfix"></div> --> +<!-- </div> --> - <div class="formrow"> - <label> </label> - <div class="formcol"> - <label class="checkbox"><?= $form_helper->check_box('group', 'show_videos', array('class' => 'checkboxinput')) ?>_{Enable videos}.</label> - </div> - <div class="clearfix"></div> - </div> - <div class="formrow"> - <label> </label> - <div class="formcol"> - <div class="formblock border"> - <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{Allow all members to upload videos}.</label> - <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '1', array('class' => 'radioinput')) ?>_{Only allow admins to upload videos}.</label> - <div class="clearfix"></div> - </div> - </div> - <div class="clearfix"></div> - </div> +<!-- <div class="formrow"> --> +<!-- <label> </label> --> +<!-- <div class="formcol"> --> +<!-- <label class="checkbox"><?= $form_helper->check_box('group', 'show_videos', array('class' => 'checkboxinput')) ?>_{Enable videos}.</label> --> +<!-- </div> --> +<!-- <div class="clearfix"></div> --> +<!-- </div> --> +<!-- <div class="formrow"> --> +<!-- <label> </label> --> +<!-- <div class="formcol"> --> +<!-- <div class="formblock border"> --> +<!-- <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{Allow all members to upload videos}.</label> --> +<!-- <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '1', array('class' => 'radioinput')) ?>_{Only allow admins to upload videos}.</label> --> +<!-- <div class="clearfix"></div> --> +<!-- </div> --> +<!-- </div> --> +<!-- <div class="clearfix"></div> --> +<!-- </div> --> <div class="formrow"> <label>_{Access}:</label> Modified: app/views/groupapp/group/show_group.tpl =================================================================== --- app/views/groupapp/group/show_group.tpl 2008-06-15 11:43:32 UTC (rev 237) +++ app/views/groupapp/group/show_group.tpl 2008-06-15 11:50:47 UTC (rev 238) @@ -45,7 +45,7 @@ <div class="body"> <ul class="simple_list"> {loop admins} - <li><a href="/groupapp/">{admin.user.name?}</a> <span>(<?= $admin->role->get('name') ?>)</span></li> + <li><a href="/profile/show/{admin.user.id?}">{admin.user.name?}</a> <span>(<?= $admin->role->get('name') ?>)</span></li> {end} </ul> </div> @@ -73,6 +73,7 @@ </div> </div> + {?group.show_photos} <div class="box"> <div class="header"> <div class="box_title">_{Photos}</div> @@ -82,7 +83,9 @@ _{No one has uploaded any photos}. <a href="#">_{Add Photos}</a>. </div> </div> + {end} + {?group.show_videos} <div class="box"> <div class="header"> <div class="box_title">_{Videos}</div> @@ -92,6 +95,7 @@ _{No one has uploaded any videos}. <a href="#">_{Add Videos}</a>. </div> </div> + {end} <div class="box"> <div class="header"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-06-15 11:43:24
|
Revision: 237 http://isocial.svn.sourceforge.net/isocial/?rev=237&view=rev Author: dim0s77 Date: 2008-06-15 04:43:32 -0700 (Sun, 15 Jun 2008) Log Message: ----------- minor fixes Modified Paths: -------------- app/controllers/groupapp/group_controller.php app/installers/user_installer.php app/views/groupapp/group/show_group.tpl Modified: app/controllers/groupapp/group_controller.php =================================================================== --- app/controllers/groupapp/group_controller.php 2008-06-10 17:09:30 UTC (rev 236) +++ app/controllers/groupapp/group_controller.php 2008-06-15 11:43:32 UTC (rev 237) @@ -184,6 +184,7 @@ } } $this->topics = $topics; + $this->topics_count = count($this->topics); } } Modified: app/installers/user_installer.php =================================================================== --- app/installers/user_installer.php 2008-06-10 17:09:30 UTC (rev 236) +++ app/installers/user_installer.php 2008-06-15 11:43:32 UTC (rev 237) @@ -286,18 +286,6 @@ ) ENGINE=InnoDB"); $this->execute( - "CREATE TABLE `groups` ( - `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, - `name` varchar(255), - `type` - `city_id` int(11), - `count` int(11), - FOREIGN KEY (user_id) REFERENCES users(id), - FOREIGN KEY (city_id) REFERENCES cities(id), - INDEX user_idx (user_id) - ) ENGINE=InnoDB"); - - $this->execute( "CREATE TABLE `group_profiles` ( `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, `user_id` int(11) NOT NULL, Modified: app/views/groupapp/group/show_group.tpl =================================================================== --- app/views/groupapp/group/show_group.tpl 2008-06-10 17:09:30 UTC (rev 236) +++ app/views/groupapp/group/show_group.tpl 2008-06-15 11:43:32 UTC (rev 237) @@ -100,7 +100,7 @@ {?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 class="info">_{Topics count}: <a href="/groupapp/board/{group.id?}">{topics_count?}</a></div> </div> <div class="simple_list"> {loop topics} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-10 17:09:23
|
Revision: 236 http://isocial.svn.sourceforge.net/isocial/?rev=236&view=rev Author: fsnobody Date: 2008-06-10 10:09:30 -0700 (Tue, 10 Jun 2008) Log Message: ----------- start blogapp Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/models/photoapp_photo.php app/views/shared/loggedin/sidebar.tpl config/routes.php public/stylesheets/common/Application.css Added Paths: ----------- app/controllers/blogapp/ app/controllers/blogapp/blog_controller.php app/controllers/blogapp/post_controller.php app/installers/blogapp/ app/installers/blogapp/blog_installer.php app/models/blogapp_attachment.php app/models/blogapp_post.php app/views/blogapp/ app/views/blogapp/post/ app/views/blogapp/post/_form.tpl app/views/blogapp/post/_menu.tpl app/views/blogapp/post/create.tpl app/views/blogapp/post/index.tpl public/images/blog.png public/stylesheets/blogapp/ public/stylesheets/blogapp/Blogapp.css public/stylesheets/blogapp/Post.css Added: app/controllers/blogapp/blog_controller.php =================================================================== --- app/controllers/blogapp/blog_controller.php (rev 0) +++ app/controllers/blogapp/blog_controller.php 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,11 @@ +<?php + +class Blogapp_PostController extends ApplicationController +{ + var $models = array('blogapp', 'blogapp_post', 'blogapp_attach'); + + function index () { + } +} + +?> \ No newline at end of file Added: app/controllers/blogapp/post_controller.php =================================================================== --- app/controllers/blogapp/post_controller.php (rev 0) +++ app/controllers/blogapp/post_controller.php 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,42 @@ +<?php + +class Blogapp_PostController extends ApplicationController +{ + var $models = array('blogapp', 'blogapp_post', 'blogapp_attachment'); + + function index () { + } + + function create () { + if (!empty($this->params['post']) && $this->Request->isPost() ){ + $post = $this->BlogappPost; + $post->media_item->build(); + $post->media_item->user_id = $this->current_user->getId(); + $post->media_item->setAttributes($this->params['post']); + $post->media_item->save(); + $post->media_item_id = $post->media_item->getId(); + $post->save(); + // attach + foreach ($this->uploaded_files as $file) { + unset($attach); + $attach = $this->BlogappAttachment; + $attach->post_id = $post->getId(); + $attach->base_file_id = $file->id; + $attach->save(); + } + + + //$this->debug($post->media_item); + + } + } + +// dev func + function debug($str) { + echo "<pre>"; + print_r($str); + echo "</pre>"; + } +} + +?> \ No newline at end of file Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-06-03 09:20:51 UTC (rev 235) +++ app/controllers/photoapp/album_controller.php 2008-06-10 17:09:30 UTC (rev 236) @@ -255,11 +255,6 @@ return array('id' => $this->params['id']); } - function debug($str) { - echo "<pre>"; - print_r($str); - echo "</pre>"; - } } ?> \ No newline at end of file Added: app/installers/blogapp/blog_installer.php =================================================================== --- app/installers/blogapp/blog_installer.php (rev 0) +++ app/installers/blogapp/blog_installer.php 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,30 @@ +<?php +class BlogInstaller extends AkInstaller +{ + var $module = 'blogapp'; + + function up_1() + { + $this->execute( + "CREATE TABLE `blogapp_posts` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + `media_item_id` int(11) NOT NULL, + FOREIGN KEY (media_item_id) REFERENCES media_items(id) + ) ENGINE=InnoDB"); + + $this->execute( + "CREATE TABLE `blogapp_attachments` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + `post_id` int(11) NOT NULL, + `base_file_id` int(11) NOT NULL, + FOREIGN KEY (base_file_id) REFERENCES base_files(id) + ) ENGINE=InnoDB"); + } + + function down_1() + { + $this->dropTable('blogapp_attachments'); + $this->dropTable('blogapp_posts'); + } +} +?> \ No newline at end of file Added: app/models/blogapp_attachment.php =================================================================== --- app/models/blogapp_attachment.php (rev 0) +++ app/models/blogapp_attachment.php 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,14 @@ +<?php + +class BlogappAttachment extends ActiveRecord +{ + + var $belongs_to = array('post' => array('class_name' => 'BlogappPost', + 'primary_key_name' => 'post_id') + ); + + + var $has_many = array( 'stored_files' => array('class_name' => 'StoredFile', 'foreign_key' => 'base_file_id') ); +} + +?> Added: app/models/blogapp_post.php =================================================================== --- app/models/blogapp_post.php (rev 0) +++ app/models/blogapp_post.php 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,19 @@ +<?php + +class BlogappPost extends ActiveRecord +{ + + var $has_one = array('media_item' => array('class_name' => 'MediaItem', + 'foreign_key' => 'media_item_id') + ); + var $has_many = array( 'attachments' => array('class_name' => 'BlogappAttachment', + 'foreign_key' => 'post_id') ); + + + + function validateOnCreate () + { + } +} + +?> Modified: app/models/photoapp_photo.php =================================================================== --- app/models/photoapp_photo.php 2008-06-03 09:20:51 UTC (rev 235) +++ app/models/photoapp_photo.php 2008-06-10 17:09:30 UTC (rev 236) @@ -7,9 +7,6 @@ 'media_item' => array('class_name' => 'MediaItem', 'primary_key_name' => 'media_item_id') ); - //var $has_one = array('media_item' => array('class_name' => 'MediaItem', 'primary_key_name' => 'media_item_id')); - - /* function beforeDestroy() { $this->stored_file->load(); Added: app/views/blogapp/post/_form.tpl =================================================================== --- app/views/blogapp/post/_form.tpl (rev 0) +++ app/views/blogapp/post/_form.tpl 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,28 @@ + <div class="formrow"> + <?= $controller->renderErrors() ?> + </div> + + <div class="formrow"> + <label class="required">_{Post Name}:<br><small>(_{required})</small></label> + <div class="formcol"> + <?= $form_helper->text_field('post', 'title', array('class' => 'textinput')) ?> + </div> + <div class="clearfix"></div> + </div> + + <div class="formrow"> + <label class="required">_{Body}:<br><small>(_{required})</small></label> + <div class="formcol"> + <?= $form_helper->text_area('post', 'body', array('rows' => '5')) ?> + </div> + <div class="clearfix"></div> + </div> + + <div class="formrow"> + <label class="required">_{Attach}:<br><small>(_{required})</small></label> + <div class="formcol"> + <?= $form_helper->file_field('post', 'base_file_id', array('class' => 'textinput small')) ?> + </div> + <div class="clearfix"></div> + </div> + Added: app/views/blogapp/post/_menu.tpl =================================================================== --- app/views/blogapp/post/_menu.tpl (rev 0) +++ app/views/blogapp/post/_menu.tpl 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,15 @@ +<div class="tabs"> + <div class="left"> + <ul class="toggle_tabs"> + <li class="first"><a href="/blogapp" class="<?= $controller->getActionName() == 'index' ? 'selected' : '' ?>">_{My Posts}</a></li><? + ?><li><a href="/blogapp" class="<?= in_array($controller->getActionName(), array('edit', 'create')) ? 'selected' : '' ?>">_{Edit / Create Post}</a></li><? + ?><li><a href="/blogapp" class="last <?= $controller->getActionName() == 'smth' ? 'selected' : '' ?>">_{Smth}</a></li> + </ul> + </div> + <div class="right"> + <ul class="toggle_tabs"> + <li class="first last"><a href="/blogapp/post/help" class="<?= $controller->getActionName() == 'help' ? 'selected' : '' ?>">_{Help}</a></li> + </ul> + </div> +</div> +<div class="clearfix"> </div> Added: app/views/blogapp/post/create.tpl =================================================================== --- app/views/blogapp/post/create.tpl (rev 0) +++ app/views/blogapp/post/create.tpl 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,28 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +The create + + +<div class="editform"> + + <form action="/blogapp/post/create" method="post" enctype="multipart/form-data"> + + <?= $controller->renderPartial("form") ?> + + <div class="formrow"> + <label> </label> + <div class="formcol"> + <input class="submitinput" type="submit" value="_{Create Post}"> + <input class="cancelinput" type="button" value="_{Cancel}"> + </div> + <div class="clearfix"></div> + </div> + + + + </form> +</div> + +<div class="clearfix"></div> Added: app/views/blogapp/post/index.tpl =================================================================== --- app/views/blogapp/post/index.tpl (rev 0) +++ app/views/blogapp/post/index.tpl 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,19 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<div class="title_bar"> + <div class="avatar"> + <a href="/profile/show/"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> + </div> + <div class="info"> + <div class="header"> + <div class="name blogapp">_{My Posts}</div> + </div> + <div class="clearfix"></div> + <div class="subheader red"><a href="/blogapp/post/create">_{Create a New Post}</a></div> + </div> +<div class="clearfix"></div> +</div> + +<div class="clearfix"></div> Modified: app/views/shared/loggedin/sidebar.tpl =================================================================== --- app/views/shared/loggedin/sidebar.tpl 2008-06-03 09:20:51 UTC (rev 235) +++ app/views/shared/loggedin/sidebar.tpl 2008-06-10 17:09:30 UTC (rev 236) @@ -13,5 +13,6 @@ <div id="applications"> <a href="/photoapp" class="photoapp">_{PhotoApp}</a> <a href="/groupapp" class="groupapp">_{GroupApp}</a> + <a href="/blogapp" class="blogapp">_{BlogApp}</a> <a href="/event" class="eventapp">_{EventApp}</a> </div> \ No newline at end of file Modified: config/routes.php =================================================================== --- config/routes.php 2008-06-03 09:20:51 UTC (rev 235) +++ config/routes.php 2008-06-10 17:09:30 UTC (rev 236) @@ -8,6 +8,7 @@ $Map->connect('/groupapp/board/:action/:id', array('controller' => 'board', 'module' => 'groupapp')); $Map->connect('/groupapp/group/:action/:id', array('controller' => 'group', 'module' => 'groupapp')); $Map->connect('/photoapp/:controller/:action/:id', array('controller' => 'album', 'module' => 'photoapp')); +$Map->connect('/blogapp/:controller/:action/:id', array('controller' => 'post', 'module' => 'blogapp')); //$Map->connect('/preview/:action/:size/:path',array('controller' => 'preview', 'action' => 'index') ); $Map->connect('/preview/:size/*path', array('controller' => 'preview', 'action' => 'index')); Added: public/images/blog.png =================================================================== (Binary files differ) Property changes on: public/images/blog.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: public/stylesheets/blogapp/Blogapp.css =================================================================== --- public/stylesheets/blogapp/Blogapp.css (rev 0) +++ public/stylesheets/blogapp/Blogapp.css 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1,48 @@ +.red { border: 1px solid red;} +.title_bar { + background-color: #ffffff; +} + +.title_bar .avatar { + margin: 10px 10px 0px 20px; + overflow: hidden; + height: 50px; + width: 50px; + z-index: 1; + position: relative; +} + +.title_bar .avatar img{ + display: block; +} + +.title_bar .info { + position: relative; + top: -50px; + left: 0px; + margin: 0px 0px -50px 0px; + padding: 0px 0px 0px 80px; +} + +.title_bar .info .header { + background: #f7f7f7; + z-index: 0; + border-bottom: solid 1px #cccccc; + margin: -10px 0px 7px -80px; + padding: 10px 0px 0px 80px; +} + + +.name { + font-weight: bold; + font-size: 14px; + padding: 7px 0px 7px 22px; +} + +.title_bar .info .subheader { +} + +.title_bar .head { + padding: 10px 0px 10px 30px; + border-bottom: solid 1px #cccccc; +} Added: public/stylesheets/blogapp/Post.css =================================================================== --- public/stylesheets/blogapp/Post.css (rev 0) +++ public/stylesheets/blogapp/Post.css 2008-06-10 17:09:30 UTC (rev 236) @@ -0,0 +1 @@ +.x {} \ No newline at end of file Modified: public/stylesheets/common/Application.css =================================================================== --- public/stylesheets/common/Application.css 2008-06-03 09:20:51 UTC (rev 235) +++ public/stylesheets/common/Application.css 2008-06-10 17:09:30 UTC (rev 236) @@ -253,6 +253,10 @@ background: url('/images/calendar.png') no-repeat 0px; } +.blogapp { + background: url('/images/blog.png') no-repeat 0px; +} + .linksarea a { padding: 2px 5px 2px 5px; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-03 09:21:17
|
Revision: 235 http://isocial.svn.sourceforge.net/isocial/?rev=235&view=rev Author: fsnobody Date: 2008-06-03 02:20:51 -0700 (Tue, 03 Jun 2008) Log Message: ----------- delete back link Modified Paths: -------------- app/views/photoapp/album/_edit_menu.tpl Modified: app/views/photoapp/album/_edit_menu.tpl =================================================================== --- app/views/photoapp/album/_edit_menu.tpl 2008-06-02 15:21:28 UTC (rev 234) +++ app/views/photoapp/album/_edit_menu.tpl 2008-06-03 09:20:51 UTC (rev 235) @@ -8,8 +8,5 @@ ?><li><a href="/photoapp/album/delete/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li> </ul> </div> - <div class="right"> - <a href="/photoapp" class="<?= $controller->getActionName() == 'help' ? 'selected' : '' ?>">_{Back}</a> - </div> </div> <div class="clearfix"> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-02 15:21:23
|
Revision: 234 http://isocial.svn.sourceforge.net/isocial/?rev=234&view=rev Author: fsnobody Date: 2008-06-02 08:21:28 -0700 (Mon, 02 Jun 2008) Log Message: ----------- photoappPhoto - now use Media Item and Store File Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/installers/photoapp/album_installer.php app/installers/user_installer.php app/models/photoapp_photo.php app/views/photoapp/album/edit_photo.tpl app/views/photoapp/album/index.tpl app/views/photoapp/album/uploaded.tpl Added Paths: ----------- app/models/media_item.php Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-06-01 17:32:12 UTC (rev 233) +++ app/controllers/photoapp/album_controller.php 2008-06-02 15:21:28 UTC (rev 234) @@ -41,9 +41,9 @@ if ($photo) { $album = $this->PhotoappAlbum->find($photo->album_id); if ($album) { - - $album->img = $photo->img; - $album->save(); + $photo->stored_file->load(); + $album->img = $photo->stored_file->url(); + $album->save(); } } $this->redirectTo(array('action' => 'view', 'id' => $photo->album_id)); @@ -65,7 +65,22 @@ if ($photo) { $album = $this->PhotoappAlbum->findFirst(array('id' => $photo->album_id)); if ($album->owner == $this->current_user->getId()) { + $photo->setAttributes($this->params['photo']); + + // counters + if ($photo_old->album_id != $photo->album_id) { + $old_album = $this->PhotoappAlbum->find($photo_old->album_id); + $old_album->photos_count -= 1; + $old_album->save(); + $new_album = $this->PhotoappAlbum->find($photo->album_id); + $new_album->photos_count += 1; + $new_album->save(); + } + + $photo->media_item = $photo->media_item->load(); + $photo->media_item->setAttributes($this->params['media_item']); + $photo->media_item->save(); // check for old album. cases: 1 just update info, 2 moving to another album if ($this->Request->isPost() && $photo->save()){ $this->redirectTo(array('action' => 'view', 'id' => $album->id)); @@ -76,6 +91,11 @@ } } else if (!empty($this->params['id']) && $this->PhotoappPhoto->find($this->params['id'])) { $this->photo = $this->PhotoappPhoto->find($this->params['id']); + + $this->media_item = $this->photo->media_item->load(); + $this->photo->body = $this->media_item->body; + //$this->debug($this->photo->body); + $this->album = $this->PhotoappAlbum->find($this->photo->album_id); $this->albums = $this->PhotoappAlbum->find('all', array('conditions' => array('owner = ' . $this->current_user->getId()))); } @@ -96,6 +116,7 @@ $photo->album->load(); if ($photo->album->getId() && $photo->album->owner == $this->current_user->getId()) { if ($photo->destroy()) { + $photo->album->reload(); $photo->album->photos_count -= 1; $photo->album->save(); $this->redirectTo(array('action' => 'view', 'id' => $photo->album->id)); @@ -113,7 +134,13 @@ unset($this->params['photo']['action_comment']); foreach ($this->params['photo'] as $k => $v) { $photo = $this->PhotoappPhoto->findFirst(array('id' => $k)); + + $photo->media_item->load(); + $photo->media_item->setAttributes($v); + $photo->media_item->save(); + $photo->setAttributes($v); + $photo->is_new = 0; $photo->save(); } //$this->redirectTo(array('action' => 'index')); @@ -125,7 +152,7 @@ // pre delete $this->album = $this->PhotoappAlbum->find($this->params['id']); } - $this->uploaded_photos = $this->PhotoappPhoto->find('all', array('conditions' => array("name =''", "caption =''"))); + $this->uploaded_photos = $this->PhotoappPhoto->find('all', array('conditions' => array("is_new =1"))); return; } } @@ -156,9 +183,20 @@ unset($photo); $photo = $this->album->photo->build(); $photo->base_file_id = $file->id; + + $photo->media_item->build(); + $photo->media_item->user_id = $this->current_user->getId(); + $photo->media_item->save(); + $photo->media_item_id = $photo->media_item->getId(); + //echo "#" . $photo->media_item->getId() . "#"; + //die(); //$photo->stored_file->assign($file); //$photo->stored_file->build(); //$photo->stored_file->assign($file); + if (empty($this->album->img)) { + $this->album->img = $file->url(); + } + $photo->save(); $this->album->photos_count += 1; } Modified: app/installers/photoapp/album_installer.php =================================================================== --- app/installers/photoapp/album_installer.php 2008-06-01 17:32:12 UTC (rev 233) +++ app/installers/photoapp/album_installer.php 2008-06-02 15:21:28 UTC (rev 234) @@ -24,10 +24,11 @@ `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, `album_id` int(11) NOT NULL, `base_file_id` int(11) NOT NULL, - `name` char(100) NOT NULL DEFAULT '', - `caption` char(255) NOT NULL DEFAULT '', + `media_item_id` int(11) NOT NULL, + `is_new` int(1) NOT NULL DEFAULT 1, FOREIGN KEY (album_id) REFERENCES photoapp_albums(id), FOREIGN KEY (base_file_id) REFERENCES base_files(id), + FOREIGN KEY (media_item_id) REFERENCES media_items(id), INDEX album_idx (album_id) ) ENGINE=InnoDB"); Modified: app/installers/user_installer.php =================================================================== --- app/installers/user_installer.php 2008-06-01 17:32:12 UTC (rev 233) +++ app/installers/user_installer.php 2008-06-02 15:21:28 UTC (rev 234) @@ -26,6 +26,17 @@ FOREIGN KEY (user_id) REFERENCES users(id), INDEX user_idx (user_id) ) ENGINE=InnoDB"); + + $this->execute( + "CREATE TABLE `media_items` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + `user_id` int(11), + `title` char(255) NOT NULL, + `body` text NOT NULL, + `created_at` datetime NOT NULL, + FOREIGN KEY (user_id) REFERENCES users(id), + INDEX user_idx (user_id) + ) ENGINE=InnoDB"); $this->execute( "CREATE TABLE `confirmations` ( Added: app/models/media_item.php =================================================================== --- app/models/media_item.php (rev 0) +++ app/models/media_item.php 2008-06-02 15:21:28 UTC (rev 234) @@ -0,0 +1,10 @@ +<?php + +class MediaItem extends ActiveRecord +{ + var $table_name = 'media_items'; + var $belongs_to = array('User'); + +} + +?> Modified: app/models/photoapp_photo.php =================================================================== --- app/models/photoapp_photo.php 2008-06-01 17:32:12 UTC (rev 233) +++ app/models/photoapp_photo.php 2008-06-02 15:21:28 UTC (rev 234) @@ -3,10 +3,33 @@ class PhotoappPhoto extends ActiveRecord { var $belongs_to = array('album' => array('class_name' => 'PhotoappAlbum', 'primary_key_name' => 'album_id'), - 'stored_file' => array('class_name' => 'StoredFile', 'primary_key_name' => 'base_file_id')); + 'stored_file' => array('class_name' => 'StoredFile', 'primary_key_name' => 'base_file_id'), + 'media_item' => array('class_name' => 'MediaItem', 'primary_key_name' => 'media_item_id') + ); + //var $has_one = array('media_item' => array('class_name' => 'MediaItem', 'primary_key_name' => 'media_item_id')); + +/* + function beforeDestroy() { + $this->stored_file->load(); + //echo "@" . $this->stored_file->url() . "@"; + + $albums_cover = $this->album->find('all', array('conditions' => array("img = '" . $this->stored_file->url() . "'"))); + if ($albums_cover) + foreach ($albums_cover as $album) { + if ($album) { + //echo $album->getId() . "#"; + $album->img = ""; + $album->save(); + } + } + return parent::beforeDestroy(); + } +*/ + function afterDestroy() { + /* $albums_cover = $this->album->find('all', array('conditions' => array("img = '" . $this->img . "'"))); if ($albums_cover) @@ -20,7 +43,24 @@ $this->stored_file->load(); + + //echo "@" . $this->stored_file->url() . "@"; + + $albums_cover = $this->album->find('all', array('conditions' => array("img = '" . $this->stored_file->url() . "'"))); + if ($albums_cover) + foreach ($albums_cover as $calbum) { + if ($calbum) { + //echo $calbum->getId() . "#"; + $calbum->img = ""; + $calbum->save(); +//die(); + } + } + + $this->stored_file->destroy(); + $this->media_item->load(); + $this->media_item->destroy(); return parent::afterDestroy(); } Modified: app/views/photoapp/album/edit_photo.tpl =================================================================== --- app/views/photoapp/album/edit_photo.tpl 2008-06-01 17:32:12 UTC (rev 233) +++ app/views/photoapp/album/edit_photo.tpl 2008-06-02 15:21:28 UTC (rev 234) @@ -10,14 +10,14 @@ <?= $form_helper->hidden_field('photo_old', 'album_id', array('value' => $photo->get('album_id')))?> <div class="edit_container"> - <div class="photo_comment"><? $photo->stored_file->load();?> + <div class="photo_comment"><? $photo->stored_file->load(); $photo->media_item->load();?> <div class="img_medium"><img src="/preview/620x500/<?= $photo->stored_file->url() ?>" /></div> <div class="data_medium"> <div class="form_create_row"> <label >_{Name}:</label> <div class="form_create_col"> - <?= $form_helper->text_field('photo', 'name', array('class' => 'textinput small')) ?> + <?= $form_helper->text_field('media_item', 'title', array('class' => 'textinput small', )) ?> </div> </div><div class="clearfix"></div> @@ -33,7 +33,8 @@ <div class="form_create_row"> <label >_{Description}:</label> <div class="form_create_col"> - <?= $form_helper->text_area('photo', 'caption', array('rows' => '5', 'class' => 'small')) ?> + <?= $form_helper->text_area('media_item', 'body', array('rows' => '5', 'class' => 'small')) ?> + </div> </div><div class="clearfix"></div> Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-06-01 17:32:12 UTC (rev 233) +++ app/views/photoapp/album/index.tpl 2008-06-02 15:21:28 UTC (rev 234) @@ -26,7 +26,7 @@ <div class="container"> {loop my_albums} <div class="album"> - <div class="img"><? if ($my_album->get('img') != '' || $my_album->get('img')) {?><img src="/preview/index/100x100/<?= $my_album->get('img')?>" /><? + <div class="img"><? if ($my_album->get('img') != '' || $my_album->get('img')) {?><img src="/preview/100x100/<?= $my_album->get('img')?>" /><? } else {?>_{No cover choosed}<? } ?></div> Modified: app/views/photoapp/album/uploaded.tpl =================================================================== --- app/views/photoapp/album/uploaded.tpl 2008-06-01 17:32:12 UTC (rev 233) +++ app/views/photoapp/album/uploaded.tpl 2008-06-02 15:21:28 UTC (rev 234) @@ -24,7 +24,7 @@ <div class="form_create_row"> <label >_{Name}:</label> <div class="form_create_col"> - <?= $form_helper->text_field('photo[' . $uploaded_photo->getId() . ']', 'name', array('class' => 'text_input small')) ?> + <?= $form_helper->text_field('photo[' . $uploaded_photo->getId() . ']', 'title', array('class' => 'text_input small')) ?> </div> </div> <div class="clearfix"></div> @@ -32,7 +32,7 @@ <div class="form_create_row"> <label >_{Description}:</label> <div class="form_create_col"> - <?= $form_helper->text_area('photo[' . $uploaded_photo->getId() . ']', 'caption', array('rows' => '5', 'class' => 'small')) ?> + <?= $form_helper->text_area('photo[' . $uploaded_photo->getId() . ']', 'body', array('rows' => '5', 'class' => 'small')) ?> </div> </div> <div class="clearfix"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-06-01 17:32:10
|
Revision: 233 http://isocial.svn.sourceforge.net/isocial/?rev=233&view=rev Author: aguidrevitch Date: 2008-06-01 10:32:12 -0700 (Sun, 01 Jun 2008) Log Message: ----------- improved shared file handling Modified Paths: -------------- app/application_controller.php Modified: app/application_controller.php =================================================================== --- app/application_controller.php 2008-06-01 17:05:00 UTC (rev 232) +++ app/application_controller.php 2008-06-01 17:32:12 UTC (rev 233) @@ -58,11 +58,13 @@ if (is_array($key_or_value)) { foreach ($key_or_value as $key => $value) { if ($stored = $this->_processSingleFile($key_or_value[$key])) { + $this->params[$fieldname][$key] = $stored; array_push($this->uploaded_files, $stored); } } } else { if ($stored = $this->_processSingleFile($uploaded[$fieldname])) { + $this->params[$fieldname] = $stored; array_push($this->uploaded_files, $stored); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-01 17:04:53
|
Revision: 232 http://isocial.svn.sourceforge.net/isocial/?rev=232&view=rev Author: fsnobody Date: 2008-06-01 10:05:00 -0700 (Sun, 01 Jun 2008) Log Message: ----------- fix Modified Paths: -------------- app/controllers/preview_controller.php app/models/photoapp_photo.php app/models/stored_file.php app/views/photoapp/album/edit_photo.tpl app/views/photoapp/album/uploaded.tpl app/views/photoapp/album/view.tpl config/routes.php Modified: app/controllers/preview_controller.php =================================================================== --- app/controllers/preview_controller.php 2008-06-01 16:39:58 UTC (rev 231) +++ app/controllers/preview_controller.php 2008-06-01 17:05:00 UTC (rev 232) @@ -9,10 +9,8 @@ function index () { @list($width, $height, $type) = explode('x', $this->params['size']); if ($width > 10 && $height > 10) { - //$filename = join(DS, $this->params['path']); - $this->params['path'] = str_replace("@", "/", $this->params['path']); - $file = AK_PUBLIC_DIR . "/images/uploaded/" . $this->params['path']; - + $filename = join(DS, $this->params['path']); + $file = AK_PUBLIC_DIR . DS . $filename; if (file_exists($file) && !is_dir($file)) { $data = $this->createJPEGPreview($file, $width, $height, $type); header("Content-Type: " . image_type_to_mime_type(IMAGETYPE_JPEG)); Modified: app/models/photoapp_photo.php =================================================================== --- app/models/photoapp_photo.php 2008-06-01 16:39:58 UTC (rev 231) +++ app/models/photoapp_photo.php 2008-06-01 17:05:00 UTC (rev 232) @@ -6,7 +6,7 @@ 'stored_file' => array('class_name' => 'StoredFile', 'primary_key_name' => 'base_file_id')); - function beforeDestroy() { + function afterDestroy() { /* $albums_cover = $this->album->find('all', array('conditions' => array("img = '" . $this->img . "'"))); if ($albums_cover) @@ -18,10 +18,11 @@ } */ + $this->stored_file->load(); - $this->stored_file->remove(); - return parent::beforeDestroy(); - + $this->stored_file->destroy(); + + return parent::afterDestroy(); } } Modified: app/models/stored_file.php =================================================================== --- app/models/stored_file.php 2008-06-01 16:39:58 UTC (rev 231) +++ app/models/stored_file.php 2008-06-01 17:05:00 UTC (rev 232) @@ -3,14 +3,6 @@ class StoredFile extends BaseFile { - function location () { - return $this->user_id . DS . $this->name; - } - - function preview () { - return $this->user_id . "@" . $this->name; - } - function path () { return "images" . DS . "uploaded" . DS . $this->user_id . DS; } @@ -26,13 +18,16 @@ } function remove () { - unlink(AK_PUBLIC_DIR . DS . $this->path() . DS . $this->name); + return unlink(AK_PUBLIC_DIR . DS . $this->path() . DS . $this->name); } function url () { return AK_ASSET_URL_PREFIX . $this->path() . $this->name; } + function beforeDestroy () { + return $this->remove(); + } } ?> Modified: app/views/photoapp/album/edit_photo.tpl =================================================================== --- app/views/photoapp/album/edit_photo.tpl 2008-06-01 16:39:58 UTC (rev 231) +++ app/views/photoapp/album/edit_photo.tpl 2008-06-01 17:05:00 UTC (rev 232) @@ -11,7 +11,7 @@ <div class="edit_container"> <div class="photo_comment"><? $photo->stored_file->load();?> - <div class="img_medium"><img src="/preview/index/620x500/<?= $photo->stored_file->preview() ?>" /></div> + <div class="img_medium"><img src="/preview/620x500/<?= $photo->stored_file->url() ?>" /></div> <div class="data_medium"> <div class="form_create_row"> Modified: app/views/photoapp/album/uploaded.tpl =================================================================== --- app/views/photoapp/album/uploaded.tpl 2008-06-01 16:39:58 UTC (rev 231) +++ app/views/photoapp/album/uploaded.tpl 2008-06-01 17:05:00 UTC (rev 232) @@ -17,7 +17,7 @@ {loop uploaded_photos} <div class="photo_comment"> <div class="img"><? $uploaded_photo->stored_file->load();?> - <img src="/preview/index/100x100/<?= $uploaded_photo->stored_file->preview() ?>" /> + <img src="/preview/100x100/<?= $uploaded_photo->stored_file->url() ?>" /> </div> <div class="data"> Modified: app/views/photoapp/album/view.tpl =================================================================== --- app/views/photoapp/album/view.tpl 2008-06-01 16:39:58 UTC (rev 231) +++ app/views/photoapp/album/view.tpl 2008-06-01 17:05:00 UTC (rev 232) @@ -17,7 +17,7 @@ {loop photos} <div class="photo_view"> <div class="img"><? $photo->stored_file->load() - ?><img src="/preview/index/100x100/<?= $photo->stored_file->preview() ?>" /><? + ?><img src="/preview/100x100/<?= $photo->stored_file->url() ?>" /><? ?></div> <div class="links"> <ul class="actions_list"> Modified: config/routes.php =================================================================== --- config/routes.php 2008-06-01 16:39:58 UTC (rev 231) +++ config/routes.php 2008-06-01 17:05:00 UTC (rev 232) @@ -8,7 +8,11 @@ $Map->connect('/groupapp/board/:action/:id', array('controller' => 'board', 'module' => 'groupapp')); $Map->connect('/groupapp/group/:action/:id', array('controller' => 'group', 'module' => 'groupapp')); $Map->connect('/photoapp/:controller/:action/:id', array('controller' => 'album', 'module' => 'photoapp')); -$Map->connect('/preview/:action/:size/:path',array('controller' => 'preview', 'action' => 'index') ); + +//$Map->connect('/preview/:action/:size/:path',array('controller' => 'preview', 'action' => 'index') ); +$Map->connect('/preview/:size/*path', array('controller' => 'preview', 'action' => 'index')); + + $Map->connect('/:controller/:action/:id', array('controller' => 'default', 'action' => 'index')); $Map->connect('/:controller/:action/:from/:id', array('controller' => 'message', 'action' => 'show')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-06-01 16:39:50
|
Revision: 231 http://isocial.svn.sourceforge.net/isocial/?rev=231&view=rev Author: fsnobody Date: 2008-06-01 09:39:58 -0700 (Sun, 01 Jun 2008) Log Message: ----------- changes with stored file Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/installers/photoapp/album_installer.php app/models/photoapp_photo.php app/models/stored_file.php app/views/photoapp/album/edit_photo.tpl app/views/photoapp/album/uploaded.tpl app/views/photoapp/album/view.tpl Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-06-01 15:41:30 UTC (rev 230) +++ app/controllers/photoapp/album_controller.php 2008-06-01 16:39:58 UTC (rev 231) @@ -24,10 +24,7 @@ } //$this->photos = $this->PhotoappPhoto->find('all', array('conditions' => array("album_id =" . $this->params['id']))); - - $_filter_pagination = array('items_per_page' => 15, 'count_conditions' => "album_id =" . $this->params['id'] ); - $this->photo_pages = $this->pagination_helper->getPaginator($this->PhotoappPhoto, $_filter_pagination);// paginator $_filter = array('conditions' => "album_id =" . $this->params['id']); @@ -99,8 +96,8 @@ $photo->album->load(); if ($photo->album->getId() && $photo->album->owner == $this->current_user->getId()) { if ($photo->destroy()) { - //$photo->album->photos_count = $photo->album->photos_count - 1; - //$photo->album->save(); + $photo->album->photos_count -= 1; + $photo->album->save(); $this->redirectTo(array('action' => 'view', 'id' => $photo->album->id)); } else { $this->importErrors( $this->PhotoappPhoto->getErrors() ); @@ -163,7 +160,10 @@ //$photo->stored_file->build(); //$photo->stored_file->assign($file); $photo->save(); + $this->album->photos_count += 1; } + $this->album->save(); + $this->redirectTo(array('action' => 'uploaded', 'id' => $photo->album_id)); } else if ($this->params['id']) { $this->album = $this->PhotoappAlbum->find($this->params['id']); return; Modified: app/installers/photoapp/album_installer.php =================================================================== --- app/installers/photoapp/album_installer.php 2008-06-01 15:41:30 UTC (rev 230) +++ app/installers/photoapp/album_installer.php 2008-06-01 16:39:58 UTC (rev 231) @@ -32,33 +32,8 @@ ) ENGINE=InnoDB"); - $this->execute( - "CREATE TRIGGER papp_photo_insert AFTER INSERT ON photoapp_photos - FOR EACH ROW BEGIN - UPDATE `photoapp_albums` SET photos_count = photos_count + 1 WHERE id = NEW.album_id; - END; - "); - $this->execute( - "CREATE TRIGGER papp_photo_delete AFTER DELETE ON photoapp_photos - FOR EACH ROW BEGIN - UPDATE `photoapp_albums` SET photos_count = photos_count - 1 WHERE id = OLD.album_id; - END; - "); - $this->execute( - "CREATE TRIGGER papp_photo_update AFTER UPDATE ON photoapp_photos - FOR EACH ROW BEGIN - - IF OLD.album_id != NEW.album_id THEN - UPDATE `photoapp_albums` SET photos_count = photos_count - 1 WHERE id = OLD.album_id; - UPDATE `photoapp_albums` SET photos_count = photos_count + 1 WHERE id = NEW.album_id; - END IF; - - END; - "); - - } Modified: app/models/photoapp_photo.php =================================================================== --- app/models/photoapp_photo.php 2008-06-01 15:41:30 UTC (rev 230) +++ app/models/photoapp_photo.php 2008-06-01 16:39:58 UTC (rev 231) @@ -5,9 +5,9 @@ var $belongs_to = array('album' => array('class_name' => 'PhotoappAlbum', 'primary_key_name' => 'album_id'), 'stored_file' => array('class_name' => 'StoredFile', 'primary_key_name' => 'base_file_id')); - /* + function beforeDestroy() { - +/* $albums_cover = $this->album->find('all', array('conditions' => array("img = '" . $this->img . "'"))); if ($albums_cover) foreach ($albums_cover as $album) { @@ -16,14 +16,14 @@ $album->save(); } } +*/ - $path = str_replace("@" , "/", $this->img); - $file = AK_PUBLIC_DIR . "/images/uploaded/" . $path; - `rm -f $file`; + $this->stored_file->load(); + $this->stored_file->remove(); return parent::beforeDestroy(); } - */ + } ?> \ No newline at end of file Modified: app/models/stored_file.php =================================================================== --- app/models/stored_file.php 2008-06-01 15:41:30 UTC (rev 230) +++ app/models/stored_file.php 2008-06-01 16:39:58 UTC (rev 231) @@ -3,6 +3,14 @@ class StoredFile extends BaseFile { + function location () { + return $this->user_id . DS . $this->name; + } + + function preview () { + return $this->user_id . "@" . $this->name; + } + function path () { return "images" . DS . "uploaded" . DS . $this->user_id . DS; } @@ -22,7 +30,7 @@ } function url () { - return AK_ASSET_URL_PREFIX . "/" . $this->path() . "/" . $this->name; + return AK_ASSET_URL_PREFIX . $this->path() . $this->name; } } Modified: app/views/photoapp/album/edit_photo.tpl =================================================================== --- app/views/photoapp/album/edit_photo.tpl 2008-06-01 15:41:30 UTC (rev 230) +++ app/views/photoapp/album/edit_photo.tpl 2008-06-01 16:39:58 UTC (rev 231) @@ -10,8 +10,8 @@ <?= $form_helper->hidden_field('photo_old', 'album_id', array('value' => $photo->get('album_id')))?> <div class="edit_container"> - <div class="photo_comment"> - <div class="img_medium"><img src="/preview/index/620x500/<?= $photo->get('img')?>" /></div> + <div class="photo_comment"><? $photo->stored_file->load();?> + <div class="img_medium"><img src="/preview/index/620x500/<?= $photo->stored_file->preview() ?>" /></div> <div class="data_medium"> <div class="form_create_row"> Modified: app/views/photoapp/album/uploaded.tpl =================================================================== --- app/views/photoapp/album/uploaded.tpl 2008-06-01 15:41:30 UTC (rev 230) +++ app/views/photoapp/album/uploaded.tpl 2008-06-01 16:39:58 UTC (rev 231) @@ -16,8 +16,8 @@ <div class="edit_container"> {loop uploaded_photos} <div class="photo_comment"> - <div class="img"> - <img src="/preview/index/100x100/<?= $uploaded_photo->get('img')?>" /> + <div class="img"><? $uploaded_photo->stored_file->load();?> + <img src="/preview/index/100x100/<?= $uploaded_photo->stored_file->preview() ?>" /> </div> <div class="data"> Modified: app/views/photoapp/album/view.tpl =================================================================== --- app/views/photoapp/album/view.tpl 2008-06-01 15:41:30 UTC (rev 230) +++ app/views/photoapp/album/view.tpl 2008-06-01 16:39:58 UTC (rev 231) @@ -16,10 +16,9 @@ <div class="edit_container"> {loop photos} <div class="photo_view"> - <div class="img"> - <ximg src="/preview/index/100x100/<?= $photo->stored_file->load()->url()?>" /> - <img src="<? $photo->stored_file->load(); echo $photo->stored_file->url() ?>" /> - </div> + <div class="img"><? $photo->stored_file->load() + ?><img src="/preview/index/100x100/<?= $photo->stored_file->preview() ?>" /><? + ?></div> <div class="links"> <ul class="actions_list"> <li><a href="/photoapp/album/edit_photo/<?= $photo->getId()?>">_{Edit}</a></li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-06-01 15:41:24
|
Revision: 230 http://isocial.svn.sourceforge.net/isocial/?rev=230&view=rev Author: aguidrevitch Date: 2008-06-01 08:41:30 -0700 (Sun, 01 Jun 2008) Log Message: ----------- timesheets Modified Paths: -------------- timesheet/aguidrevitch.txt timesheet/eerunov.txt Modified: timesheet/aguidrevitch.txt =================================================================== --- timesheet/aguidrevitch.txt 2008-06-01 15:40:00 UTC (rev 229) +++ timesheet/aguidrevitch.txt 2008-06-01 15:41:30 UTC (rev 230) @@ -11,3 +11,4 @@ 2008-05-14,19:10,22:00,main,RT:1,"instant messagers profile" 2008-05-15,20:40,22:10,main,RT:1,"instant messagers profile implemented" 2008-05-18,18:00,21:10,main,RT:1,"relationships and personal tabs implemented" +2008-06-01,15:00,18:40,main,RT:1,"implementing independent file storage" Modified: timesheet/eerunov.txt =================================================================== --- timesheet/eerunov.txt 2008-06-01 15:40:00 UTC (rev 229) +++ timesheet/eerunov.txt 2008-06-01 15:41:30 UTC (rev 230) @@ -17,4 +17,6 @@ 2008-05-21,18:30,21:20,photoapp,RT:2,"cover + triggers for photos_count in album" 2008-05-23,17:00,18:30,phoyoapp,RT:2,"remove is_cover in model" 2008-05-25,11:00,17:00.photoapp,RT:2,"album paginator" +2008-06-01,15:00,18:40,photoapp,RT:2,"implementing independent file storage" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |