about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-06 17:52:23 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-06 17:52:23 +0100
commit3824c588533f481011d2be19ff9476c001ffbee9 (patch)
tree96203d48ec3d8f54d69591d6b8616c9b4ac7a03b /app/views
parent831a187d74791a34270ecdc94df62bcc86dedd03 (diff)
Adding GNU Public license, adding home timeline, reblog/favourite counters
Diffstat (limited to 'app/views')
-rw-r--r--app/views/home/index.html.haml6
-rw-r--r--app/views/stream_entries/_status.html.haml21
2 files changed, 17 insertions, 10 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 11894d72c..068c34408 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,3 +1,3 @@
-Mastodon
-
-= link_to 'Logout', destroy_user_session_path, method: :delete
+.activity-stream.activity-stream-headless
+  - @statuses.each do |status|
+    = render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index a11da83a6..38986cf1f 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -14,13 +14,20 @@
 
     .entry__container__container
       .header
-        = link_to url_for_target(status.reblog? ? status.reblog.account : status.account), class: 'name' do
-          %strong= display_name(status.reblog? ? status.reblog.account : status.account)
-          = "@#{status.reblog? ? status.reblog.account.acct : status.account.acct}"
-        = link_to url_for_target(status.reblog? ? status.reblog : status), class: 'time' do
-          %span{ title: status.reblog? ? status.reblog.created_at : status.created_at }
-            = relative_time(status.reblog? ? status.reblog.created_at : status.created_at)
-
+        .header__left
+          = link_to url_for_target(status.reblog? ? status.reblog.account : status.account), class: 'name' do
+            %strong= display_name(status.reblog? ? status.reblog.account : status.account)
+            = "@#{status.reblog? ? status.reblog.account.acct : status.account.acct}"
+          = link_to url_for_target(status.reblog? ? status.reblog : status), class: 'time' do
+            %span{ title: status.reblog? ? status.reblog.created_at : status.created_at }
+              = relative_time(status.reblog? ? status.reblog.created_at : status.created_at)
+        .header__right
+          .counter-btn{ class: reblogged_by_me_class(status) }
+            %i.fa.fa-retweet
+            %span.counter-number= status.reblog? ? status.reblog.reblogs.count : status.reblogs.count
+          .counter-btn{ class: favourited_by_me_class(status) }
+            %i.fa.fa-star
+            %span.counter-number= status.reblog? ? status.reblog.favourites.count : status.favourites.count
       .content
         = status.reblog? ? (status.reblog.local? ? linkify(status.reblog) : status.reblog.content.html_safe) : (status.local? ? linkify(status) : status.content.html_safe)