Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#345: updated views

This commit is contained in:
Vokhmin Alexey V 2014-03-17 20:43:42 +04:00
parent c06245aa9f
commit 2cd612e733
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/home/partials/_git_new_push_notification.haml
View File

@ -1,21 +1,21 @@
-user= User.where(email: user_email).first || User.new(email: user_email) if defined?(user_email)
- name_with_owner = "#{project_owner}/#{project_name}"
.top
.image= link_to(image_tag(avatar_url(user, :small), alt: 'avatar'), user_path(user)) if user.try(:persisted?)
.text
%span
-_user_link = defined?(user_email) ? user_link(user, defined?(user_name) ? user_name : user_email) : nil
= raw t("notifications.bodies.#{change_type}_branch", {branch_name: branch_name, user_link: _user_link})
- name_with_owner = "#{project_owner}/#{project_name}"
= raw t("notifications.bodies.project", project_link: link_to(name_with_owner, project_path(name_with_owner)) )
.both
= datetime_moment activity_feed.created_at, tag: :span, class: 'date'
.both
%span.subject
- last_commits.each do |commit|
= link_to shortest_hash_id(commit[0]), commit_path(project_owner, project_name, commit[0])
= link_to shortest_hash_id(commit[0]), commit_path(name_with_owner, commit[0])
= commit[1]
%br
- if defined? other_commits
%br
=link_to t('notifications.bodies.more_commits', count: other_commits_count, commits: commits_pluralize(other_commits_count)),
diff_path(project_owner, project_name, diff: other_commits)
diff_path(name_with_owner, diff: other_commits)

4
app/views/home/partials/_new_comment_notification.haml
View File

@ -1,11 +1,11 @@
-user= User.where(email: user_email).first || User.new(email: user_email) if defined?(user_email)
- name_with_owner = "#{project_owner}/#{project_name}"
.top
.image= link_to(image_tag(avatar_url(user, :small), alt: 'avatar'), user_path(user)) if user.persisted?
.text
%span
= raw t("notifications.bodies.new_comment_notification.title", {user_link: user_link(user, user_name)})
= raw t("notifications.bodies.new_comment_notification.content", {issue_link: link_to(issue_title, project_issue_path(project_owner, project_name, issue_serial_id) + "#comment#{comment_id}")})
- name_with_owner = "#{project_owner}/#{project_name}"
= raw t("notifications.bodies.new_comment_notification.content", {issue_link: link_to(issue_title, project_issue_path(name_with_owner, issue_serial_id) + "#comment#{comment_id}")})
= raw t("notifications.bodies.project", project_link: link_to(name_with_owner, project_path(name_with_owner)) )
.both
= datetime_moment activity_feed.created_at, tag: :span, class: 'date'

4
app/views/home/partials/_new_issue_notification.haml
View File

@ -1,10 +1,10 @@
-user= User.where(email: user_email).first || User.new(email: user_email) if defined?(user_email)
- name_with_owner = "#{project_owner}/#{project_name}"
.top
.image= link_to(image_tag(avatar_url(user, :small), alt: 'avatar'), user_path(user)) if user.persisted?
.text
%span
= raw t("notifications.bodies.new_issue_notification", { user_link: user_link(user, user_name), issue_link: project_issue_path(project_owner, project_name, issue_serial_id)})
- name_with_owner = "#{project_owner}/#{project_name}"
= raw t("notifications.bodies.new_issue_notification", { user_link: user_link(user, user_name), issue_link: project_issue_path(name_with_owner, issue_serial_id)})
= raw t("notifications.bodies.project", project_link: link_to(name_with_owner, project_path(name_with_owner)) )
.both
= datetime_moment activity_feed.created_at, tag: :span, class: 'date'