diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index beecef3f1..329f84742 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -82,7 +82,7 @@ module WelcomeHelper ': '.html_safe << link_to(truncate(strip_tags(event.event_description).gsub(/ /,''), length: 30, omission:'...'), event.event_url, :target => "_blank" ) when 'attachment' - str << content_tag('span', '上传了') << content_tag('span', find_all_event_type(event)) << ': '.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) << link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container)) + str << content_tag('span', '上传了') << content_tag('span', find_all_event_type(event)) << ': '.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) << link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container), :class => "attachments_list_color") else str << content_tag("span", "更新了") << content_tag("span", find_all_event_type(event)) << ': '.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url, :target => "_blank" ) end diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 5c680ce9b..e212617f8 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -69,7 +69,7 @@ <%= h @bid.name %> - <% if ( !(User.current.member_of? @project) && User.current.login?) %> + <% if User.current.login? %> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %> diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 5dc4e7574..b62ef96fc 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -60,7 +60,7 @@ <%= h @bid.name %> - <% if ( !(User.current.member_of? @project) && User.current.login?) %> + <% if User.current.login? %> <%= join_in_contest(@bid, User.current)%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index ddd7293ac..2b4412bc6 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -135,9 +135,10 @@
<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
+
<%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank" %><%= show_user_content event %> -

<%= time_tag_welcome event.event_datetime %>前     <%= show_event_reply event %>

+

<%= time_tag_welcome event.event_datetime %>     <%= show_event_reply event %>

<% end %> diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index 6af69a6eb..9204fbc75 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -317,3 +317,6 @@ div#tooltip::after { border-bottom: 1px solid #FFFFFF; border-right: 1px solid #FFFFFF; } +a.attachments_list_color { + color: green; +}