aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/inboxes/discussions/_form.html.haml2
-rw-r--r--app/views/inboxes/discussions/index.html.haml6
-rw-r--r--app/views/inboxes/discussions/show.html.haml6
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/inboxes/discussions/_form.html.haml b/app/views/inboxes/discussions/_form.html.haml
index 303f0bb..800004b 100644
--- a/app/views/inboxes/discussions/_form.html.haml
+++ b/app/views/inboxes/discussions/_form.html.haml
@@ -8,5 +8,5 @@
= j.label :body
%br
= j.text_area :body
-
+
%p= f.submit \ No newline at end of file
diff --git a/app/views/inboxes/discussions/index.html.haml b/app/views/inboxes/discussions/index.html.haml
index 86ae297..3d47a59 100644
--- a/app/views/inboxes/discussions/index.html.haml
+++ b/app/views/inboxes/discussions/index.html.haml
@@ -11,7 +11,7 @@
%td
= link_to discussion.users.collect{|u| u[Inboxes::config.user_name]}.join(', '), discussion
%td
- = discussion.unread_for?(current_user) ? "Yes" : "No"
-
+ = discussion.unread_for?(current_user) ? (discussion.count_unread_mess(current_user).to_s + ' сообщение') : "No"
+
%p
- = link_to "Create new", new_discussion_path \ No newline at end of file
+ = link_to "Create new", new_discussion_path
diff --git a/app/views/inboxes/discussions/show.html.haml b/app/views/inboxes/discussions/show.html.haml
index a910b51..50f5d19 100644
--- a/app/views/inboxes/discussions/show.html.haml
+++ b/app/views/inboxes/discussions/show.html.haml
@@ -16,13 +16,13 @@
= f.label :user_id, "Add speaker"
= f.collection_select :user_id, available_users, :id, :name
= f.submit "Add"
-
-
+
+
%h3 Messages
#messages_box
= render @discussion.messages, :as => :message
-
+
%h3 Add message
= render "inboxes/messages/form"