diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ac0165f79..97e76a0c9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1378,6 +1378,39 @@ module ApplicationHelper
html.html_safe
end
+#display bid project
+ def show_more_bid_project?(bid)
+ if bid.projects.where('is_public = 1').count > 12
+ return true
+ else
+ return false
+ end
+ end
+
+ def show_bid_project(bid)
+ html = ''
+ if bid.projects.where('is_public = 1').count == 0
+ html << (content_tag "p", l(:label_no_bid_project), :class => "font_lighter")
+ else
+ bid.projects.where('is_public = 1').take(12).each do |project|
+ html << (link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar")
+ end
+ end
+ html.html_safe
+ end
+
+ def show_bid_fans_picture(obj)
+ html = ''
+ if obj.watcher_users.count == 0
+ html << (content_tag "span", l(:label_project_no_follow))
+ else
+ obj.watcher_users.take(12).each do |user|
+ html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => user.name)
+ end
+ end
+ html.html_safe
+ end
+
#display fans picture
def show_more_fans?(obj)
if obj.watcher_users.count > 12
@@ -1389,23 +1422,19 @@ module ApplicationHelper
def show_fans_picture(obj)
html = ''
- count = 0
if obj.watcher_users.count == 0
html << (content_tag "span", l(:label_no_current_fans))
+ else
+ obj.watcher_users.take(12).each do |user|
+ html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => user.name)
+ end
end
- for user in obj.watcher_users
- html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.show_name}")
- count = count + 1
- if count >= 12
- break
- end
- end
html.html_safe
end
# added by bai
def show_more_participate?(obj)
- if obj.join_in_contests.count > 0
+ if obj.join_in_contests.count > 12
return true
else
return false
@@ -1427,6 +1456,7 @@ module ApplicationHelper
end
html.html_safe
end
+
#end
# add by huang
diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb
index 6663ab6e2..dafec4d77 100644
--- a/app/views/bids/_list_projects.html.erb
+++ b/app/views/bids/_list_projects.html.erb
@@ -32,15 +32,15 @@
<%= link_to(b_project.project.name, project_path(b_project.project)) %>
-
+
<% if @bid.reward_type == 2 %>
- <%= l(:label_join_contest)%>
+ <%= l(:label_joined_contest)%>
<% end %>
<% if @bid.reward_type == 1 %>
<%= l(:label_join_bidding)%>
<% end %>
-
+
|
diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb
index 57aabf2b4..6cd3df16e 100644
--- a/app/views/bids/contest.html.erb
+++ b/app/views/bids/contest.html.erb
@@ -30,7 +30,7 @@
-<%= sort_contest(@s_state)%>
+
-
+<% if @bids.size > 0%>
+<%= sort_contest(@s_state)%>
<%= render :partial => 'contest_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
+<% else %>
+ <%= render :partial => "layouts/no_content"%>
+<% end %>
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb
index 4c1daec49..bf405e6b5 100644
--- a/app/views/bids/index.html.erb
+++ b/app/views/bids/index.html.erb
@@ -27,27 +27,12 @@
<% end %>
-
-
-
-
- <%= sort_bid(@s_state, @project_type)%>
-
-
-
-
+ <% if @bids.size > 0 %>
- <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
+ <%= sort_bid(@s_state, @project_type)%>
+ <%= render :partial => 'bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
+ <% else %>
+ <%= render :partial => "layouts/no_content"%>
+ <% end %>
diff --git a/app/views/bids/show_bid_user.html.erb b/app/views/bids/show_bid_user.html.erb
index 2fd6205d0..f4d7b2642 100644
--- a/app/views/bids/show_bid_user.html.erb
+++ b/app/views/bids/show_bid_user.html.erb
@@ -1,5 +1,5 @@
- <% for user in @users %>
+ <% for user in @bid.watcher_users %>
-
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index f6546778a..dc7c97b36 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -24,5 +24,8 @@
-
-<%= render :partial => 'forums/forum_list', :locals => {:forums => @forums} %>
+<% if @forums.size > 0 %>
+ <%= render :partial => 'forums/forum_list', :locals => {:forums => @forums} %>
+<% else %>
+ <%= render :partial => "layouts/no_content" %>
+<% end %>
diff --git a/app/views/layouts/_no_content.html.erb b/app/views/layouts/_no_content.html.erb
new file mode 100644
index 000000000..990b85bae
--- /dev/null
+++ b/app/views/layouts/_no_content.html.erb
@@ -0,0 +1,10 @@
+
+
没有搜索到相关的内容!
+
+ 建议您 :
+ - 重新设置搜索关键词
+ - 不要使用太长的关键词
+ - 不要使用特殊符号,如"^&%$#@*%"等
+ - 清除关键词之间的空格
+
+
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index 44245fc9c..cbc2173b1 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -21,20 +21,19 @@
<%=render :partial => 'layouts/base_header'%>
-
- 创新竞赛社区 |
- <%= l(:label_user_location) %> : |
+ 创新竞赛社区 |
+ <%= l(:label_user_location) %> : |
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
- <%= text_field_tag 'name', params[:name], :size => 20 %>
- <%= hidden_field_tag 'reward_type', @bid.reward_type %>
- <%= hidden_field_tag 'project_type', params[:project_type] %>
- <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+ <%= text_field_tag 'name', params[:name], :size => 20 %>
+ <%= hidden_field_tag 'reward_type', @bid.reward_type %>
+ <%= hidden_field_tag 'project_type', params[:project_type] %>
+ <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
|
@@ -46,9 +45,7 @@
-
-
+
+
<% if display_main_menu?(@bid) %>
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index b3f5c22ea..2915c032f 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -1,36 +1,6 @@
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
<% end %>
-
-
-
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
<% if params[:project_type] == "1" %>
@@ -85,10 +55,13 @@
<% end %>
-
+<% if @projects.size == 0 %>
+<%= render :partial => 'layouts/no_content'%>
+<% else %>
<%= render_project_hierarchy(@projects)%>
+<% end %>