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

app/controllers/projects_controller.rb

@@ -659,14 +659,10 @@ class ProjectsController < ApplicationController
   # Delete @project
   def destroy
     @project_to_destroy = @project
-    if api_request? || params[:confirm]
+    @project_to_destroy.destroy
-      @project_to_destroy.destroy
+    respond_to do |format|
-      respond_to do |format|
+      format.html { redirect_to admin_projects_url }
-        format.html { redirect_to admin_projects_url }
+      format.api  { render_api_ok }
-        format.api  { render_api_ok }
-      end
-    else
-      render :layout => "base_projects"
     end
     # hide project in layout
     @project = nil

app/controllers/tags_controller.rb

@@ -244,13 +244,18 @@ class TagsController < ApplicationController
     @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type) unless @taggable_id.blank?
     @obj = get_object(@taggable_id,params[:taggableType]) unless @taggable_id.blank?
     if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
-      #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id,
+      if @course_id
-      if @rename_tag
+        course = Course.find @course_id
-        @taggings = ActsAsTaggableOn::Tagging.where(" `taggings`.`tag_id` = #{ @tag_id} AND `taggings`.`taggable_type` = 'Attachment' ")#find_by_tag_id_and_taggable_type(@tag_id,@taggable_type)
+        if course
-        @taggings.each { |t| t.update_attributes({:tag_id=> @rename_tag.id}) if t.tag_id != @rename_tag.id }
+          course.attachments.each do |attachment|
-        ActsAsTaggableOn::Tag.find(@tag_id).update_attributes(:name=>@rename_tag_name)#并且将该tag改名
+            taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,attachment.id,attachment.class)
-      else #如果不存在，那么就直接更新该tag名称为新的名称
+            if taggings
-        (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)
+              taggings.delete
+              attachment.tag_list.add(@rename_tag_name.split(","))
+              attachment.save
+            end
+          end
+        end
       end
     else
       if(@rename_tag.nil?) #这次命名的是新的tag

app/views/admin/projects.html.erb

@@ -65,7 +65,7 @@
             <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
             <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
             <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
-            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
+            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del', :onClick=>"delcfm()" ) %>
           </td>
         </tr>
     <% end %>
@@ -74,3 +74,11 @@
 </div>
 
 <% html_title(l(:label_project_plural)) -%>
+
+<script>
+    function delcfm() {
+        if (!confirm("删除项目会一并删除项目的关联信息，确认要删除吗？")) {
+            window.event.returnValue = false;
+        }
+    }
+</script>

app/views/files/index.html.erb

@@ -246,36 +246,63 @@
         tagId = id;
         taggableType = type;
         width = parseInt(domEle.css('width').replace('px','')) >=100 ?  parseInt(domEle.css('width').replace('px','')) : 100
-        domEle.html('<input name="" id="renameTagName" maxlength="<%=Setting.tags_max_length%>" minlength="<%= Setting.tags_min_length%>" style="width:'+width +'px;" value="'+name+'"/>');
+        domEle.html('<input name=""  id="renameTagName" maxlength="<%=Setting.tags_max_length%>" minlength="<%= Setting.tags_min_length%>" style="width:'+width +'px;" value="'+name+'"/>');
         domEle.parent().css("border","1px solid #ffffff");
         $("#renameTagName").focus();
     }
   //监听所有的单击事件
-   $(document.body).click(function(e){
+    $(function(){
-       isdb = false; //这是单击
+        $("#renameTagName").live("blur",function(){
-       node = document.elementFromPoint(e.clientX, e.clientY);
+            updateTagName();
-       if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+        }).live("keypress",function(e){
-           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
+            if (e.keyCode == '13') {
-           return;
+                updateTagName();
-       }
+            }
-           if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+        });
-               if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
+    });
-                   ele.parent().css("border","");
-                   ele.parent().html(tagNameHtml);
 
-               }else{ //否则就要更新tag名称了
+    //执行修改TAGName方法
-//                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
+    function updateTagName(){
-                          $.post(
+        if(isdb){
-                                    '<%= update_tag_name_path %>',
+            isdb = false;
-                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
+            if($("#renameTagName").val() == tagName){ //如果值一样，则恢复原来的状态
-                          )
+                ele.parent().css("border","");
-//                   }else{
+                ele.parent().html(tagNameHtml);
-//                       ele.parent().css("border","");
+
-//                       ele.parent().html(tagNameHtml);
+            }
-//                   }
+            else{
-               }
+                $.post(
-           }
+                        '<%= update_tag_name_path %>',
-   });
+                        {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
+                );
+            }
+        }
+    }
+//   $(document.body).click(function(e){
+//       isdb = false; //这是单击
+//       node = document.elementFromPoint(e.clientX, e.clientY);
+//       if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+//           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
+//           return;
+//       }
+//           if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+//               if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
+//                   ele.parent().css("border","");
+//                   ele.parent().html(tagNameHtml);
+//
+//               }else{ //否则就要更新tag名称了
+////                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
+//                          $.post(
+//                                    '<%= update_tag_name_path %>',
+//                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
+//                          )
+////                   }else{
+////                       ele.parent().css("border","");
+////                       ele.parent().html(tagNameHtml);
+////                   }
+//               }
+//           }
+//   });
    <%end %>
 
 </script>

public/stylesheets/prettify.css

@@ -44,12 +44,12 @@ pre li,ul,ol {
 
 /* Specify class=linenums on a pre to get line numbering */
 ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px;margin-left: 0px !important; } /* IE indents via margin-left */
-.list_style ol li {
+/*.list_style ol li {*/
-    list-style-type: decimal;
+    /*list-style-type: decimal;*/
-    margin-left: 10px !important;
+    /*margin-left: 10px !important;*/
-}
+/*}*/
 .linenums li {
-    margin-left: 0px !important;
+    margin-left: 5px !important;
 }
 li.L0,
 li.L1,