[Isocial-svn] SF.net SVN: isocial: [201]

[<di...@us...>]

Revision: 201
          http://isocial.svn.sourceforge.net/isocial/?rev=201&view=rev
Author:   dim0s77
Date:     2008-05-14 03:34:38 -0700 (Wed, 14 May 2008)

Log Message:
-----------
added templates for replying to message and topic

Modified Paths:
--------------
    app/controllers/groupapp/board_controller.php
    app/locales/groupapp/board/ru.php
    app/views/groupapp/board/show_topic.tpl
    app/views/groupapp/board/start_topic.tpl
    timesheet/dim0s77.txt

Added Paths:
-----------
    app/views/groupapp/board/reply_to_post.tpl
    app/views/groupapp/board/reply_to_topic.tpl

Modified: app/controllers/groupapp/board_controller.php
===================================================================
--- app/controllers/groupapp/board_controller.php	2008-05-14 10:32:30 UTC (rev 200)
+++ app/controllers/groupapp/board_controller.php	2008-05-14 10:34:38 UTC (rev 201)
@@ -68,15 +68,15 @@
                                                                   '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)');
+                    $message =  $member->message->build();
+                    $message->setAttributes($this->params['topic']);
+                    if (empty($message->subject)) {
+                        $message->subject = $this->t('(no topic)');
                     }
