diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index b725b9fc2..8c78c82a0 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -10,6 +10,7 @@ class TagsController < ApplicationController $selected_tags = Array.new $related_tags = Array.new + def index $selected_tags = [] @@ -25,7 +26,9 @@ class TagsController < ApplicationController @users_results = get_users_by_tag($selected_tags) @obj_id = params[:obj_id] - case params[:object_flag] + @show_flag = params[:object_flag] + + case @show_flag when '1' then @obj = User.find_by_id(@obj_id) when '2' then diff --git a/app/views/layouts/_tag_name.html.erb b/app/views/layouts/_tag_name.html.erb index b1670d2d3..6a54878ed 100644 --- a/app/views/layouts/_tag_name.html.erb +++ b/app/views/layouts/_tag_name.html.erb @@ -47,7 +47,7 @@ <% if @tags.size > 0 %> <% @tags.each do |tag| %>
- <%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %> + <%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %>
<% end %> <% end %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 928f8f9b5..c02beb45e 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -10,7 +10,7 @@ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> - + <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> @@ -19,40 +19,38 @@
-
- <%=render :partial => 'layouts/base_header'%> +
+ <%= render :partial => 'layouts/base_header'%>
- +
- -
-
- <% if @user == User.current %> - <%= render_menu :user_menu_self %> - <%else%> - <%= render_menu :user_menu %> - <%end%> -
- <%= yield %> - <%= call_hook :view_layouts_base_content %> -
- <%= render_flash_messages %> - + +
+
+ <% if @user == User.current %> + <%= render_menu :user_menu_self %> + <%else%> + <%= render_menu :user_menu %> + <%end%> +
+ <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+ <%= render_flash_messages %> +
- <%=render :partial => 'layouts/base_footer'%> -
+ <%= render :partial => 'layouts/base_footer'%> +
- +
- + <%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/layouts/left.html.erb b/app/views/layouts/left.html.erb new file mode 100644 index 000000000..0dfea4181 --- /dev/null +++ b/app/views/layouts/left.html.erb @@ -0,0 +1,16 @@ +
+ +
\ No newline at end of file diff --git a/app/views/layouts/right.html.erb b/app/views/layouts/right.html.erb new file mode 100644 index 000000000..206aebadb --- /dev/null +++ b/app/views/layouts/right.html.erb @@ -0,0 +1,15 @@ +
+

Search Results

+
+ <%= link_to "User",:action => "index"%>(<%= @issues_tags_num %>)| + <%= link_to "Project",:action => "index"%>(<%= @projects_tags_num %>) | + <%= link_to "Issue",:action => "index"%>(<%= @users_tags_num %>) | + <%= link_to "Bid",:action => "index"%> | + <%= link_to "All",:action => "index"%> +
+
+ + <%= render :partial => "tag_search_results",:locals => {:issues_results => @issues_results, + :projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag } %> +
+
\ No newline at end of file diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb index f1952964c..c5a427a61 100644 --- a/app/views/praise_tread/_praise_tread.html.erb +++ b/app/views/praise_tread/_praise_tread.html.erb @@ -1,17 +1,17 @@ -
+ <% if is_praise_or_tread(obj,user_id).size > 0 %> <%= image_tag("/images/praise.png") %> <%= link_to "#{l(:label_cancel_praise)}",:controller=>"praise_tread",:action=>"praise_minus",:remote=>true,:obj => obj %> - (<%= get_praise_num(obj)%>) + (<%= get_praise_num(obj)%>) <% else %> <%= image_tag("/images/tread.png") %> <%= link_to "#{l(:label_praise)}",:controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj => obj %> - (<%= get_praise_num(obj)%>) + (<%= get_praise_num(obj)%>) <% end %> -
+ <% if show_flag %> -
+ <%= link_to image_tag("/images/tread.png"),:controller=>"praise_tread", :action=>"tread_minus",:remote=>true,:obj => obj %>踩 -
+ <% end %> diff --git a/app/views/tags/_show_issues.html.erb b/app/views/tags/_show_issues.html.erb new file mode 100644 index 000000000..99a57c71e --- /dev/null +++ b/app/views/tags/_show_issues.html.erb @@ -0,0 +1,13 @@ +
+<% if issues_results.size > 0 %> +
+

Issues:

+ +<% issues_results.each do |issue| %> +
  • + 问题：<%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %> +
    • +<% end %> + +<% end %> +
    diff --git a/app/views/tags/_show_projects.html.erb b/app/views/tags/_show_projects.html.erb new file mode 100644 index 000000000..22b406ace --- /dev/null +++ b/app/views/tags/_show_projects.html.erb @@ -0,0 +1,16 @@ +
    +<% if projects_results.size > 0 %> +
    +

    Projects:

    + +<% projects_results.each do |project| %> +
  • + 项目名称：<%= link_to project.name,:controller => "projects",:action => "show",:id => project.id %> +
    + 项目描述：<%= project.description %>; + +
    • +<% end %> + +<% end %> +
    diff --git a/app/views/tags/_show_users.html.erb b/app/views/tags/_show_users.html.erb new file mode 100644 index 000000000..c049acc62 --- /dev/null +++ b/app/views/tags/_show_users.html.erb @@ -0,0 +1,15 @@ +
    +<% if users_results.size > 0 %> +
    +

    Users:

    + +<% users_results.each do |user| %> +
  • + 用户名：<%= link_to ("#{user.firstname+user.lastname}"), + :controller => "users",:action => "show",:id => user.id %> +
    + 用户邮箱：<%= mail_to(h(user.mail)) %> +
    • +<% end %> +<% end %> +
    \ No newline at end of file diff --git a/app/views/tags/_tag_search_results.html.erb b/app/views/tags/_tag_search_results.html.erb index 1d7b6d9b8..68f1f2014 100644 --- a/app/views/tags/_tag_search_results.html.erb +++ b/app/views/tags/_tag_search_results.html.erb @@ -1,36 +1,20 @@ \ No newline at end of file diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index ea851333c..da5ef55b7 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -9,6 +9,11 @@ float:right; } +
    \ No newline at end of file