Thread: [Isocial-svn] SF.net SVN: isocial: [128] timesheet
Status: Pre-Alpha
Brought to you by:
aguidrevitch
Menu
▾
▴
isocial-svn
|
From: <agu...@us...> - 2008-04-24 09:53:45
|
Revision: 128
http://isocial.svn.sourceforge.net/isocial/?rev=128&view=rev
Author: aguidrevitch
Date: 2008-04-24 02:53:49 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
timesheets directory added with timesheet mockups
Added Paths:
-----------
timesheet/
timesheet/aguidrevitch.txt
timesheet/dim0s77.txt
timesheet/eerunov.txt
Added: timesheet/aguidrevitch.txt
===================================================================
Added: timesheet/dim0s77.txt
===================================================================
Added: timesheet/eerunov.txt
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2008-04-30 16:24:54
|
Revision: 138
http://isocial.svn.sourceforge.net/isocial/?rev=138&view=rev
Author: dim0s77
Date: 2008-04-30 09:24:59 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
implemented two column design
Modified Paths:
--------------
app/controllers/groupapp/group_controller.php
app/views/groupapp/group/_editbar.tpl
public/stylesheets/Application.css
timesheet/dim0s77.txt
Added Paths:
-----------
app/views/groupapp/group/show_group.tpl
Modified: app/controllers/groupapp/group_controller.php
===================================================================
--- app/controllers/groupapp/group_controller.php 2008-04-30 14:17:13 UTC (rev 137)
+++ app/controllers/groupapp/group_controller.php 2008-04-30 16:24:59 UTC (rev 138)
@@ -141,6 +141,12 @@
}
}
+ function show_group () {
+ if (!empty($this->params['id']) && $this->GroupappGroup->find($this->params['id'])) {
+ $this->group = $this->GroupappGroup->find($this->params['id']);
+ }
+ }
+
function browse () {
}
Modified: app/views/groupapp/group/_editbar.tpl
===================================================================
--- app/views/groupapp/group/_editbar.tpl 2008-04-30 14:17:13 UTC (rev 137)
+++ app/views/groupapp/group/_editbar.tpl 2008-04-30 16:24:59 UTC (rev 138)
@@ -8,7 +8,7 @@
</div>
<div class="right">
<ul class="toggle_minitabs">
- <li><a href="/groupapp/group/group_info/{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>
Added: app/views/groupapp/group/show_group.tpl
===================================================================
--- app/views/groupapp/group/show_group.tpl (rev 0)
+++ app/views/groupapp/group/show_group.tpl 2008-04-30 16:24:59 UTC (rev 138)
@@ -0,0 +1,67 @@
+<div class="title_bar">
+ <div class="head">
+ <div class="name groupapp">{group.name?}</div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
+<div class="two_column">
+ <div class="right_small">
+ <div class="right_content">
+
+ <div class="box">
+ <div class="header">
+ <div class="edit"><a href="#">_{edit}</a></div>
+ <div class="box_title">_{Group Type}</div>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+ <div class="box">
+ <div class="header">
+ <div class="box_title">_{Admins}</div>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+ </div>
+ </div>
+ <div class="left_big">
+ <div class="left_content">
+
+ <div class="box">
+ <div class="header">
+ <div class="edit"><a href="#">_{edit}</a></div>
+ <div class="box_title">_{Information}</div>
+ </div>
+ <div class="clearfix"></div>
+ <div class="body">
+ Group Info
+ </div>
+ </div>
+
+ <div class="box">
+ <div class="header">
+ <div class="box_title">_{Photos}</div>
+ </div>
+ <div class="clearfix"></div>
+ <div class="emptyblock">
+ _{No one has uploaded any photos}. <a href="#">_{Add Photos}</a>.
+ </div>
+ </div>
+
+ <div class="box">
+ <div class="header">
+ <div class="box_title">_{Videos}</div>
+ </div>
+ <div class="clearfix"></div>
+ <div class="emptyblock">
+ _{No one has uploaded any videos}. <a href="#">_{Add Videos}</a>.
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
Modified: public/stylesheets/Application.css
===================================================================
--- public/stylesheets/Application.css 2008-04-30 14:17:13 UTC (rev 137)
+++ public/stylesheets/Application.css 2008-04-30 16:24:59 UTC (rev 138)
@@ -519,6 +519,73 @@
background: #f7f7f7;
}
+#content .two_column {
+ background: #ffffff;
+}
+
+#content .two_column .left_small {
+ width: 220px;
+ float: left;
+}
+
+#content .two_column .left_big {
+ margin: 0px 220px 0px 0px;
+}
+
+#content .two_column .right_small {
+ width: 220px;
+ float: right;
+}
+
+#content .two_column .right_big {
+ margin: 0px 0px 0px 220px;
+}
+
+.left_content {
+ padding: 10px 5px 10px 20px;
+}
+
+.right_content {
+ padding: 10px 20px 10px 5px;
+}
+
+.box {
+ float: left;
+ background: #ffffff;
+ border-top: 1px solid #3b5998;
+ margin-bottom: 10px;
+ width: 100%;
+}
+
+.box .header {
+ color: #3b5998;
+ background: #d8dfea;
+ padding: 3px 0px 3px 0px;
+}
+
+.box .header .box_title {
+ font-weight: bold;
+ margin-left: 10px;
+}
+
+.box .header .edit {
+ float: right;
+ margin-right: 10px;
+}
+
+.box .body {
+ padding: 10px;
+}
+
+.box .emptyblock {
+ border-top: 1px solid #aaaaaa;
+ border-bottom: 1px solid #aaaaaa;
+ color: #777777;
+ padding: 10px 0px 10px 0px;
+ text-align: center;
+ background: #f7f7f7;
+}
+
.editform .formrow {
clear: both;
vertical-align: top;
Modified: timesheet/dim0s77.txt
===================================================================
--- timesheet/dim0s77.txt 2008-04-30 14:17:13 UTC (rev 137)
+++ timesheet/dim0s77.txt 2008-04-30 16:24:59 UTC (rev 138)
@@ -1,2 +1,6 @@
2008-04-26,10:45,11:45,groupapp,RT:1,"Change html structure of 'group create' page from table to div. Minor fixes"
2008-04-26,11:45,13:30,groupapp,RT:2,"Create feature: change status of member"
+
+2008-04-29,19:50,20:10,groupapp,RT:3,"Create page 'show group' for groupapp"
+
+2008-04-30,18:00,19:25,groupapp,RT:3,"Create two column design"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2008-05-06 17:55:16
|
Revision: 170
http://isocial.svn.sourceforge.net/isocial/?rev=170&view=rev
Author: dim0s77
Date: 2008-05-06 10:54:37 -0700 (Tue, 06 May 2008)
Log Message:
-----------
complete 'start new topic' and begin 'show topic'
Modified Paths:
--------------
app/controllers/groupapp/board_controller.php
app/models/groupapp_group.php
app/models/groupapp_member.php
app/views/groupapp/board/_head.tpl
app/views/groupapp/board/show_topic.tpl
app/views/groupapp/board/start_topic.tpl
app/views/message/send.tpl
public/stylesheets/common/Submenu.css
public/stylesheets/common/Tab.css
timesheet/dim0s77.txt
Added Paths:
-----------
app/models/groupapp_message.php
Modified: app/controllers/groupapp/board_controller.php
===================================================================
--- app/controllers/groupapp/board_controller.php 2008-05-06 16:40:51 UTC (rev 169)
+++ app/controllers/groupapp/board_controller.php 2008-05-06 17:54:37 UTC (rev 170)
@@ -2,15 +2,63 @@
class Groupapp_BoardController extends ApplicationController
{
- var $models = array('GroupappMessage');
+ var $models = array('GroupappMessage', 'GroupappGroup', 'GroupappMember');
function index () {
}
function show_topic () {
+ if (!empty($this->params['id'])) {
+ $topic = $this->GroupappMessage->findFirst(array( 'id' => $this->params['id'] ));
+ if ($topic) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $topic->group_id,
+ 'user_id' => $this->current_user->getId()
+ ));
+ $group = $this->GroupappGroup->findFirst(array( 'id' => $topic->group_id ));
+ if (($group && $group->access == 1) || $member) {
+ $this->topic = $topic;
+ } else {
+ $this->addError('_common', 'Access denied', 'Group id closed. You can\'t to see this topic');
+ }
+ return;
+ }
+ }
+ $this->addError('_common', 'Topic not found', 'This topic is not founded');
}
function start_topic () {
+ if (!empty($this->params['topic']) &&
+ !empty($this->params['topic']['group_id']) &&
+ !empty($this->params['topic']['body'])) {
+ if ( $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['topic']['group_id'] )) ) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $group->getId(),
+ 'user_id' => $this->current_user->getId()
+ ));
+ if ($member) {
+ $topic = $member->message->build();
+ $topic->setAttributes($this->params['topic']);
+ if (empty($topic->subject)) {
+ $topic->subject = $this->t('(no topic)');
+ }
+ if ($topic->save()) {
+ if (!$topic->topic_id) {
+ $topic->topic_id = $topic->getId();
+ if ($topic->save()) {
+ $this->redirectTo(array('action' => 'show_topic', 'id' => $topic->getId()));
+ return;
+ }
+ }
+ }
+ }
+ }
+ $this->addError('_common', 'Sending message error', 'please, try again');
+ } else if (!empty($this->params['id'])) {
+ if ( $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['id'] )) ) {
+ $this->topic = $group->message->build();
+ }
+ } else {
+ $this->addError('_common', 'Start topic error', 'please, specify group');
+ }
}
}
Modified: app/models/groupapp_group.php
===================================================================
--- app/models/groupapp_group.php 2008-05-06 16:40:51 UTC (rev 169)
+++ app/models/groupapp_group.php 2008-05-06 17:54:37 UTC (rev 170)
@@ -5,6 +5,8 @@
var $has_one = array('group_member' => array('class_name' => 'GroupappMember',
'foreign_key' => 'group_id'),
);
+ var $has_many = array( 'messages' => array('class_name' => 'GroupappMessage',
+ 'foreign_key' => 'group_id') );
function validateOnCreate ()
{
Modified: app/models/groupapp_member.php
===================================================================
--- app/models/groupapp_member.php 2008-05-06 16:40:51 UTC (rev 169)
+++ app/models/groupapp_member.php 2008-05-06 17:54:37 UTC (rev 170)
@@ -5,6 +5,9 @@
var $belongs_to = array('user' => array('class_name' => 'User', 'primary_key_name' => 'user_id'),
'role' => array('class_name' => 'GroupMemberRole', 'primary_key_name' => 'role_id')
);
+ var $has_many = array( 'messages' => array('class_name' => 'GroupappMessage',
+ 'foreign_key' => 'user_id') );
+
}
?>
Added: app/models/groupapp_message.php
===================================================================
--- app/models/groupapp_message.php (rev 0)
+++ app/models/groupapp_message.php 2008-05-06 17:54:37 UTC (rev 170)
@@ -0,0 +1,20 @@
+<?php
+
+class GroupappMessage extends ActiveRecord
+{
+ var $has_one = array('user' => array('class_name' => 'User',
+ 'foreign_key' => 'user_id'),
+ 'group' => array('class_name' => 'GroupappGroup',
+ 'foreign_key' => 'group_id')
+ );
+
+/* function validateOnCreate () */
+/* { */
+/* $this->validatesPresenceOf('name', 'Name is missing|please enter the name'); */
+/* $this->validatesPresenceOf('description', 'Description is missing|please enter the description'); */
+/* $this->validatesPresenceOf('type_id', 'Group type is missing|please select the group category'); */
+/* # $this->validatesFormatOf('email', AK_EMAIL_REGULAR_EXPRESSION, 'Incorrect email|please enter the correct email'); */
+/* } */
+}
+
+?>
Modified: app/views/groupapp/board/_head.tpl
===================================================================
--- app/views/groupapp/board/_head.tpl 2008-05-06 16:40:51 UTC (rev 169)
+++ app/views/groupapp/board/_head.tpl 2008-05-06 17:54:37 UTC (rev 170)
@@ -12,6 +12,4 @@
</div>
<div class="clearfix"></div>
-<?= $controller->renderErrors() ?>
-
<?= $controller->renderPartial("menu") ?>
Modified: app/views/groupapp/board/show_topic.tpl
===================================================================
--- app/views/groupapp/board/show_topic.tpl 2008-05-06 16:40:51 UTC (rev 169)
+++ app/views/groupapp/board/show_topic.tpl 2008-05-06 17:54:37 UTC (rev 170)
@@ -1 +1,17 @@
-<?= $controller->renderPartial("head") ?>
\ No newline at end of file
+<?= $controller->renderPartial("head") ?>
+
+{?topic}
+<div class="submenu">
+
+ <div class="menu_block">
+ <div class="header">_{Topic}: {topic.subject?}</div>
+ </div>
+
+ <div class="menu_block right">
+ <a href="#">_{Delete Topic}</a> | <a href="#">_{Reply to Topic}</a>
+ </div>
+
+</div>
+<div class="clearfix"></div>
+{end}
+<?= $controller->renderErrors() ?>
Modified: app/views/groupapp/board/start_topic.tpl
===================================================================
--- app/views/groupapp/board/start_topic.tpl 2008-05-06 16:40:51 UTC (rev 169)
+++ app/views/groupapp/board/start_topic.tpl 2008-05-06 17:54:37 UTC (rev 170)
@@ -1 +1,21 @@
<?= $controller->renderPartial("head") ?>
+
+<?= $controller->renderErrors() ?>
+
+<form action="/groupapp/board/start_topic" method="post">
+ <div class="editform">
+ <div class="formrow">
+ <label>_{Topic}:</label>
+ <?= $form_helper->text_field('topic', 'subject', array('class' => 'textinput'))?>
+ </div>
+ <div class="formrow">
+ <label>_{Post}:</label>
+ <?= $form_helper->text_area('topic', 'body', array('class' => 'textinput'))?>
+ </div>
+ <div class="formrow">
+ <label><input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" /></label>
+ <input class="submitinput" type="submit" value="_{Post new topic}">
+ <input class="cancelinput" type="button" value="_{Cancel}">
+ </div>
+ </div>
+</form>
Modified: app/views/message/send.tpl
===================================================================
--- app/views/message/send.tpl 2008-05-06 16:40:51 UTC (rev 169)
+++ app/views/message/send.tpl 2008-05-06 17:54:37 UTC (rev 170)
@@ -2,7 +2,7 @@
<?= $controller->renderErrors() ?>
-<form action="/message/send" method="get">
+<form action="/message/send" method="post">
<div class="editform">
<div class="formrow">
<label>_{To}:</label>
Modified: public/stylesheets/common/Submenu.css
===================================================================
--- public/stylesheets/common/Submenu.css 2008-05-06 16:40:51 UTC (rev 169)
+++ public/stylesheets/common/Submenu.css 2008-05-06 17:54:37 UTC (rev 170)
@@ -16,10 +16,21 @@
float: left;
}
+.submenu .menu_block.right {
+ float: right;
+ margin: 5px;
+}
+
.submenu .menu_block.selector {
padding-right: 10px;
}
+.submenu .menu_block .header {
+ font-weight: bold;
+ font-size: 13px;
+ margin: 5px;
+}
+
.submenu .menu_block.selector select {
margin-left: 5px;
}
Modified: public/stylesheets/common/Tab.css
===================================================================
--- public/stylesheets/common/Tab.css 2008-05-06 16:40:51 UTC (rev 169)
+++ public/stylesheets/common/Tab.css 2008-05-06 17:54:37 UTC (rev 170)
@@ -1,5 +1,5 @@
#content .tabs {
- display:block;
+ display: block;
padding: 20px 0px 0px 0px;
border-bottom: 1px solid #898989;
float: left;
Modified: timesheet/dim0s77.txt
===================================================================
--- timesheet/dim0s77.txt 2008-05-06 16:40:51 UTC (rev 169)
+++ timesheet/dim0s77.txt 2008-05-06 17:54:37 UTC (rev 170)
@@ -8,3 +8,5 @@
2008-05-01,09:50,11:50,groupapp,RT:3,"Modife template 'show_group' for groupapp"
2008-05-01,11:50,15:00,groupapp,RT:3,"Adding groupapp discussion board basis. Localizate"
2008-05-01,15:00,16:55,groupapp,RT:3,"Creation tab 'discussion board' with no topics for groupapp"
+
+2008-05-06,19:30,20:50,groupapp,RT:3,"complete 'start new topic' and begin 'show topics'"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fsn...@us...> - 2008-05-08 15:56:19
|
Revision: 179
http://isocial.svn.sourceforge.net/isocial/?rev=179&view=rev
Author: fsnobody
Date: 2008-05-08 08:55:34 -0700 (Thu, 08 May 2008)
Log Message:
-----------
add photo to album (not finixhed)
Modified Paths:
--------------
app/controllers/photoapp/album_controller.php
app/controllers/preview_controller.php
app/models/photoapp_album.php
app/views/photoapp/album/add_photo.tpl
app/views/photoapp/album/uploaded.tpl
config/routes.php
timesheet/eerunov.txt
Added Paths:
-----------
app/models/photoapp_photo.php
Modified: app/controllers/photoapp/album_controller.php
===================================================================
--- app/controllers/photoapp/album_controller.php 2008-05-07 17:43:41 UTC (rev 178)
+++ app/controllers/photoapp/album_controller.php 2008-05-08 15:55:34 UTC (rev 179)
@@ -2,7 +2,7 @@
class Photoapp_AlbumController extends ApplicationController
{
- var $models = array('photoapp', 'photoapp_album');
+ var $models = array('photoapp', 'photoapp_album', 'photoapp_photo');
function index () {
//$this->redirectTo(array('action' => 'show'));
@@ -29,7 +29,7 @@
}
*/
function uploaded () {
- $this->uploaded_albums = $this->PhotoappAlbum->find('all', array('conditions' => array('name IS NULL', 'caption IS NULL')));
+ $this->uploaded_photos = $this->PhotoappPhoto->find('all', array('conditions' => array("name =''", "caption =''")));
return;
}
@@ -49,9 +49,9 @@
function add_photo () {
- if (!empty($this->params['album'])){
+ if (!empty($this->params['album']) && !empty($_FILES)){
//
- print_r($this->params['album']);
+ $this->_upload($this->params);
} else if ($this->params['id']) {
$this->album = $this->PhotoappAlbum->find($this->params['id']);
return;
@@ -93,5 +93,34 @@
}
}
+ function _upload($params) {
+ //$this->debug($_FILES);
+ for ($i = 1 ; $i < 6 ; $i++) {
+ $field = 'photo' . $i;
+ if ($_FILES['album']['error'][$field] == 0 ) {
+ // copy file; save photo
+ $copy_to = PROJECT_DIR . "public/images/uploaded/" . $_FILES['album']['name'][$field];
+ $copy_from = $_FILES['album']['tmp_name'][$field];
+ if (move_uploaded_file($copy_from, $copy_to)) {
+ $album = $this->PhotoappAlbum->find($this->params['id']);
+
+ $this->PhotoappPhoto->img = $copy_to;
+ $this->PhotoappPhoto->album_id = $album->getId();
+
+ $this->PhotoappPhoto->setAttributes($atr);
+ $this->PhotoappPhoto->save();
+ }
+ }
+ } // for
+ $this->redirectTo(array('action' => 'uploaded'));
+
+ }
+
+ function debug($str) {
+ echo "<pre>";
+ print_r($str);
+ echo "</pre>";
+ }
+
}
?>
\ No newline at end of file
Modified: app/controllers/preview_controller.php
===================================================================
--- app/controllers/preview_controller.php 2008-05-07 17:43:41 UTC (rev 178)
+++ app/controllers/preview_controller.php 2008-05-08 15:55:34 UTC (rev 179)
@@ -9,9 +9,9 @@
function index () {
@list($width, $height, $type) = explode('x', $this->params['size']);
if ($width > 10 && $height > 10) {
- $filename = join(DS, $this->params['path']);
- $file = AK_PUBLIC_DIR . "/$filename";
-
+ //$filename = join(DS, $this->params['path']);
+ $file = AK_PUBLIC_DIR . "/images/uploaded/" . $this->params['path'];
+
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_album.php
===================================================================
--- app/models/photoapp_album.php 2008-05-07 17:43:41 UTC (rev 178)
+++ app/models/photoapp_album.php 2008-05-08 15:55:34 UTC (rev 179)
@@ -3,6 +3,7 @@
class PhotoappAlbum extends ActiveRecord
{
//var $has_one = array('group_member' => array('class_name' => 'GroupappMember','foreign_key' => 'group_id'), );
+ var $has_many = array('photos' => array('class_name' => 'PhotoappPhoto', 'foreign_key' => 'album_id'));
function validateOnCreate ()
{
Added: app/models/photoapp_photo.php
===================================================================
--- app/models/photoapp_photo.php (rev 0)
+++ app/models/photoapp_photo.php 2008-05-08 15:55:34 UTC (rev 179)
@@ -0,0 +1,9 @@
+<?php
+
+class PhotoappPhoto extends ActiveRecord
+{
+ var $belongs_to = array('album' => array('class_name' => 'PhotoappAlbum', 'primary_key_name' => 'album_id') );
+
+}
+
+?>
Modified: app/views/photoapp/album/add_photo.tpl
===================================================================
--- app/views/photoapp/album/add_photo.tpl 2008-05-07 17:43:41 UTC (rev 178)
+++ app/views/photoapp/album/add_photo.tpl 2008-05-08 15:55:34 UTC (rev 179)
@@ -14,7 +14,7 @@
<?= $controller->renderPartial("edit_menu") ?>
<div class="album_step">
- <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId(), 'enctype' => 'multipart/form-data')) ?>
+ <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId()), array('multipart' => true)) ?>
<div class="form_create_clear red">
Modified: app/views/photoapp/album/uploaded.tpl
===================================================================
--- app/views/photoapp/album/uploaded.tpl 2008-05-07 17:43:41 UTC (rev 178)
+++ app/views/photoapp/album/uploaded.tpl 2008-05-08 15:55:34 UTC (rev 179)
@@ -6,16 +6,19 @@
<div class="album_step">
<?= $form_tag_helper->start_form_tag(array('action'=>'uploaded')) ?>
- <? if ($uploaded_albums == 0) {?>
+ <? if ($uploaded_photos == 0) {?>
<div class="noalbums">
_{You have no any uploaded and not edited photos}.
</div>
<? } else {?>
<div class="container">
- {loop uploaded_albums}
+ {loop uploaded_photos}
<div class="album">
- <div class="img">IMG: <?= $uploaded_album->get('img')?></div>
+ <div class="img">
+ IMG: <?= $uploaded_photo->get('img')?>
+ <img src="/preview/index/100x100/Supermassive_Black_Hole_by_Remind_me.jpg" />
+ </div>
</div>
{end}
</div>
Modified: config/routes.php
===================================================================
--- config/routes.php 2008-05-07 17:43:41 UTC (rev 178)
+++ config/routes.php 2008-05-08 15:55:34 UTC (rev 179)
@@ -5,6 +5,7 @@
$Map->connect('/', array('controller' => 'default', 'action' => 'index'));
$Map->connect('/groupapp/:controller/:action/:id', array('controller' => 'group', 'action' => 'index', 'module' => 'groupapp'));
$Map->connect('/photoapp/:controller/:action/:id', array('controller' => 'album', 'action' => 'index', 'module' => 'photoapp'));
+$Map->connect('/preview/:action/: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'));
Modified: timesheet/eerunov.txt
===================================================================
--- timesheet/eerunov.txt 2008-05-07 17:43:41 UTC (rev 178)
+++ timesheet/eerunov.txt 2008-05-08 15:55:34 UTC (rev 179)
@@ -7,3 +7,5 @@
2008-05-01,12:00,15:40,photoapp,RT:2,"redesign + album list + start edit albums"
2008-05-05,09:00,11:00,photoapp,RT:2,"minor fixes + edit album"
2008-05-06,09:00,10:20,photoapp,RT:2,"share create form + changes in installer + fixes + add_photo form design"
+2008-05-07,14:00,15:30,photoapp,RT:2,"photo controller"
+2008-05-08,09:00,11:00,photoapp,RT:2,"preview controller use + add photo designet and part functional"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2008-05-09 12:13:41
|
Revision: 180
http://isocial.svn.sourceforge.net/isocial/?rev=180&view=rev
Author: dim0s77
Date: 2008-05-09 05:13:00 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Created template for topics. Basis logic for board implemented
Modified Paths:
--------------
app/controllers/groupapp/board_controller.php
app/views/groupapp/board/index.tpl
app/views/groupapp/board/show_topic.tpl
public/stylesheets/groupapp/Board.css
timesheet/dim0s77.txt
Modified: app/controllers/groupapp/board_controller.php
===================================================================
--- app/controllers/groupapp/board_controller.php 2008-05-08 15:55:34 UTC (rev 179)
+++ app/controllers/groupapp/board_controller.php 2008-05-09 12:13:00 UTC (rev 180)
@@ -2,24 +2,51 @@
class Groupapp_BoardController extends ApplicationController
{
- var $models = array('GroupappMessage', 'GroupappGroup', 'GroupappMember');
+ var $models = array('GroupappMessage', 'GroupappGroup', 'GroupappMember', 'User');
function index () {
+ if (!empty($this->params['id'])) {
+ $messages = $this->GroupappMessage->find('all',
+ array('conditions' =>
+ array("group_id = ?", $this->params['id']))
+ );
+ $topics = array();
+ $persons = array();
+ if(!empty($messages)) {
+ foreach ($messages as $message_loop_key => $message) {
+ if (!isset($topics[$message->topic_id])) {
+ $topics[$message->topic_id]['first'] = $message;
+ } else {
+ }
+ isset($topics[$message->topic_id]['posts']) ?
+ $topics[$message->topic_id]['posts']++ :
+ $topics[$message->topic_id]['posts'] = 1;
+ if (!isset($persons[$message->topic_id][$message->user_id])) {
+ $persons[$message->topic_id][$message->user_id] = 1;
+ isset($topics[$message->topic_id]['persons']) ?
+ $topics[$message->topic_id]['persons']++ :
+ $topics[$message->topic_id]['persons'] = 1;
+ }
+ $topics[$message->topic_id]['last'] = $message;
+ }
+ }
+ $this->topics = $topics;
+ }
}
function show_topic () {
if (!empty($this->params['id'])) {
- $topic = $this->GroupappMessage->find('all',
+ $messages = $this->GroupappMessage->find('all',
array('conditions' =>
array("topic_id = ?", $this->params['id']))
);
- if ($topic) {
- $member = $this->GroupappMember->findFirst(array( 'group_id' => $topic[0]->group_id,
+ if ($messages) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $messages[0]->group_id,
'user_id' => $this->current_user->getId()
));
- $group = $this->GroupappGroup->findFirst(array( 'id' => $topic[0]->group_id ));
+ $group = $this->GroupappGroup->findFirst(array( 'id' => $messages[0]->group_id ));
if (($group && $group->access == 1) || $member) {
- $this->topic = $topic;
+ $this->messages = $messages;
} else {
$this->addError('_common', 'Access denied', 'Group id closed. You can\'t to see this topic');
}
Modified: app/views/groupapp/board/index.tpl
===================================================================
--- app/views/groupapp/board/index.tpl 2008-05-08 15:55:34 UTC (rev 179)
+++ app/views/groupapp/board/index.tpl 2008-05-09 12:13:00 UTC (rev 180)
@@ -28,9 +28,35 @@
</div>
<div class="clearfix"></div>
+{?topics}
+<div class="messages_list">
+ <div class="info">Displaying all 2 topics.</div>
+ <div class="container">
+ {loop topics}
+ <div class="row<? if ($topic_loop_counter == 1) echo ' first'; ?>">
+
+ <div class="topic_info">
+ <div class="subject"><a href="#">{topic-first.subject?}</a></div>
+ <span class="subtext black">{topic-posts?} post by {topic-persons?} person</span>
+ <span class="subtext">Created on {topic-first.created_at?}</span>
+ </div>
+
+ <div class="latest_post_info">
+ <div class="sender">Latest post by</div>
+ <div class="subtext">Posted on {topic-last.created_at?}</div>
+ </div>
+ <div class="clearfix"></div>
+
+ </div>
+
+ {end}
+ </div>
+</div>
+{else}
<div class="nodiscus">
_{There are no discussions}.
</div>
+{end}
<div class="clearfix"></div>
<script>
Modified: app/views/groupapp/board/show_topic.tpl
===================================================================
--- app/views/groupapp/board/show_topic.tpl 2008-05-08 15:55:34 UTC (rev 179)
+++ app/views/groupapp/board/show_topic.tpl 2008-05-09 12:13:00 UTC (rev 180)
@@ -1,10 +1,10 @@
<?= $controller->renderPartial("head") ?>
-{?topic}
+{?messages}
<div class="submenu">
<div class="menu_block">
- <div class="header">_{Topic}: {topic-0.subject?}</div>
+ <div class="header">_{Topic}: {messages-0.subject?}</div>
</div>
<div class="menu_block right">
@@ -13,11 +13,12 @@
</div>
<div class="clearfix"></div>
-{end}
+
<?= $controller->renderErrors() ?>
<div class="messages_list">
<div class="info">Displaying all 3 posts by 2 people.</div>
+ {loop messages}
<div class="row">
<div class="actions">
@@ -31,21 +32,23 @@
<div class="avatar">
<a href="/profile/show/{sender.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a>
- <div class="subtext">Post # </div>
+ <div class="subtext">Post #{message_loop_counter}</div>
<div class="subtext black">1 reply</div>
</div>
<div class="message">
<div class="head">
- <div class="sender">wrote</div>
- <div class="subtext">datetime </div>
+ <div class="sender">{message.user?}</div>
+ <div class="subtext">{message.created_at?}</div>
</div>
- <div class="body">
- body
- </div>
+ <div class="body">{message.body?}</div>
</div>
</div>
<div class="clearfix"></div>
+ {end}
</div>
<div class="clearfix"></div>
+{else}
+<?= $controller->renderErrors() ?>
+{end}
Modified: public/stylesheets/groupapp/Board.css
===================================================================
--- public/stylesheets/groupapp/Board.css 2008-05-08 15:55:34 UTC (rev 179)
+++ public/stylesheets/groupapp/Board.css 2008-05-09 12:13:00 UTC (rev 180)
@@ -19,6 +19,37 @@
padding: 0px 0px 5px 20px;
}
+.messages_list .container {
+ border-top: solid 1px #dddddd;
+ background: #f7f7f7;
+ padding: 10px;
+}
+
+.messages_list .container .row {
+ background: #ffffff;
+ border: 1px solid #cccccc;
+ display: block;
+ padding: 10px 20px 10px 20px;
+}
+
+.messages_list .container .row.first {
+ border-bottom: 0px;
+}
+
+.messages_list .container .row .topic_info {
+ float: left;
+}
+
+.messages_list .container .row .topic_info .subject {
+ font-size: 12px;
+ font-weight: bold;
+}
+
+.messages_list .container .row .latest_post_info {
+ float: right;
+ width: 240px;
+}
+
.messages_list .row {
border-top: 1px solid #cccccc;
display: block;
@@ -36,7 +67,6 @@
}
.subtext {
- display: block;
padding: 2px 0px 0px 0px;
font-size: 9px;
color: #777777;
Modified: timesheet/dim0s77.txt
===================================================================
--- timesheet/dim0s77.txt 2008-05-08 15:55:34 UTC (rev 179)
+++ timesheet/dim0s77.txt 2008-05-09 12:13:00 UTC (rev 180)
@@ -12,3 +12,5 @@
2008-05-06,19:30,20:50,groupapp,RT:3,"complete 'start new topic' and begin 'show topics'"
2008-05-07,19:00,20:40,groupapp,RT:3,"create template for topic messages"
+
+2008-05-09,12:00,15:00,groupapp,RT:3,"create template for topics"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fsn...@us...> - 2008-05-14 17:07:28
|
Revision: 202
http://isocial.svn.sourceforge.net/isocial/?rev=202&view=rev
Author: fsnobody
Date: 2008-05-14 10:07:32 -0700 (Wed, 14 May 2008)
Log Message:
-----------
design edit photo v1
Modified Paths:
--------------
app/controllers/photoapp/album_controller.php
public/stylesheets/photoapp/Album.css
timesheet/eerunov.txt
Added Paths:
-----------
app/views/photoapp/album/edit_photo.tpl
Modified: app/controllers/photoapp/album_controller.php
===================================================================
--- app/controllers/photoapp/album_controller.php 2008-05-14 10:34:38 UTC (rev 201)
+++ app/controllers/photoapp/album_controller.php 2008-05-14 17:07:32 UTC (rev 202)
@@ -21,7 +21,13 @@
return;
}
- function search () {
+ function edit_photo () {
+ if (!empty($this->params['id']) && $this->PhotoappPhoto->find($this->params['id'])) {
+ $this->photo = $this->PhotoappPhoto->find($this->params['id']);
+ $this->album = $this->PhotoappAlbum->find($this->photo->album_id);
+ $this->albums = $this->PhotoappAlbum->find('all', array('conditions' => array('owner = ' . $this->current_user->getId())));
+ }
+ //$this->redirectTo(array('action' => 'edit_photo', 'id' => $album->id));
}
function my_photos () {
Added: app/views/photoapp/album/edit_photo.tpl
===================================================================
--- app/views/photoapp/album/edit_photo.tpl (rev 0)
+++ app/views/photoapp/album/edit_photo.tpl 2008-05-14 17:07:32 UTC (rev 202)
@@ -0,0 +1,61 @@
+<?= $controller->renderPartial("edit_title") ?>
+
+<?= $controller->renderPartial("edit_menu") ?>
+
+<?= $controller->renderErrors() ?>
+
+<div class="uploaded_container">
+ <?= $form_tag_helper->start_form_tag(array('action'=>'edit_photo', 'id' => $photo->get('get'))) ?>
+ <?= $form_helper->hidden_field('photo', 'action_edit', array('value' => 'do_edit'))?>
+ <div class="edit_container">
+
+ <div class="photo_comment">
+ <div class="img_medium"><img src="/preview/index/300x270/<?= $photo->get('img')?>" /></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')) ?>
+ </div>
+ </div><div class="clearfix"></div>
+
+ <div class="form_create_row">
+ <label >_{Description}:</label>
+ <div class="form_create_col">
+ <?= $form_helper->text_area('photo', 'caption', array('rows' => '5', 'class' => 'small')) ?>
+ </div>
+ </div><div class="clearfix"></div>
+
+ <div class="form_create_row">
+ <label >_{Cover}:</label>
+ <div class="form_create_col">
+ <?= $form_helper->check_box('photo', 'is_cover') ?>
+ </div>
+ </div><div class="clearfix"></div>
+
+ <div class="form_create_row">
+ <label >_{Move to}:</label>
+ <div class="form_create_col">
+ <?= $form_options_helper->select('photo', 'album_id', $PhotoappAlbum->collect($PhotoappAlbum->find('all', array ('conditions' => array('owner = ' . $current_user->getId()))), 'name', 'id')); ?>
+
+ </div>
+ </div><div class="clearfix"></div>
+
+
+ </div>
+
+ </div><div class="clearfix"></div>
+
+ <div class="form_create_row">
+ <label class="medium"> </label>
+ <div class="form_create_col">
+ <input class="submitinput" type="submit" value="_{Save}"/>
+ </div>
+ </div><div class="clearfix"></div>
+
+
+ </div><div class="clearfix"></div>
+
+ </form>
+</div><div class="clearfix"></div>
Modified: public/stylesheets/photoapp/Album.css
===================================================================
--- public/stylesheets/photoapp/Album.css 2008-05-14 10:34:38 UTC (rev 201)
+++ public/stylesheets/photoapp/Album.css 2008-05-14 17:07:32 UTC (rev 202)
@@ -188,6 +188,21 @@
text-align: center;
padding-top: 10px;
}
+
+.photo_comment .img_medium {
+ float: left;
+ width: 320px;
+ height: 270px;
+ text-align: center;
+ padding-top: 10px;
+}
+
+.photo_comment .data_medium {
+ float: left;
+ width: 300px;
+ height: 270px;
+}
+
.photo_view .img {
height: 100px;
}
Modified: timesheet/eerunov.txt
===================================================================
--- timesheet/eerunov.txt 2008-05-14 10:34:38 UTC (rev 201)
+++ timesheet/eerunov.txt 2008-05-14 17:07:32 UTC (rev 202)
@@ -11,3 +11,4 @@
2008-05-08,09:00,11:00,photoapp,RT:2,"preview controller use + add photo designet and part functional"
2008-05-12,09:00,11:00,photoapp,RT:2,"comment uploaded + cover onoad"
2008-05-13,07:00,09:10,photoapp,RT:2,"photo list + delete"
+2008-05-14,09:00,11:00.photoapp,RT:2,"change img storage + design edit photo v1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fsn...@us...> - 2008-05-15 16:42:29
|
Revision: 205
http://isocial.svn.sourceforge.net/isocial/?rev=205&view=rev
Author: fsnobody
Date: 2008-05-15 09:42:23 -0700 (Thu, 15 May 2008)
Log Message:
-----------
edit photo
Modified Paths:
--------------
app/controllers/photoapp/album_controller.php
app/views/photoapp/album/_edit_menu.tpl
app/views/photoapp/album/edit_photo.tpl
public/stylesheets/photoapp/Album.css
timesheet/eerunov.txt
Modified: app/controllers/photoapp/album_controller.php
===================================================================
--- app/controllers/photoapp/album_controller.php 2008-05-15 14:38:24 UTC (rev 204)
+++ app/controllers/photoapp/album_controller.php 2008-05-15 16:42:23 UTC (rev 205)
@@ -22,7 +22,20 @@
}
function edit_photo () {
- if (!empty($this->params['id']) && $this->PhotoappPhoto->find($this->params['id'])) {
+ if (!empty($this->params['photo']) && $this->params['photo']['action_edit'] == 'do_edit'){
+ $photo = $this->PhotoappPhoto->findFirst(array('id' => $this->params['id']));
+ if ($photo) {
+ $album = $this->PhotoappAlbum->findFirst(array('id' => $photo->album_id));
+ if ($album->owner == $this->current_user->getId()) {
+ $photo->setAttributes($this->params['photo']);
+ if ($this->Request->isPost() && $photo->save()){
+ $this->redirectTo(array('action' => 'view', 'id' => $album->id));
+ }
+ }
+ } else {
+ $this->importErrors( $this->PhotoappPhoto->getErrors() );
+ }
+ } else if (!empty($this->params['id']) && $this->PhotoappPhoto->find($this->params['id'])) {
$this->photo = $this->PhotoappPhoto->find($this->params['id']);
$this->album = $this->PhotoappAlbum->find($this->photo->album_id);
$this->albums = $this->PhotoappAlbum->find('all', array('conditions' => array('owner = ' . $this->current_user->getId())));
Modified: app/views/photoapp/album/_edit_menu.tpl
===================================================================
--- app/views/photoapp/album/_edit_menu.tpl 2008-05-15 14:38:24 UTC (rev 204)
+++ app/views/photoapp/album/_edit_menu.tpl 2008-05-15 16:42:23 UTC (rev 205)
@@ -1,11 +1,11 @@
<div class="tabs">
<div class="left">
<ul class="toggle_tabs">
- <li class="first"><a href="/photoapp/album/add_photo/{id}" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add Photos}</a></li><?
- ?><li class="first"><a href="/photoapp/album/view/{id}" class="<?= $controller->getActionName() == 'view' ? 'selected' : '' ?>">_{View}</a></li><?
- ?><li class="first"><a href="/photoapp/album/uploaded/{id}" class="<?= $controller->getActionName() == 'uploaded' ? 'selected' : '' ?>">_{Edit uploaded}</a></li><?
- ?><li><a href="/photoapp/album/edit/{id}" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit Info}</a></li><?
- ?><li><a href="/photoapp/album/delete/{id}" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li>
+ <li class="first"><a href="/photoapp/album/add_photo/<?= $album->get('id')?>" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add Photos}</a></li><?
+ ?><li class="first"><a href="/photoapp/album/view/<?= $album->get('id')?>" class="<?= in_array($controller->getActionName(),array( 'edit_photo', 'view')) ? 'selected' : '' ?>">_{View}</a></li><?
+ ?><li class="first"><a href="/photoapp/album/uploaded/<?= $album->get('id')?>" class="<?= $controller->getActionName() == 'uploaded' ? 'selected' : '' ?>">_{Edit uploaded}</a></li><?
+ ?><li><a href="/photoapp/album/edit/<?= $album->get('id')?>" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit Info}</a></li><?
+ ?><li><a href="/photoapp/album/delete/<?= $album->get('id')?>" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li>
</ul>
</div>
<div class="right">
Modified: app/views/photoapp/album/edit_photo.tpl
===================================================================
--- app/views/photoapp/album/edit_photo.tpl 2008-05-15 14:38:24 UTC (rev 204)
+++ app/views/photoapp/album/edit_photo.tpl 2008-05-15 16:42:23 UTC (rev 205)
@@ -5,12 +5,12 @@
<?= $controller->renderErrors() ?>
<div class="uploaded_container">
- <?= $form_tag_helper->start_form_tag(array('action'=>'edit_photo', 'id' => $photo->get('get'))) ?>
+ <?= $form_tag_helper->start_form_tag(array('action'=>'edit_photo', 'id' => $photo->get('id'))) ?>
<?= $form_helper->hidden_field('photo', 'action_edit', array('value' => 'do_edit'))?>
<div class="edit_container">
<div class="photo_comment">
- <div class="img_medium"><img src="/preview/index/300x270/<?= $photo->get('img')?>" /></div>
+ <div class="img_medium"><img src="/preview/index/620x500/<?= $photo->get('img')?>" /></div>
<div class="data_medium">
<div class="form_create_row">
Modified: public/stylesheets/photoapp/Album.css
===================================================================
--- public/stylesheets/photoapp/Album.css 2008-05-15 14:38:24 UTC (rev 204)
+++ public/stylesheets/photoapp/Album.css 2008-05-15 16:42:23 UTC (rev 205)
@@ -191,16 +191,16 @@
.photo_comment .img_medium {
float: left;
- width: 320px;
- height: 270px;
+ width: 620px;
text-align: center;
- padding-top: 10px;
+ padding: 10px 0px;
}
.photo_comment .data_medium {
float: left;
- width: 300px;
+ width: 320px;
height: 270px;
+ padding: 0px 100px;
}
.photo_view .img {
Modified: timesheet/eerunov.txt
===================================================================
--- timesheet/eerunov.txt 2008-05-15 14:38:24 UTC (rev 204)
+++ timesheet/eerunov.txt 2008-05-15 16:42:23 UTC (rev 205)
@@ -12,3 +12,4 @@
2008-05-12,09:00,11:00,photoapp,RT:2,"comment uploaded + cover onoad"
2008-05-13,07:00,09:10,photoapp,RT:2,"photo list + delete"
2008-05-14,09:00,11:00.photoapp,RT:2,"change img storage + design edit photo v1"
+2008-05-15,10:00,11:00,photoapp,RT:2,"edit photo"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2008-05-15 18:21:20
|
Revision: 207
http://isocial.svn.sourceforge.net/isocial/?rev=207&view=rev
Author: dim0s77
Date: 2008-05-15 11:20:44 -0700 (Thu, 15 May 2008)
Log Message:
-----------
discussion board: 'reply to topic' implemented
Modified Paths:
--------------
app/controllers/groupapp/board_controller.php
app/locales/groupapp/board/ru.php
app/views/groupapp/board/_menu.tpl
app/views/groupapp/board/reply_to_post.tpl
app/views/groupapp/board/reply_to_topic.tpl
app/views/groupapp/board/show_topic.tpl
app/views/groupapp/board/start_topic.tpl
public/stylesheets/common/Form.css
timesheet/dim0s77.txt
Modified: app/controllers/groupapp/board_controller.php
===================================================================
--- app/controllers/groupapp/board_controller.php 2008-05-15 17:15:37 UTC (rev 206)
+++ app/controllers/groupapp/board_controller.php 2008-05-15 18:20:44 UTC (rev 207)
@@ -12,8 +12,9 @@
'include' => 'user'
)
);
- $group = $this->GroupappGroup->findFirst(array( 'id = ?' => $this->params['id'] ));
+ $group = $this->GroupappGroup->find( $this->params['id'] );
$topics = array();
+ $persons = array();
if(!empty($messages)) {
foreach ($messages as $message_loop_key => $message) {
if (!isset($topics[$message->topic_id])) {
@@ -49,9 +50,10 @@
$member = $this->GroupappMember->findFirst(array( 'group_id' => $messages[0]->group_id,
'user_id' => $this->current_user->getId()
));
- $group = $this->GroupappGroup->findFirst(array( 'id' => $messages[0]->group_id ));
+ $group = $this->GroupappGroup->find( $messages[0]->group_id );
if (($group && $group->access == 1) || $member) {
$this->messages = $messages;
+ $this->group = $group;
} else {
$this->addError('_common', 'Access denied', 'Group id closed. You can\'t to see this topic');
}
@@ -65,8 +67,8 @@
if (!empty($this->params['topic']) &&
!empty($this->params['topic']['group_id']) &&
!empty($this->params['topic']['body'])) {
- if ( $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['topic']['group_id'] )) ) {
- $member = $this->GroupappMember->findFirst(array( 'group_id' => $group->getId(),
+ if ( $this->group = $this->GroupappGroup->find( $this->params['topic']['group_id'] ) ) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $this->group->getId(),
'user_id' => $this->current_user->getId()
));
if ($member) {
@@ -88,8 +90,8 @@
}
$this->addError('_common', 'Sending message error', 'please, try again');
} else if (!empty($this->params['id'])) {
- if ( $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['id'] )) ) {
- $this->topic = $group->message->build();
+ if ( $this->group = $this->GroupappGroup->find( $this->params['id'] ) ) {
+ $this->topic = $this->group->message->build();
}
} else {
$this->addError('_common', 'Start topic error', 'please, specify group');
@@ -98,8 +100,44 @@
function reply_to_topic () {
- if (!empty($this->params['id'])) {
+ if (!empty($this->params['topic']) &&
+ !empty($this->params['topic']['group_id']) &&
+ !empty($this->params['topic']['topic_id']) &&
+ !empty($this->params['topic']['body'])) {
+ if ( $this->group = $this->GroupappGroup->find( $this->params['topic']['group_id'] ) ) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $this->group->getId(),
+ 'user_id' => $this->current_user->getId()
+ ));
+ if ($member) {
+ $message = $member->message->build();
+ $message->setAttributes($this->params['topic']);
+ if ($message->save()) {
+ $this->redirectTo(array('action' => 'show_topic', 'id' => $message->topic_id));
+ return;
+ }
+ }
+ }
+ $this->addError('_common', 'Sending message error', 'please, try again');
+ } else if (!empty($this->params['id'])) {
+ $messages = $this->GroupappMessage->find('all', array(
+ 'conditions' => array("topic_id = ?", $this->params['id'])
+ )
+ );
+ if ($messages) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $messages[0]->group_id,
+ 'user_id' => $this->current_user->getId()
+ ));
+ $group = $this->GroupappGroup->find( $messages[0]->group_id );
+ if (($group && $group->access == 1) || $member) {
+ $this->messages = $messages;
+ $this->group = $group;
+ } else {
+ $this->addError('_common', 'Access denied', 'Group id closed. You can\'t reply to this topic');
+ }
+ return;
+ }
}
+ $this->addError('_common', 'Topic not found', 'This topic is not founded');
}
function reply_to_post () {
Modified: app/locales/groupapp/board/ru.php
===================================================================
--- app/locales/groupapp/board/ru.php 2008-05-15 17:15:37 UTC (rev 206)
+++ app/locales/groupapp/board/ru.php 2008-05-15 18:20:44 UTC (rev 207)
@@ -38,9 +38,12 @@
$dictionary['wrote'] = 'по теме';
$dictionary['replied to post'] = 'в ответ на сообщение';
$dictionary['Reply'] = 'Ответить';
+$dictionary['Post'] = 'Сообщение';
+$dictionary['Post reply'] = 'Ответить';
+$dictionary['Post Reply'] = 'Послать ответ';
+$dictionary['Your reply'] = 'Ваш ответ';
$dictionary['to Your Post'] = 'себе';
$dictionary['replies'] = 'ответов';
-$dictionary['Post'] = 'Сообщение';
$dictionary['Mark as Irrelevant'] = 'Пометить как неуместное';
$dictionary['Delete Post'] = 'Удалить сообщение';
$dictionary['Report'] = 'Пожаловаться';
Modified: app/views/groupapp/board/_menu.tpl
===================================================================
--- app/views/groupapp/board/_menu.tpl 2008-05-15 17:15:37 UTC (rev 206)
+++ app/views/groupapp/board/_menu.tpl 2008-05-15 18:20:44 UTC (rev 207)
@@ -1,13 +1,20 @@
<div class="tabs">
<div class="left">
<ul class="toggle_tabs">
- <li class="first"><a href="/groupapp/board" class="<?= $controller->getActionName() == 'index' ? 'selected' : '' ?>">_{Discussion Board}</a></li><?
- if ($controller->getActionName() == 'show_topic') { ?><li><a href="/groupapp/board/show_topic/{topic.id?}" class="last selected">_{Topic View}</a></li><? } ?>
+ <li class="first"><a href="/groupapp/board/{group.id?}" class="<?= $controller->getActionName() == 'index' ? 'selected' : '' ?>">_{Discussion Board}</a></li><?
+ if ($controller->getActionName() == 'show_topic' ||
+ $controller->getActionName() == 'reply_to_topic'
+ ) { ?><li><a href="/groupapp/board/show_topic/{messages-0.topic_id?}" class="<?= $controller->getActionName() == 'show_topic' ? 'last selected' : '' ?>" >_{Topic View}</a></li><? } ?><?
+ if ($controller->getActionName() == 'reply_to_topic') { ?>
+ <li><a href="/groupapp/board/reply_to_topic/{messages-0.topic_id?}" class="last selected">_{Post Reply}</a></li>
+ <? } ?>
</ul>
</div>
<div class="right">
<ul class="toggle_tabs">
- <li class="first last"><a href="/groupapp/board/start_topic" class="<?= $controller->getActionName() == 'start_topic' ? 'selected' : '' ?>">_{Start New Topic}</a></li>
+<? if ($controller->getActionName() != 'reply_to_topic' && $controller->getActionName() != 'reply_to_post') { ?>
+ <li class="first last"><a href="/groupapp/board/start_topic/{group.id?}" class="<?= $controller->getActionName() == 'start_topic' ? 'selected' : '' ?>">_{Start New Topic}</a></li>
+<? } ?>
</ul>
</div>
</div>
Modified: app/views/groupapp/board/reply_to_post.tpl
===================================================================
--- app/views/groupapp/board/reply_to_post.tpl 2008-05-15 17:15:37 UTC (rev 206)
+++ app/views/groupapp/board/reply_to_post.tpl 2008-05-15 18:20:44 UTC (rev 207)
@@ -14,9 +14,10 @@
</div>
<div class="formrow">
<label>
- {?topic.group_id}<input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" />{end}
- {?topic.topic_id}<input id="topic_topic_id" name="topic[topic_id]" type="hidden" value="{topic.topic_id?}" />{end}
- {?topic.reply_message_id}<input id="topic_reply_topic_id" name="topic[reply_message_id]" type="hidden" value="{topic.reply_message_id?}" />{end}
+ <!-- <?= $form_helper->hidden_field('topic', 'group_id', array('value' => $group->getId()))?> -->
+ <!-- {?topic.group_id}<input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" />{end} -->
+ <!-- {?topic.topic_id}<input id="topic_topic_id" name="topic[topic_id]" type="hidden" value="{topic.topic_id?}" />{end} -->
+ <!-- {?topic.reply_message_id}<input id="topic_reply_topic_id" name="topic[reply_message_id]" type="hidden" value="{topic.reply_message_id?}" />{end} -->
</label>
<input class="submitinput" type="submit" value="_{Post}">
<input class="cancelinput" type="button" value="_{Cancel}">
Modified: app/views/groupapp/board/reply_to_topic.tpl
===================================================================
--- app/views/groupapp/board/reply_to_topic.tpl 2008-05-15 17:15:37 UTC (rev 206)
+++ app/views/groupapp/board/reply_to_topic.tpl 2008-05-15 18:20:44 UTC (rev 207)
@@ -1,25 +1,33 @@
<?= $controller->renderPartial("head") ?>
+{?messages}
+<div class="submenu">
+ <div class="menu_block">
+ <div class="header">_{Topic}: <a href="/groupapp/board/show_topic/{messages-0.topic_id}">{messages-0.subject?}</a></div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
<?= $controller->renderErrors() ?>
-<form action="/groupapp/board/reply_to_topic" method="post">
+<form action="/groupapp/board/reply_to_topic/{messages-0.topic_id?}" method="post">
<div class="editform">
<div class="formrow">
- <label>_{Topic}:</label>
- <?= $form_helper->text_field('topic', 'subject', array('class' => 'textinput'))?>
- </div>
- <div class="formrow">
- <label>_{Post}:</label>
+ <label> </label><span class="label">_{Your reply}</span><br>
<?= $form_helper->text_area('topic', 'body', array('class' => 'textinput'))?>
</div>
<div class="formrow">
<label>
- {?topic.group_id}<input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" />{end}
- {?topic.topic_id}<input id="topic_topic_id" name="topic[topic_id]" type="hidden" value="{topic.topic_id?}" />{end}
- {?topic.reply_message_id}<input id="topic_reply_message_id" name="topic[reply_message_id]" type="hidden" value="{topic.reply_message_id?}" />{end}
+ <?= $form_helper->hidden_field('topic', 'group_id', array('value' => $messages[0]->group_id))?>
+ <?= $form_helper->hidden_field('topic', 'topic_id', array('value' => $messages[0]->topic_id))?>
+ <?= $form_helper->hidden_field('topic', 'subject', array('value' => $messages[0]->subject))?>
</label>
- <input class="submitinput" type="submit" value="_{Post}">
+ <input class="submitinput" type="submit" value="_{Post reply}">
<input class="cancelinput" type="button" value="_{Cancel}">
</div>
</div>
</form>
+<div class="clearfix"></div>
+{else}
+<?= $controller->renderErrors() ?>
+{end}
Modified: app/views/groupapp/board/show_topic.tpl
===================================================================
--- app/views/groupapp/board/show_topic.tpl 2008-05-15 17:15:37 UTC (rev 206)
+++ app/views/groupapp/board/show_topic.tpl 2008-05-15 18:20:44 UTC (rev 207)
@@ -4,7 +4,7 @@
<div class="submenu">
<div class="menu_block">
- <div class="header">_{Topic}: {messages-0.subject?}</div>
+ <div class="header">_{Topic}: <a href="/groupapp/board/show_topic/{messages-0.topic_id}">{messages-0.subject?}</a></div>
</div>
<div class="menu_block right">
@@ -35,7 +35,7 @@
<div class="avatar">
<a href="/profile/show/{message.user_id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a>
<div class="subtext">#{message_loop_counter}</div>
- <input id="message_id{message.id?}" name="message_id{message.id?}" type="hidden" value="{message_loop_counter}" />
+ <?= $form_helper->hidden_field('message_id', $message->id, array('value' => $message_loop_counter))?>
</div>
<div class="message">
@@ -45,7 +45,7 @@
<? } else { ?><a href="/profile/show/{message.user_id?}"><span class="other_user">{message.user.name?}</span></a><? } ?>
</span>
{?message.reply_message_id}
- <span>_{replied to post} #<script>document.write($('message_id{message.reply_message_id?}').readAttribute('value'));</script></span>
+ <span>_{replied to post} #<script>document.write($('message_id_<?= $message->reply_message_id ?>').readAttribute('value'));</script></span>
{else}_{wrote}{end}
<div class="subtext">{message.created_at?}</div>
</div>
Modified: app/views/groupapp/board/start_topic.tpl
===================================================================
--- app/views/groupapp/board/start_topic.tpl 2008-05-15 17:15:37 UTC (rev 206)
+++ app/views/groupapp/board/start_topic.tpl 2008-05-15 18:20:44 UTC (rev 207)
@@ -2,7 +2,7 @@
<?= $controller->renderErrors() ?>
-<form action="/groupapp/board/start_topic" method="post">
+<form action="/groupapp/board/start_topic/{group.id?}" method="post">
<div class="editform">
<div class="formrow">
<label>_{Topic}:</label>
@@ -14,7 +14,7 @@
</div>
<div class="formrow">
<label>
- {?topic.group_id}<input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" />{end}
+ <?= $form_helper->hidden_field('topic', 'group_id', array('value' => $group->getId()))?>
</label>
<input class="submitinput" type="submit" value="_{Create new Topic}">
<input class="cancelinput" type="button" value="_{Cancel}">
Modified: public/stylesheets/common/Form.css
===================================================================
--- public/stylesheets/common/Form.css 2008-05-15 17:15:37 UTC (rev 206)
+++ public/stylesheets/common/Form.css 2008-05-15 18:20:44 UTC (rev 207)
@@ -14,6 +14,12 @@
line-height: 16px;
}
+.editform .formrow .label {
+ font-weight: bold;
+ color: #666666;
+ padding: 3px 10px 3px 0px;
+}
+
.formrow label {
font-weight: bold;
color: #666666;
Modified: timesheet/dim0s77.txt
===================================================================
--- timesheet/dim0s77.txt 2008-05-15 17:15:37 UTC (rev 206)
+++ timesheet/dim0s77.txt 2008-05-15 18:20:44 UTC (rev 207)
@@ -21,3 +21,4 @@
2008-05-14,15:00,16:35,groupapp,RT:3,"discussions for group (replying to topic)"
2008-05-15,10:20,12:20,groupapp,RT:3,"discussion board: topics list"
+2008-05-15,18:35,21:15,groupapp,RT:3,"discussion board: reply to topic"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2008-05-17 08:40:29
|
Revision: 211
http://isocial.svn.sourceforge.net/isocial/?rev=211&view=rev
Author: dim0s77
Date: 2008-05-17 01:40:36 -0700 (Sat, 17 May 2008)
Log Message:
-----------
discussion board: 'reply to post' implementation ended
Modified Paths:
--------------
app/controllers/groupapp/board_controller.php
app/views/groupapp/board/_head.tpl
app/views/groupapp/board/reply_to_post.tpl
app/views/groupapp/board/reply_to_topic.tpl
app/views/groupapp/board/show_topic.tpl
app/views/groupapp/board/start_topic.tpl
public/stylesheets/groupapp/Board.css
timesheet/dim0s77.txt
Modified: app/controllers/groupapp/board_controller.php
===================================================================
--- app/controllers/groupapp/board_controller.php 2008-05-16 06:28:55 UTC (rev 210)
+++ app/controllers/groupapp/board_controller.php 2008-05-17 08:40:36 UTC (rev 211)
@@ -33,7 +33,8 @@
$topics[$message->topic_id]['last'] = $message;
}
}
- $this->group = $group;
+ $this->group_id = $group->getId();
+ $this->group_name = $group->name;
$this->topics = $topics;
}
}
@@ -53,7 +54,9 @@
$group = $this->GroupappGroup->find( $messages[0]->group_id );
if (($group && $group->access == 1) || $member) {
$this->messages = $messages;
- $this->group = $group;
+ $this->group_id = $group->getId();
+ $this->group_name = $group->name;
+ $this->topic_id = $messages[0]->topic_id;
} else {
$this->addError('_common', 'Access denied', 'Group id closed. You can\'t to see this topic');
}
@@ -90,8 +93,11 @@
}
$this->addError('_common', 'Sending message error', 'please, try again');
} else if (!empty($this->params['id'])) {
- if ( $this->group = $this->GroupappGroup->find( $this->params['id'] ) ) {
- $this->topic = $this->group->message->build();
+ if ( $group = $this->GroupappGroup->find( $this->params['id'] ) ) {
+ $this->topic = $group->message->build();
+ $this->group_id = $group->getId();
+ $this->group_name = $group->name;
+ $this->topic_id = $this->topic->getId();
}
} else {
$this->addError('_common', 'Start topic error', 'please, specify group');
@@ -130,7 +136,9 @@
$group = $this->GroupappGroup->find( $messages[0]->group_id );
if (($group && $group->access == 1) || $member) {
$this->messages = $messages;
- $this->group = $group;
+ $this->group_id = $group->getId();
+ $this->group_name = $group->name;
+ $this->topic_id = $messages[0]->topic_id;
} else {
$this->addError('_common', 'Access denied', 'Group id closed. You can\'t reply to this topic');
}
@@ -141,13 +149,22 @@
}
function reply_to_post () {
- if (!empty($this->params['id'])) {
- $messages = $this->GroupappMessage->find('all',
- array(
- 'conditions' => array("group_id = ?", $this->params['id']),
- 'include' => 'user'
- )
- );
+ if (!empty($this->params['topic'])) {
+ if ( $this->group = $this->GroupappGroup->find( $this->params['topic']['group_id'] ) ) {
+ $member = $this->GroupappMember->findFirst(array( 'group_id' => $this->group->getId(),
+ 'user_id' => $this->current_user->getId()
+ ));
+ if ($member) {
+ $message = $member->message->build();
+ $message->setAttributes($this->params['topic']);
+ if ($message->save()) {
+ $this->redirectTo(array('action' => 'show_topic', 'id' => $message->topic_id));
+ return;
+ }
+ }
+ }
+ $this->addError('_common', 'Sending message error', 'please, try again');
+ } else if (!empty($this->params['id'])) {
$message = $this->GroupappMessage->findFirst(
array(
'conditions' => array("id = ?", $this->params['id']),
Modified: app/views/groupapp/board/_head.tpl
===================================================================
--- app/views/groupapp/board/_head.tpl 2008-05-16 06:28:55 UTC (rev 210)
+++ app/views/groupapp/board/_head.tpl 2008-05-17 08:40:36 UTC (rev 211)
@@ -4,10 +4,10 @@
</div>
<div class="info">
<div class="header">
- <div class="name groupapp">{group.name?}: _{Discussions}</div>
+ <div class="name groupapp">{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/reply_to_post.tpl
===================================================================
--- app/views/groupapp/board/reply_to_post.tpl 2008-05-16 06:28:55 UTC (rev 210)
+++ app/views/groupapp/board/reply_to_post.tpl 2008-05-17 08:40:36 UTC (rev 211)
@@ -1,23 +1,63 @@
<?= $controller->renderPartial("head") ?>
+{?message_to_reply}
+
<?= $controller->renderErrors() ?>
-<form action="/groupapp/board/reply_to_post" method="post">
+<div class="submenu">
+ <div class="menu_block">
+ <div class="header">_{Topic}: <a href="/groupapp/board/show_topic/{message_to_reply.topic_id}">{message_to_reply.subject?}</a></div>
+ </div>
+</div>
+<div class="clearfix"></div>
+
+<div class="messages_list">
+ <div class="row first">
+ <div class="actions">
+ </div>
+
+ <div class="avatar">
+ <a href="/profile/show/{message_to_reply.user_id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a>
+ </div>
+
+ <div class="message">
+ <div class="head">
+ <span class="sender">
+ <? if ($current_user->getId() == $message_to_reply->user_id) { ?><span class="current_user">_{You}</span>
+ <? } else { ?><a href="/profile/show/{message_to_reply.user_id?}"><span class="other_user">{message_to_reply.user.name?}</span></a><? } ?>
+ </span>
+ _{wrote}
+ <div class="subtext">{message_to_reply.created_at?}</div>
+ </div>
+ <div class="body">{message_to_reply.body?}</div>
+ </div>
+ <div class="clearfix"></div>
+
+ </div>
+</div>
+<div class="clearfix"></div>
+
+<div class="board_from_background">
+<form action="/groupapp/board/reply_to_topic/{message_to_reply.topic_id?}" method="post">
<div class="editform">
<div class="formrow">
- <label>_{Topic}:</label>
- <?= $form_helper->text_field('topic', 'subject', array('class' => 'textinput'))?>
- </div>
- <div class="formrow">
- <label>_{Post}:</label>
+ <label> </label><span class="label">_{Your reply}</span><br>
<?= $form_helper->text_area('topic', 'body', array('class' => 'textinput'))?>
</div>
<div class="formrow">
<label>
<?= $form_helper->hidden_field('topic', 'group_id', array('value' => $message_to_reply->group_id))?>
+ <?= $form_helper->hidden_field('topic', 'topic_id', array('value' => $message_to_reply->topic_id))?>
+ <?= $form_helper->hidden_field('topic', 'subject', array('value' => $message_to_reply->subject))?>
+ <?= $form_helper->hidden_field('topic', 'reply_message_id', array('value' => $message_to_reply->getId()))?>
</label>
- <input class="submitinput" type="submit" value="_{Post}">
+ <input class="submitinput" type="submit" value="_{Post reply}">
<input class="cancelinput" type="button" value="_{Cancel}">
</div>
</div>
</form>
+</div>
+<div class="clearfix"></div>
+{else}
+<?= $controller->renderErrors() ?>
+{end}
Modified: app/views/groupapp/board/reply_to_topic.tpl
===================================================================
--- app/views/groupapp/board/reply_to_topic.tpl 2008-05-16 06:28:55 UTC (rev 210)
+++ app/views/groupapp/board/reply_to_topic.tpl 2008-05-17 08:40:36 UTC (rev 211)
@@ -1,6 +1,9 @@
<?= $controller->renderPartial("head") ?>
{?messages}
+
+<?= $controller->renderErrors() ?>
+
<div class="submenu">
<div class="menu_block">
<div class="header">_{Topic}: <a href="/groupapp/board/show_topic/{messages-0.topic_id}">{messages-0.subject?}</a></div>
@@ -8,8 +11,7 @@
</div>
<div class="clearfix"></div>
-<?= $controller->renderErrors() ?>
-
+<div class="board_from_background">
<form action="/groupapp/board/reply_to_topic/{messages-0.topic_id?}" method="post">
<div class="editform">
<div class="formrow">
@@ -27,6 +29,7 @@
</div>
</div>
</form>
+</div>
<div class="clearfix"></div>
{else}
<?= $controller->renderErrors() ?>
Modified: app/views/groupapp/board/show_topic.tpl
===================================================================
--- app/views/groupapp/board/show_topic.tpl 2008-05-16 06:28:55 UTC (rev 210)
+++ app/views/groupapp/board/show_topic.tpl 2008-05-17 08:40:36 UTC (rev 211)
@@ -17,7 +17,6 @@
<?= $controller->renderErrors() ?>
<div class="messages_list">
- <div class="info"> </div>
{loop messages}
<div class="row">
Modified: app/views/groupapp/board/start_topic.tpl
===================================================================
--- app/views/groupapp/board/start_topic.tpl 2008-05-16 06:28:55 UTC (rev 210)
+++ app/views/groupapp/board/start_topic.tpl 2008-05-17 08:40:36 UTC (rev 211)
@@ -2,7 +2,8 @@
<?= $controller->renderErrors() ?>
-<form action="/groupapp/board/start_topic/{group.id?}" method="post">
+<div class="board_from_background">
+<form action="/groupapp/board/start_topic/{group_id?}" method="post">
<div class="editform">
<div class="formrow">
<label>_{Topic}:</label>
@@ -14,10 +15,12 @@
</div>
<div class="formrow">
<label>
- <?= $form_helper->hidden_field('topic', 'group_id', array('value' => $group->getId()))?>
+ <?= $form_helper->hidden_field('topic', 'group_id', array('value' => $group_id))?>
</label>
<input class="submitinput" type="submit" value="_{Create new Topic}">
<input class="cancelinput" type="button" value="_{Cancel}">
</div>
</div>
</form>
+</div>
+<div class="clearfix"></div>
Modified: public/stylesheets/groupapp/Board.css
===================================================================
--- public/stylesheets/groupapp/Board.css 2008-05-16 06:28:55 UTC (rev 210)
+++ public/stylesheets/groupapp/Board.css 2008-05-17 08:40:36 UTC (rev 211)
@@ -1,3 +1,7 @@
+.board_from_background {
+ background: #f7f7f7;
+}
+
.nodiscus {
font-size: 12px;
text-align: center;
@@ -9,16 +13,15 @@
}
.messages_list {
- padding-top: 10px;
float: left;
background: #ffffff;
width: 100%;
}
.messages_list .info {
- padding: 0px 10px 5px 20px;
- margin-bottom: 5px;
+ padding: 5px 10px 5px 20px;
text-align: right;
+ border-bottom: solid 1px #dddddd;
}
.messages_list .info .left {
@@ -27,7 +30,6 @@
}
.messages_list .container {
- border-top: solid 1px #dddddd;
background: #f7f7f7;
padding: 10px;
}
@@ -58,7 +60,7 @@
}
.messages_list .row {
- border-top: 1px solid #cccccc;
+ border-bottom: 1px solid #cccccc;
display: block;
padding: 10px;
}
@@ -96,14 +98,14 @@
background: #f7f7f7;
}
+.messages_list .row .message .body {
+ background: #ffffff;
+ padding: 10px 3px 10px 3px;
+}
+
.message .head .sender .current_user {
}
.message .head .sender .other_user {
font-weight: bold;
}
-
-.messages_list .row .message .body {
- background: #ffffff;
- padding: 10px 3px 10px 3px;
-}
\ No newline at end of file
Modified: timesheet/dim0s77.txt
===================================================================
--- timesheet/dim0s77.txt 2008-05-16 06:28:55 UTC (rev 210)
+++ timesheet/dim0s77.txt 2008-05-17 08:40:36 UTC (rev 211)
@@ -23,3 +23,5 @@
2008-05-15,10:20,12:20,groupapp,RT:3,"discussion board: topics list"
2008-05-15,18:35,21:15,groupapp,RT:3,"discussion board: reply to topic"
2008-05-15,21:15,22:00,groupapp,RT:3,"discussion board: reply to post"
+
+2008-05-17,10:50,11:40,groupapp,RT:3,"discussion board: reply to post"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fsn...@us...> - 2008-05-25 10:46:38
|
Revision: 220
http://isocial.svn.sourceforge.net/isocial/?rev=220&view=rev
Author: fsnobody
Date: 2008-05-25 03:46:46 -0700 (Sun, 25 May 2008)
Log Message:
-----------
album paginator
Modified Paths:
--------------
app/controllers/photoapp/album_controller.php
app/views/photoapp/album/index.tpl
app/views/photoapp/album/uploaded.tpl
public/stylesheets/photoapp/Album.css
timesheet/eerunov.txt
Modified: app/controllers/photoapp/album_controller.php
===================================================================
--- app/controllers/photoapp/album_controller.php 2008-05-23 17:14:09 UTC (rev 219)
+++ app/controllers/photoapp/album_controller.php 2008-05-25 10:46:46 UTC (rev 220)
@@ -5,12 +5,17 @@
var $models = array('photoapp', 'photoapp_album', 'photoapp_photo');
function index () {
- //$this->redirectTo(array('action' => 'show'));
- $this->my_albums = $this->PhotoappAlbum->find('all', array('conditions' => array('owner = ' . $this->current_user->getId())));
- if(is_array($this->my_albums))
- $this->count_albums = count($this->my_albums);
- else
- $this->count_albums = 0;
+
+ $_filter_pagination = array('items_per_page' => 5, 'count_conditions' => 'owner = ' . $this->current_user->getId() );
+
+ $this->album_pages = $this->pagination_helper->getPaginator($this->PhotoappAlbum, $_filter_pagination);// paginator
+
+ $_filter = array('conditions' => 'owner = ' . $this->current_user->getId());
+ $options = array_merge($_filter, $this->pagination_helper->getFindOptions($this->PhotoappAlbum));
+
+ $this->my_albums = $this->PhotoappAlbum->find('all', $options);
+
+
}
function view () {
Modified: app/views/photoapp/album/index.tpl
===================================================================
--- app/views/photoapp/album/index.tpl 2008-05-23 17:14:09 UTC (rev 219)
+++ app/views/photoapp/album/index.tpl 2008-05-25 10:46:46 UTC (rev 220)
@@ -14,14 +14,14 @@
<div class="clearfix"></div>
-<? if ($count_albums == 0) {?>
+<? if ($album_pages->getItemCount() == 0) {?>
<div class="noalbums">
_{You have no any album}.
</div>
<? } else {?>
<div class="album_list">
- _{Photo Albums}: <?= $count_albums?> <span>|</span> <a href="#" >_{Album Privacy}</a>
+ _{Photo Albums}: <?= $album_pages->getItemCount()?> <span>|</span> <a href="#" >_{Album Privacy}</a>
</div>
<div class="container">
{loop my_albums}
@@ -45,9 +45,15 @@
</div>
</div>
{end}
+
+ {?album_pages.links}
+ <span><?php echo translate('Showing page %page of %number_of_pages',array('%page'=>$album_pages->getCurrentPage(),'%number_of_pages'=>$album_pages->pages))?></span>
+ <div>{album_pages.links?}</div>
+ {end}
</div>
<div class="clearfix"></div>
+
<? }?>
<div class="clearfix"></div>
Modified: app/views/photoapp/album/uploaded.tpl
===================================================================
--- app/views/photoapp/album/uploaded.tpl 2008-05-23 17:14:09 UTC (rev 219)
+++ app/views/photoapp/album/uploaded.tpl 2008-05-25 10:46:46 UTC (rev 220)
@@ -17,7 +17,6 @@
{loop uploaded_photos}
<div class="photo_comment">
<div class="img">
-
<img src="/preview/index/100x100/<?= $uploaded_photo->get('img')?>" />
</div>
<div class="data">
Modified: public/stylesheets/photoapp/Album.css
===================================================================
--- public/stylesheets/photoapp/Album.css 2008-05-23 17:14:09 UTC (rev 219)
+++ public/stylesheets/photoapp/Album.css 2008-05-25 10:46:46 UTC (rev 220)
@@ -310,4 +310,8 @@
padding: 3px;
margin: 2px 3px;
text-align: center;
+}
+
+.paginationLink {
+ padding: 1px 2px;
}
\ No newline at end of file
Modified: timesheet/eerunov.txt
===================================================================
--- timesheet/eerunov.txt 2008-05-23 17:14:09 UTC (rev 219)
+++ timesheet/eerunov.txt 2008-05-25 10:46:46 UTC (rev 220)
@@ -16,3 +16,5 @@
2008-05-20,18:00,19:00,photoapp,RT:2,"edit photo - save cover to album,trouble in destroyPhoto when it is cover"
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,13:30.photoapp,RT:2,"album paginator"
+
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.
|
Thanks for helping keep SourceForge clean.
X