门户网站页面微调
This commit is contained in:
parent
929bb2bd70
commit
3700294890
|
@ -31,7 +31,6 @@ module WelcomeHelper
|
||||||
# board = find_board_by_topic(topic)
|
# board = find_board_by_topic(topic)
|
||||||
# find_project_by_board board
|
# find_project_by_board board
|
||||||
# end
|
# end
|
||||||
|
|
||||||
def find_all_hot_project
|
def find_all_hot_project
|
||||||
sort_project_by_hot
|
sort_project_by_hot
|
||||||
end
|
end
|
||||||
|
@ -67,11 +66,21 @@ module WelcomeHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def time_tag_welcome(time)
|
def time_tag_welcome time
|
||||||
text = distance_of_time_in_words(Time.now, time)
|
text = distance_of_time_in_words(Time.now, time)
|
||||||
content_tag('span', text, :title => format_time(time))
|
content_tag('span', text, :title => format_time(time))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def show_grade project
|
||||||
|
grade = 0
|
||||||
|
begin
|
||||||
|
grade = project.project_status.grade if project && project.project_status
|
||||||
|
rescue Exception => e
|
||||||
|
logger.error "[WelcomeHelper] ===> #{e}"
|
||||||
|
end
|
||||||
|
grade
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# def search_project
|
# def search_project
|
||||||
|
@ -108,6 +117,7 @@ module WelcomeHelper
|
||||||
def sort_contest_by_hot
|
def sort_contest_by_hot
|
||||||
sort_bid_by_hot_rails 2
|
sort_bid_by_hot_rails 2
|
||||||
end
|
end
|
||||||
|
|
||||||
#取得所有活动
|
#取得所有活动
|
||||||
def find_all_activities limit=5
|
def find_all_activities limit=5
|
||||||
# users = []
|
# users = []
|
||||||
|
@ -123,7 +133,8 @@ module WelcomeHelper
|
||||||
|
|
||||||
#取得论坛数据
|
#取得论坛数据
|
||||||
def find_hot_forum_topics limit=10
|
def find_hot_forum_topics limit=10
|
||||||
Memo.order('replies_count DESC').where('replies_count <> 0').limit(limit)
|
#Memo.order('replies_count DESC').where('replies_count <> 0').limit(limit)
|
||||||
|
Memo.order('replies_count DESC').where('parent_id IS NULL').limit(limit)
|
||||||
end
|
end
|
||||||
|
|
||||||
def sort_project_by_hot_rails project_type=0, order_by='grade DESC', limit=15
|
def sort_project_by_hot_rails project_type=0, order_by='grade DESC', limit=15
|
||||||
|
|
|
@ -120,7 +120,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right" style="float: right; margin-right: -10px; height: 445px; width: 50%; ">
|
<div class="right" style="float: right; margin-right: -10px; height: 445px; width: 50%; ">
|
||||||
<ul class="user-welcome-message-list" style="width: 80%; margin-top: 80px;">
|
<ul class="user-welcome-message-list" style="width: 80%; margin-top: 0px;">
|
||||||
<h3 style="margin-left: -5px;">用户动态</h3>
|
<h3 style="margin-left: -5px;">用户动态</h3>
|
||||||
<div class="user-message-box-list">
|
<div class="user-message-box-list">
|
||||||
<% find_all_activities.each do |event| %>
|
<% find_all_activities.each do |event| %>
|
||||||
|
@ -141,7 +141,6 @@
|
||||||
|
|
||||||
<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">
|
||||||
<h2>热门项目</h2>
|
<h2>热门项目</h2>
|
||||||
|
|
||||||
<div class="d-p-projectlist-box">
|
<div class="d-p-projectlist-box">
|
||||||
<ul class="d-p-projectlist">
|
<ul class="d-p-projectlist">
|
||||||
<% find_all_hot_project.map do |project| break if(project == find_all_hot_project[15]) %>
|
<% find_all_hot_project.map do |project| break if(project == find_all_hot_project[15]) %>
|
||||||
|
@ -151,10 +150,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="float: left; margin-left: 10px; width: 360px;">
|
<div style="float: left; margin-left: 10px; width: 360px;">
|
||||||
<p class="layout">
|
<p class="layout">
|
||||||
<%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{project.name}")%>
|
<%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :title => "#{project.name}")%>
|
||||||
|
<span style="display: inline-block; float: right; color: red; background: url('/images/score.png') no-repeat scroll ;background-position: left center;" title="项目得分"> <%= show_grade project %></span>
|
||||||
</p>
|
</p>
|
||||||
<p class="layout-1" >
|
<p class="layout-1" >
|
||||||
<span class="d-p-project-intro" ><%= project.description.truncate(50, omission: '...') %></span>
|
<!-- <span class="d-p-project-intro" ><%= project.description.truncate(50, omission: '...') %></span> -->
|
||||||
|
<%= content_tag "span", project.description.truncate(50, omission: '...'), :class => "d-p-project-intro" , :title => project.description %>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
@ -171,7 +172,7 @@
|
||||||
<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
|
<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
|
||||||
<li style="background-image:none;">
|
<li style="background-image:none;">
|
||||||
<p class="layout">
|
<p class="layout">
|
||||||
<%= link_to( contest.name, respond_path(contest.id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{contest.name}")%>
|
<%= link_to( contest.name, respond_path(contest.id), :class => "d-g-blue d-p-project-name", :title => "#{contest.name}")%>
|
||||||
</p>
|
</p>
|
||||||
<p class="layout-1" >
|
<p class="layout-1" >
|
||||||
<span class="d-p-project-intro"><%= contest.description.truncate(50, omission: '...') %></span>
|
<span class="d-p-project-intro"><%= contest.description.truncate(50, omission: '...') %></span>
|
||||||
|
@ -190,7 +191,7 @@
|
||||||
<% find_all_hot_bid.map do |bid| break if(bid == find_all_hot_bid[5]) %>
|
<% find_all_hot_bid.map do |bid| break if(bid == find_all_hot_bid[5]) %>
|
||||||
<li style="background-image:none;">
|
<li style="background-image:none;">
|
||||||
<p class="layout">
|
<p class="layout">
|
||||||
<%= link_to( bid.name, respond_path(bid.id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{bid.name}")%>
|
<%= link_to( bid.name, respond_path(bid.id), :class => "d-g-blue d-p-project-name", :title => "#{bid.name}")%>
|
||||||
</p>
|
</p>
|
||||||
<p class="layout-1" >
|
<p class="layout-1" >
|
||||||
<span class="d-p-project-intro"><%= bid.description.truncate(50, omission: '...') %></span>
|
<span class="d-p-project-intro"><%= bid.description.truncate(50, omission: '...') %></span>
|
||||||
|
@ -208,10 +209,11 @@
|
||||||
<% find_all_hot_course.map do |project| break if(project == find_all_hot_course[5]) %>
|
<% find_all_hot_course.map do |project| break if(project == find_all_hot_course[5]) %>
|
||||||
<li style="background-image:none;">
|
<li style="background-image:none;">
|
||||||
<p class="layout">
|
<p class="layout">
|
||||||
<%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :target => "_blank", :title => "#{project.name}")%>
|
<%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}")%>
|
||||||
</p>
|
</p>
|
||||||
<p class="layout-1" >
|
<p class="layout-1" >
|
||||||
<span class="d-p-project-intro"><%= project.description.truncate(50, omission: '...') %></span>
|
<span class="d-p-project-intro"><%= project.description.truncate(50, omission: '...') %></span>
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
|
@ -81,7 +81,7 @@ ul {
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.welcome-message-list{
|
ul.welcome-message-list{
|
||||||
margin-top: 80px;
|
margin-top: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.welcome-message-list h3, .user-welcome-message-list h3 {
|
.welcome-message-list h3, .user-welcome-message-list h3 {
|
||||||
|
|
Loading…
Reference in New Issue