-                    if ($topic->save()) {
-                        if (!$topic->topic_id) {
-                            $topic->topic_id = $topic->getId();
-                            if ($topic->save()) {
+                    if ($message->save()) {
+                        if (!$message->topic_id) {
+                            $message->topic_id = $message->getId();
+                            if ($message->save()) {
                                 $this->redirectTo(array('action' => 'show_topic', 'id' => $topic->getId()));
                                 return;
                             }
@@ -94,6 +94,17 @@
         }
     }
     
+
+    function reply_to_topic () {
+        if (!empty($this->params['id'])) {
+        }
+    }
+
+    function reply_to_post () {
+        if (!empty($this->params['id'])) {
+        }
+    }
+
 }
 
 ?>

Modified: app/locales/groupapp/board/ru.php
===================================================================
--- app/locales/groupapp/board/ru.php	2008-05-14 10:32:30 UTC (rev 200)
+++ app/locales/groupapp/board/ru.php	2008-05-14 10:34:38 UTC (rev 201)
@@ -24,6 +24,7 @@
 $dictionary['There are no discussions'] ='Обсуждений пока нет';
 
 $dictionary['Topic'] = 'Тема';
+$dictionary['Create new Topic'] = 'Создать новую тему';
 $dictionary['Delete Topic'] = 'Удалить тему';
 $dictionary['Reply to Topic'] = 'Ответить по теме';
 $dictionary['You'] = 'Вы';
@@ -32,7 +33,7 @@
 $dictionary['Reply'] = 'Ответить';
 $dictionary['to Your Post'] = 'себе';
 $dictionary['replies'] = 'ответов';
-$dictionary['Post'] = '';
+$dictionary['Post'] = 'Сообщение';
 $dictionary['Mark as Irrelevant'] = 'Пометить как неуместное';
 $dictionary['Delete Post'] = 'Удалить сообщение';
 $dictionary['Report'] = 'Пожаловаться';

Added: app/views/groupapp/board/reply_to_post.tpl
===================================================================
--- app/views/groupapp/board/reply_to_post.tpl	                        (rev 0)
+++ app/views/groupapp/board/reply_to_post.tpl	2008-05-14 10:34:38 UTC (rev 201)
@@ -0,0 +1,25 @@
+<?= $controller->renderPartial("head") ?>
+
+<?= $controller->renderErrors() ?>
+
+<form action="/groupapp/board/reply_to_post" 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>
+        {?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}">
+    </div>
+  </div>
+</form>

Added: app/views/groupapp/board/reply_to_topic.tpl
===================================================================
--- app/views/groupapp/board/reply_to_topic.tpl	                        (rev 0)
+++ app/views/groupapp/board/reply_to_topic.tpl	2008-05-14 10:34:38 UTC (rev 201)
@@ -0,0 +1,25 @@
+<?= $controller->renderPartial("head") ?>
+
+<?= $controller->renderErrors() ?>
+
+<form action="/groupapp/board/reply_to_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>
+        {?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}
+      </label>
+      <input class="submitinput" type="submit" value="_{Post}">
+      <input class="cancelinput" type="button" value="_{Cancel}">
+    </div>
+  </div>
+</form>

Modified: app/views/groupapp/board/show_topic.tpl
===================================================================
--- app/views/groupapp/board/show_topic.tpl	2008-05-14 10:32:30 UTC (rev 200)
+++ app/views/groupapp/board/show_topic.tpl	2008-05-14 10:34:38 UTC (rev 201)
@@ -8,7 +8,7 @@
   </div>
 
   <div class="menu_block right">
-    <a href="#">_{Delete Topic}</a> | <a href="#">_{Reply to Topic}</a>
+    <a href="/groupapp/board/reply_to_topic/{messages-0.topic_id?}">_{Reply to Topic}</a>
   </div>
 
 </div>
@@ -23,18 +23,18 @@
 
     <div class="actions">
       <ul class="actions_list">
-        <li><a href="/groupapp/">_{Reply} <? if ($current_user->getId() == $message->user_id) echo $text_helper->translate('to Your Post'); ?></a></li>
+        <li><a href="/groupapp/board/reply_to_post/{message.id?}">_{Reply} <? if ($current_user->getId() == $message->user_id) echo $text_helper->translate('to Your Post'); ?></a></li>
         <? if ($current_user->getId() != $message->user_id) { ?>
-        <li><a href="/groupapp/group/edit_info/{group.id?}">_{Mark as Irrelevant}</a></li>
-        <li><a href="/groupapp/group/edit_members/{group.id?}">_{Report}</a></li>
+        <li><a href="#">_{Mark as Irrelevant}</a></li>
+        <li><a href="#">_{Report}</a></li>
         <? } ?>
-        <li><a href="/groupapp/group/edit_members/{group.id?}">_{Delete Post}</a></li>
+        <li><a href="#">_{Delete Post}</a></li>
       </ul>
     </div>
 
     <div class="avatar">
       <a href="/profile/show/{message.user_id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a>
-      <div class="subtext">_{Post} #{message_loop_counter}</div>
+      <div class="subtext">#{message_loop_counter}</div>
       <input id="message_id{message.id?}" name="message_id{message.id?}" type="hidden" value="{message_loop_counter}" />
       <div class="subtext black">_{replies}: </div>
     </div>

Modified: app/views/groupapp/board/start_topic.tpl
===================================================================
--- app/views/groupapp/board/start_topic.tpl	2008-05-14 10:32:30 UTC (rev 200)
+++ app/views/groupapp/board/start_topic.tpl	2008-05-14 10:34:38 UTC (rev 201)
@@ -13,8 +13,10 @@
       <?= $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}">
+      <label>
+        {?topic.group_id}<input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" />{end}
+      </label>
+      <input class="submitinput" type="submit" value="_{Create new Topic}">
       <input class="cancelinput" type="button" value="_{Cancel}">
     </div>
   </div>

Modified: timesheet/dim0s77.txt
===================================================================
--- timesheet/dim0s77.txt	2008-05-14 10:32:30 UTC (rev 200)
+++ timesheet/dim0s77.txt	2008-05-14 10:34:38 UTC (rev 201)
@@ -16,3 +16,5 @@
 2008-05-09,12:00,15:00,groupapp,RT:3,"create template for topics"
 
 2008-05-13,16:30,17:40,groupapp,RT:3,"Add functionality to the 'show topic' tab"
+
+2008-05-14,12:40,13:35,groupapp,RT:3,"discussions for group (replying to topic)"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.