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

app/controllers/git_usage_controller.rb

@@ -1,12 +0,0 @@
-#added by baiyu
-class GitUsageController < ApplicationController
-  layout "new_base"
-  def ch_usage
-    
-  end
-  
-  def en_usage
-    
-  end
-end
-#end

app/controllers/tags_controller.rb

@@ -246,7 +246,7 @@ class TagsController < ApplicationController
     if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
       #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id即可
       if @rename_tag
-        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
+        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_type)
         @taggings.update_attributes({:tag_id=>@rename_tag.id})
       else #如果不存在，那么就直接更新该tag名称为新的名称
         (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)

app/views/files/_tag_yun.html.erb

@@ -1,10 +1,11 @@
 <% unless tag_list.nil?%>
     <% tag_list.each do |k,v|%>
         <% if tag_name && tag_name == k%>
-            <span  >    <a href="javascript:void(0);" class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+            <!-- 鼠标不能移动是因为 href="javascript:void(0);"导致的 -->
+            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% else%>
         <span class="files_tag_icon" >
-          <a  title="单击为过滤含有该标签的文件，双击为修改该标签的名字"
+          <a  title="单击为过滤，双击可编辑"
               onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"
               ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>

app/views/files/index.html.erb

@@ -255,7 +255,7 @@
        isdb = false; //这是单击
        node = document.elementFromPoint(e.clientX, e.clientY);
        if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
-           isdb = true; //
+           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
            return;
        }
            if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态

app/views/repositories/show.html.erb

@@ -76,10 +76,7 @@
 <% end %>
 
 <!-- added by bai -->
-<p class="fb  c_dark mt10">查看如何提交代码：
+<p class="fb mt10"><a href="http://<%=Setting.host_name %>/forums/1/memos/1232" class=" c_blue ">点击查看如何提交代码</a></p>
-  <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %>
-  <%= link_to('English', en_usage_path, :class => "c_blue") %>
-
 <div class="cl"></div>
 
 <% content_for :header_tags do %>

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"> <%#= 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: pointer" > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
-      <a ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
+      <a title="双击可编辑" ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 	    <% when '10' %>

config/routes.rb

@@ -257,9 +257,6 @@ RedmineApp::Application.routes.draw do
   match 'welcome/contest',  :via => :get
   # end longjun
 
-  #added by baiyu
-  match 'git_usage/ch_usage',  :via => :get, :as => 'ch_usage'
-  match 'git_usage/en_usage',  :via => :get, :as => 'en_usage'
   #added by nie
   match '/projects/search',  :via => [:get, :post]
   match '/users/search', :via => [:get, :post]

public/stylesheets/courses.css

@@ -722,7 +722,7 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 .files_tag{ width:670px; min-height:22px;margin-bottom:10px;}/* overflow:hidden; */
 /*padding:1px 10px 修改原因，padding会导致内部输入框和外边框有边距*/
 a.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
-span.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
+span.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px;cursor: pointer }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #bbe2ef; padding:1px 1px; float:left; margin-right:10px;margin-bottom:10px;}/* padding:1px 10px;*/
 
 /* 20150423作业评分*/