[Isocial-svn] SF.net SVN: isocial: [123]
Status: Pre-Alpha
Brought to you by:
aguidrevitch
Menu
▾
▴
[Isocial-svn] SF.net SVN: isocial: [123]
|
From: <di...@us...> - 2008-04-17 09:00:59
|
Revision: 123
http://isocial.svn.sourceforge.net/isocial/?rev=123&view=rev
Author: dim0s77
Date: 2008-04-17 02:01:04 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
Added templates for group edition
Modified Paths:
--------------
app/controllers/groupapp/group_controller.php
app/locales/groupapp/group/ru.php
app/views/groupapp/group/_bar.tpl
app/views/groupapp/group/edit_members.tpl
public/stylesheets/Application.css
public/stylesheets/reset.css
Added Paths:
-----------
app/views/groupapp/group/_editbar.tpl
app/views/groupapp/group/edit_customize.tpl
app/views/groupapp/group/edit_info.tpl
app/views/groupapp/group/edit_moderators.tpl
Modified: app/controllers/groupapp/group_controller.php
===================================================================
--- app/controllers/groupapp/group_controller.php 2008-04-15 18:35:30 UTC (rev 122)
+++ app/controllers/groupapp/group_controller.php 2008-04-17 09:01:04 UTC (rev 123)
@@ -43,8 +43,20 @@
$this->importErrors( $this->GroupappGroup->getErrors() );
}
+ function edit_info () {
+ $this->step = 'edit_info';
+ }
+
+ function edit_customize () {
+ $this->step = 'edit_customize';
+ }
+
+ function edit_moderators () {
+ $this->step = 'edit_moderators';
+ }
+
function edit_members () {
- $this->step = 'group_members';
+ $this->step = 'edit_members';
if (!empty($this->params['member'])){
$this->GroupappGroup->setAttributes($this->params['member']);
if ($this->Request->isPost() && $this->GroupappGroup->save()){
Modified: app/locales/groupapp/group/ru.php
===================================================================
--- app/locales/groupapp/group/ru.php 2008-04-15 18:35:30 UTC (rev 122)
+++ app/locales/groupapp/group/ru.php 2008-04-17 09:01:04 UTC (rev 123)
@@ -20,6 +20,7 @@
$dictionary['Group Info'] = 'Информация о группе';
$dictionary['Customize'] = 'Дополнительно';
$dictionary['Members'] = 'Участники';
+$dictionary['Moderators'] = 'Модераторы';
$dictionary['Group Name'] = 'Название группы';
$dictionary['Description'] = 'Описание';
Modified: app/views/groupapp/group/_bar.tpl
===================================================================
--- app/views/groupapp/group/_bar.tpl 2008-04-15 18:35:30 UTC (rev 122)
+++ app/views/groupapp/group/_bar.tpl 2008-04-17 09:01:04 UTC (rev 123)
@@ -5,8 +5,7 @@
?><li><a href="/groupapp/group/customize/{group.id?}" class="<? if ($step == 'group_customize') { echo 'selected'; }
else if ($step == 'group_members') { echo ''; }
else echo 'disabled' ?>">_{Step} 2: _{Customize}</a></li><?
- ?><li><a href="/groupapp/group/edit_members/{group.id?}" class="<? if ($step == 'group_members') { echo 'selected'; }
- else echo 'disabled' ?>">_{Step} 3: _{Members}</a></li>
+ ?><li><a href="/groupapp/group/edit_members/{group.id?}" class="disabled">_{Step} 3: _{Members}</a></li>
</ul>
</div>
</div>
Added: app/views/groupapp/group/_editbar.tpl
===================================================================
--- app/views/groupapp/group/_editbar.tpl (rev 0)
+++ app/views/groupapp/group/_editbar.tpl 2008-04-17 09:01:04 UTC (rev 123)
@@ -0,0 +1,11 @@
+<div class="minitabs">
+ <div class="left">
+ <ul class="toggle_minitabs">
+ <li class="first"><a href="/groupapp/group/edit_info/{group.id?}" class="<?= $step == 'edit_info' ? 'selected' : '' ?>">_{Group Info}</a>
+ </li><li><a href="/groupapp/group/edit_customize/{group.id?}" class="<?= $step == 'edit_customize' ? 'selected' : '' ?>">_{Customize}</a>
+ </li><li><a href="/groupapp/group/edit_moderators/{group.id?}" class="<?= $step == 'edit_moderators' ? 'selected' : '' ?>">_{Moderators}</a>
+ </li><li><a href="/groupapp/group/edit_members/{group.id?}" class="<?= $step == 'edit_members' ? 'selected' : '' ?>">_{Members}</a></li>
+ </ul>
+ </div>
+</div>
+<div class="clearfix"> </div>
Added: app/views/groupapp/group/edit_customize.tpl
===================================================================
--- app/views/groupapp/group/edit_customize.tpl (rev 0)
+++ app/views/groupapp/group/edit_customize.tpl 2008-04-17 09:01:04 UTC (rev 123)
@@ -0,0 +1,10 @@
+<?= $controller->renderPartial("menu") ?>
+
+<div class="title_bar">
+ <div class="head">
+ <div class="name groupapp">_{Edit} {group_name?}</div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
+<?= $controller->renderPartial("editbar") ?>
Added: app/views/groupapp/group/edit_info.tpl
===================================================================
--- app/views/groupapp/group/edit_info.tpl (rev 0)
+++ app/views/groupapp/group/edit_info.tpl 2008-04-17 09:01:04 UTC (rev 123)
@@ -0,0 +1,10 @@
+<?= $controller->renderPartial("menu") ?>
+
+<div class="title_bar">
+ <div class="head">
+ <div class="name groupapp">_{Edit} {group_name?}</div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
+<?= $controller->renderPartial("editbar") ?>
Modified: app/views/groupapp/group/edit_members.tpl
===================================================================
--- app/views/groupapp/group/edit_members.tpl 2008-04-15 18:35:30 UTC (rev 122)
+++ app/views/groupapp/group/edit_members.tpl 2008-04-17 09:01:04 UTC (rev 123)
@@ -7,7 +7,7 @@
</div>
<div class="clearfix"></div>
-<?= $controller->renderPartial("bar") ?>
+<?= $controller->renderPartial("editbar") ?>
<div class="formwrapper">
<form action="/groupapp/group/edit_members/{group.id?}" method="post">
Added: app/views/groupapp/group/edit_moderators.tpl
===================================================================
--- app/views/groupapp/group/edit_moderators.tpl (rev 0)
+++ app/views/groupapp/group/edit_moderators.tpl 2008-04-17 09:01:04 UTC (rev 123)
@@ -0,0 +1,10 @@
+<?= $controller->renderPartial("menu") ?>
+
+<div class="title_bar">
+ <div class="head">
+ <div class="name groupapp">_{Invite people to} {group_name?}</div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
+<?= $controller->renderPartial("editbar") ?>
Modified: public/stylesheets/Application.css
===================================================================
--- public/stylesheets/Application.css 2008-04-15 18:35:30 UTC (rev 122)
+++ public/stylesheets/Application.css 2008-04-17 09:01:04 UTC (rev 123)
@@ -408,7 +408,6 @@
border-left: 0px;
color: #333;
font-weight: bold;
- margin-rigth: 10px;
padding :4px 8px 6px 9px;
background: #f1f1f1;
}
@@ -626,7 +625,7 @@
.minitabs .left {
float: left;
- padding-left: 10px;
+ padding-left: 8px;
margin-bottom: -1px;
}
@@ -660,6 +659,11 @@
outline: 0px;
}
+.toggle_minitabs li a:hover {
+ background: #c5cee1;
+ text-decoration: none;
+}
+
.toggle_minitabs li a.selected {
background: #3b5998;
color: #ffffff;
Modified: public/stylesheets/reset.css
===================================================================
--- public/stylesheets/reset.css 2008-04-15 18:35:30 UTC (rev 122)
+++ public/stylesheets/reset.css 2008-04-17 09:01:04 UTC (rev 123)
@@ -30,7 +30,7 @@
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
- content: none;
+ /* content: none; */
}
/* remember to define focus styles! */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|