From aa4596e1705acd9dfe2793b0b465b1d820e818f1 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Thu, 28 Nov 2013 17:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/welcome_helper.rb | 20 +++++++++++++++++ app/views/welcome/index.html.erb | 37 ++++++++++++++++++++----------- public/images/list-icon.png | Bin 0 -> 2867 bytes public/stylesheets/welcome.css | 11 ++++++--- 4 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 public/images/list-icon.png diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 03900753b..ea34c8aad 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -47,6 +47,26 @@ module WelcomeHelper def find_all_hot_contest sort_contest_by_hot end + + def find_all_event_type event + case event.event_type + when 'news' + '新闻' + when 'issue' + '缺陷' + when 'attachment' + '附件' + when 'message' + '主题' + when 'reply' + '回复' + when 'bid' + '众包' + else + event.event_type + end + end + def time_tag_welcome(time) text = distance_of_time_in_words(Time.now, time) content_tag('span', text, :title => format_time(time)) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 698e5c7b7..2e645ddbf 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -98,16 +98,21 @@
-
    +

      论坛热帖

      <% find_hot_forum_topics.each do |topic|%> -
    • - <%= link_to topic.subject.truncate(30, omission: '...'), forum_memo_path(topic.forum_id,topic.id) %> +
    • +
      + +
      +
      + <%= link_to topic.subject.truncate(30, omission: '...'), forum_memo_path(topic.forum_id,topic.id), :class => "gray" %> <%= link_to topic.author, user_path(topic.author) %> <%= time_tag_welcome topic.created_at %>前 +
      • <% end %>
      @@ -120,13 +125,13 @@
      <% find_all_activities.each do |event| %>
    • -
      +
      <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
      -
      - <%= link_to event.event_author, user_path(event.event_author), :style => "color:green;" %> 发表了<%= event.event_type %>：<%= link_to truncate(event.event_description, length: 30, omission:'...'), event.event_url %> +
      + <%= link_to event.event_author, user_path(event.event_author), :style => "color:green;" %> 发表了<%= find_all_event_type event %>：<%= link_to truncate(event.event_description, length: 30, omission:'...'), event.event_url %> -

      <%= time_tag_welcome event.event_datetime %>前      +

      <%= time_tag_welcome event.event_datetime %>前     

      • <% end %> @@ -141,13 +146,19 @@
        <% find_all_hot_project.map do |project| break if(project == find_all_hot_project[15]) %>
      • -

        - <%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{project.name}")%> -

        -

        - <%= project.description.truncate(50, omission: '...') %> -

        +
        + <%= image_tag url_to_avatar(project), :class => "avatar-4" %> +
        +
        +

        + <%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{project.name}")%> +

        +

        + <%= project.description.truncate(50, omission: '...') %> +

        +
        • + <% end %>
      diff --git a/public/images/list-icon.png b/public/images/list-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..930d6aae0323c7ff5125b08b9dd7e1a48524b958 GIT binary patch literal 2867 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