diff options
| author | Augier <contact@c-henry.fr> | 2016-09-24 17:15:38 +0300 |
|---|---|---|
| committer | Dennis Schubert <mail@dennis-schubert.de> | 2016-09-25 04:12:31 +0300 |
| commit | a37d9d532b7cbb6b1dea6fdc13a0570abde30487 (patch) | |
| tree | a5a06a5aace74d2532eeea7c0bb29b4b846231fb /app/views | |
| parent | 523f1e848ec3373313fc781200b0ea3ba0cad1ee (diff) | |
Fix some pronto remarks
closes #7119
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/notifications/_notification.haml | 3 | ||||
| -rw-r--r-- | app/views/notifications/index.mobile.haml | 2 | ||||
| -rw-r--r-- | app/views/people/_index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/photos/show.mobile.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_post_info.mobile.haml | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/app/views/notifications/_notification.haml b/app/views/notifications/_notification.haml index 5c9207d9c..8c537bdc0 100644 --- a/app/views/notifications/_notification.haml +++ b/app/views/notifications/_notification.haml @@ -1,4 +1,5 @@ -.media.stream-element{:data=>{:guid => note.id, :type => (Notification.types.key(note.type) || '') }, :class => (note.unread ? 'unread' : 'read')} +.media.stream-element{data: {guid: note.id, type: (Notification.types.key(note.type) || "")}, + class: (note.unread ? "unread" : "read")} .unread-toggle.pull-right %i.entypo-eye{title: (note.unread ? t("notifications.index.mark_read") : t("notifications.index.mark_unread"))} - if note.type == "Notifications::StartedSharing" && (!defined?(no_aspect_dropdown) || !no_aspect_dropdown) diff --git a/app/views/notifications/index.mobile.haml b/app/views/notifications/index.mobile.haml index 6b6d67c3a..d53a7db55 100644 --- a/app/views/notifications/index.mobile.haml +++ b/app/views/notifications/index.mobile.haml @@ -14,7 +14,7 @@ = locale_date(date) %ul.notifications_for_day - notes.each do |note| - .stream-element{data: {guid: note.id}, class: "#{note.unread ? "unread" : "read"}"} + .stream-element{data: {guid: note.id}, class: (note.unread ? "unread" : "read")} .content.from .media .media-left diff --git a/app/views/people/_index.html.haml b/app/views/people/_index.html.haml index 813cebe52..3980b16d7 100644 --- a/app/views/people/_index.html.haml +++ b/app/views/people/_index.html.haml @@ -1,6 +1,6 @@ #people_stream - people.each do |person| - .media.stream-element{:id => person.id} + .media.stream-element{id: person.id} .media-object.pull-left = person_image_link(person, :size => :thumb_small) .media-body diff --git a/app/views/photos/show.mobile.haml b/app/views/photos/show.mobile.haml index 0d5e3ec8c..69d2a96f9 100644 --- a/app/views/photos/show.mobile.haml +++ b/app/views/photos/show.mobile.haml @@ -8,7 +8,7 @@ #show_content.photos .photo = image_tag photo.url(:scaled_full) - .stream-element{:class => "photo_mobile"} + .stream-element.photo_mobile .content .from.media .media-left diff --git a/app/views/shared/_post_info.mobile.haml b/app/views/shared/_post_info.mobile.haml index 03caf1beb..e5548d3a8 100644 --- a/app/views/shared/_post_info.mobile.haml +++ b/app/views/shared/_post_info.mobile.haml @@ -21,7 +21,7 @@ = timeago(post.created_at) %span.via - if post.provider_display_name == "mobile" - = t('shared.stream-element.via_mobile', link: nil) + = t("shared.stream_element.via_mobile", link: nil) – %span.scope_scope - if post.public? |