From 2bc849fa90080bd1225c1bc33c3bbe124224b4eb Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 13 Dec 2010 18:45:54 -0800
Subject: [PATCH] only show permalink if the post is infact public. also, make
destroy delete
---
app/views/shared/_stream_element.html.haml | 5 ++---
app/views/status_messages/show.html.haml | 2 +-
config/locales/diaspora/en.yml | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 91dac84c47..a3e235d787 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
%li.message{:data=>{:guid=>post.id}}
- =person_image_link(person, :size => :thumb_small)
+ = person_image_link(person, :size => :thumb_small)
.content
.from
@@ -24,7 +24,7 @@
- elsif person.owner_id == current_user.id
%span.arrow âž”
- =aspect_badge(aspects_with_post(aspects, post))
+ = aspect_badge(aspects_with_post(aspects, post))
= render 'status_messages/status_message', :post => post, :photos => photos
@@ -34,4 +34,3 @@
= comment_toggle(comments.length, @commenting_disabled)
= render "comments/comments", :post_id => post.id, :comment_hashes => comments, :condensed => true, :commenting_disabled => defined?(@commenting_disabled)
-
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 94f9327e7f..6a9c68bdc1 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -18,7 +18,7 @@
%hr
- = link_to t('.permalink'), post_path(@status_message)
+ = link_to t('.permalink'), post_path(@status_message) if @status_message.public
%br
- if current_user.owns? @status_message
= link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 4f42bb2610..a975340fa4 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -304,7 +304,7 @@ en:
tell_me_something_good: "tell me something good"
oh_yeah: "oh yeah!"
show:
- destroy: "Destroy"
+ destroy: "Delete"
permalink: "permalink"
helper:
no_message_to_display: "No message to display."
@@ -384,7 +384,7 @@ en:
create:
success: "Authentication successful."
destroy:
- success: "Successfully destroyed authentication."
+ success: "Successfully deleted authentication."
failure:
error: "there was an error connecting that service"
notifier:
--
GitLab