p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

首页添加了竞赛所获奖项显示

This commit is contained in:
wanglinchun 2014-06-10 17:17:31 +08:00
parent a5b6883994
commit a40db3dc4b
4 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/views/welcome/contest.html.erb
View File

@ -138,7 +138,7 @@
<div style="clear:both"></div>
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" >
<h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_hot_contest)%></strong></h3>
<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
<div class="d-p-projectlist-box">
@ -179,37 +179,28 @@
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
<h3 style="margin-left: 5px; color: #e8770d;">
<strong><%=l(:label_issue_feedback_activities)%></strong>
<%= 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" }%>
<strong><%=l(:label_notification)%></strong>
</h3>
<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<% find_new_forum_topics(11).each do |topic|%>
<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
<div style="display: inline-block; width: 100%;">
<span class="memo_activity text_nowrap" style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= 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;" %>
</span>
<div class='memo_activity memo_attr'>
<span class='memo_timestamp'>
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
</span>
<span class="memo_author">
<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
</span>
<span class="memo_last_person">
<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
</span>
<span class="memo_reply">
<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
</span>
</div>
</div>
</li>
<% end %>
</ul>
<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
<div style="height: 400px; padding-top:6px;">
<fieldset style="padding-left: 36px; margin-left: 15px; height: 200px; width:380px; border-radius:5px;">
<div style="font-size:14px; color: #1166AD; padding-left:53px; ">2014年Android程序设计大赛获奖名单</div>
<div class="underline-contests_four"></div>
<marquee scrollamount=3 direction=up height=150 >
<div><span style="color: red">一等奖:</span>&nbsp<span style="color: blue">日记本</span></div>
<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
</marquee>
</fieldset>
</div>
</div>
@ -249,6 +240,43 @@
</div>
</div>
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
<h3 style="margin-left: 5px; color: #e8770d;">
<strong><%=l(:label_issue_feedback_activities)%></strong>
<%= 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" }%>
</h3>
<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<% find_new_forum_topics(11).each do |topic|%>
<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
<div style="display: inline-block; width: 100%;">
<span class="memo_activity text_nowrap" style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= 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;" %>
</span>
<div class='memo_activity memo_attr'>
<span class='memo_timestamp'>
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
</span>
<span class="memo_author">
<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
</span>
<span class="memo_last_person">
<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
</span>
<span class="memo_reply">
<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
</span>
</div>
</div>
</li>
<% end %>
</ul>
</div>
</div>
<div class="clearfix"></div>
<%= render partial: 'link_to_another' %>

1
config/locales/en.yml
View File

@ -1758,6 +1758,7 @@ en:
label_contact_us: Contact us
label_record: 湘ICP备09019772
label_check_comment: Check comment
label_notification: Notification
#end
# ajax异步验证

1
config/locales/zh.yml
View File

@ -1993,6 +1993,7 @@ zh:
label_contact_us: 联系我们
label_record: 湘ICP备09019772
label_check_comment: 查看通知评论
label_notification: 通知公告
#end
#end

6
public/stylesheets/application.css
View File

@ -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;
}