From a40db3dc4b9249b2898448a292d81bb54b56dad4 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Tue, 10 Jun 2014 17:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=89=80=E8=8E=B7=E5=A5=96=E9=A1=B9=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/views/welcome/contest.html.erb | 90 ++++++++++++++++++++---------- config/locales/en.yml | 1 + config/locales/zh.yml | 1 + public/stylesheets/application.css | 6 ++ 4 files changed, 67 insertions(+), 31 deletions(-) diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index e65e25304..e1578f673 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -138,7 +138,7 @@
-
+

<%=l(:label_current_hot_contest)%>

<%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %>
@@ -179,37 +179,28 @@

- <%=l(:label_issue_feedback_activities)%> - <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> - <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> + <%=l(:label_notification)%>

- <%= link_to l(:label_more_information), forums_path %> -
-
    - <% find_new_forum_topics(11).each do |topic|%> -
  • -
    -       - <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %> - -
    - - <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> - - - <%=l(:label_question_sponsor)%>: <%= link_to_user(topic.author) %> - - - <%=l(:label_final_reply)%>: <%=link_to_user topic.last_reply.try(:author) %> - - - <%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>) - -
    -
    -
    • - <% end %> -
+ <%#= link_to l(:label_more_information), forums_path %> +
+
+
2014年Android程序设计大赛获奖名单
+
+ +
一等奖: 日记本
+
二等奖:笔记本
+
三等奖:钢笔
+
一等奖:日记本
+
二等奖:笔记本
+
三等奖:钢笔
+
一等奖:日记本
+
二等奖:笔记本
+
三等奖:钢笔
+
一等奖:日记本
+
二等奖:笔记本
+
三等奖:钢笔
+ +
@@ -249,6 +240,43 @@
+
+

+ <%=l(:label_issue_feedback_activities)%> + <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> + <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> +

+ <%= link_to l(:label_more_information), forums_path %> +
+
    + <% find_new_forum_topics(11).each do |topic|%> +
  • +
    +       + <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %> + +
    + + <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> + + + <%=l(:label_question_sponsor)%>: <%= link_to_user(topic.author) %> + + + <%=l(:label_final_reply)%>: <%=link_to_user topic.last_reply.try(:author) %> + + + <%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>) + +
    +
    +
    • + <% end %> +
+
+
+ +
<%= render partial: 'link_to_another' %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 121810072..237ca03ee 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1758,6 +1758,7 @@ en: label_contact_us: Contact us label_record: 湘ICP备09019772 label_check_comment: Check comment + label_notification: Notification #end # ajax异步验证 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ad500d46c..30fbfe7f2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1993,6 +1993,7 @@ zh: label_contact_us: 联系我们 label_record: 湘ICP备09019772 label_check_comment: 查看通知评论 + label_notification: 通知公告 #end #end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index ba077555a..170c02186 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2751,6 +2751,12 @@ div.repos_explain{ border-bottom: 1px dashed rgb(204, 204, 204); width: 688px; } +.underline-contests_four{ + margin-bottom: 10px; + border-bottom: 1px dashed rgb(204, 204, 204); + width: 349px; + padding-bottom:5px +} .contest-star{ color: #bb0000; }