Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/files/_course_list.html.erb

@@ -55,7 +55,8 @@
             </div>
             <div class="cl"></div>
             <div class="tag_h">
-              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+              <!-- container_type = 1 代表是课程里的资源 -->
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name,:container_type=>'1'} %>
               <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
             </div>
             <div class="cl"></div>

app/views/files/_project_file_list.html.erb

@@ -44,7 +44,8 @@
         </div>
         <div class="cl"></div>
         <div class="tag_h">
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+          <!-- container_type = 2 代表是项目里的资源 -->
+          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:container_type=>'2'} %>
           <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
         </div>
         <div class="cl"></div>

app/views/tags/_tag_list.html.erb

@@ -2,8 +2,8 @@
 
 <% if @tags.size > 0 %>
     <% @tags.each do |tag| %>
-	<span class="re_tag f_l" style="cursor: pointer" > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
+	<span class="re_tag f_l" style="cursor:<%= container_type == '1' ? 'pointer' :'default' %> " > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
-      <a title="双击可编辑" ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
+      <a title="<%= container_type == '1' ? '双击可编辑' : '' %> " ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 	    <% when '10' %>

app/views/tags/_tag_new.html.erb

@@ -22,7 +22,7 @@
   <% elsif object_flag == '6' %>
       <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
         <% tag_name ||= ""%>
-        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name} %>
+        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name,:container_type=>container_type} %>
       </div>
       <div id="put-tag-form-<%=obj.class%>-<%=obj.id%>" style="display: none;height: 100px;">
         <%= render :partial => "courses/course_resources_html", :locals => {:obj => obj ,:object_flag => object_flag } %>

app/views/users/_project_issue.html.erb

@@ -10,7 +10,7 @@
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
-        <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15"%>
+        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle break_word">
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>