From 272d9fa527eb17b6cc8be910ed48be57a700cd69 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 23 Sep 2015 11:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=9A=84=E6=A0=87=E7=AD=BE?=
=?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/tags_controller.rb | 2 +
app/views/files/index.html.erb | 3 +-
app/views/forums/_forum_tag_list.html.erb | 5 ++-
app/views/layouts/base_forums.html.erb | 50 +++++++++++++++++++++++
app/views/tags/update_tag_name.js.erb | 2 +
5 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 7dc647911..0ffa334c2 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -300,6 +300,8 @@ class TagsController < ApplicationController
@containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
show_attachments @containers
+ elsif @obj && @obj_flag == '5'
+ @forum = @obj
end
respond_to do |format|
format.js
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 537a7a0dc..489c0357d 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -242,7 +242,8 @@
ele = domEle;
tagId = id;
taggableType = type;
- domEle.html('');
+ width = parseInt(domEle.css('width').replace('px','')) >=100 ? parseInt(domEle.css('width').replace('px','')) : 100
+ domEle.html('');
domEle.parent().css("border","1px solid #ffffff");
$("#renameTagName").focus();
}
diff --git a/app/views/forums/_forum_tag_list.html.erb b/app/views/forums/_forum_tag_list.html.erb
index c0efbe4b9..2a0257d63 100644
--- a/app/views/forums/_forum_tag_list.html.erb
+++ b/app/views/forums/_forum_tag_list.html.erb
@@ -1,7 +1,8 @@
<% forum.tag_list.each do |tag|%>
- <%= tag %>
+ <%= tag %>
<%if forum.creator.id == User.current.id%>
- ×
+ ×
<% end %>
+
<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 8d2fcd7d9..79341d458 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -66,12 +66,62 @@
'<%= add_forum_tag_forum_path(@forum)%>' + "?tag_str=" + $("input[name='addTag']").val(),
{}
);
+ $("input[name='addTag']").val('');
}else{
alert("标签名字长度不能超过14个字符");
}
}
}
}
+
+ var tagNameHtml; //当前双击的链接的父节点的html
+ var tagName; //标签的值
+ var parentCssBorder; //当前双击的链接的父节点
+ var ele; //当前双击的链接
+ var taggableId; //标签的id
+ var taggableType; //被标签的类型
+ //这里renameTag有两种情况，一种是改变某个资源的tag名称。如果其他资源也有这个tag。则新增一个改变后的tag名
+ //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
+ //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
+ function rename_tag(domEle,name,id,type){
+ if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动
+ return;
+ }
+ tagNameHtml = domEle.parent().html()
+ tagName = name;
+ parentCssBorder = domEle.parent().css("border");
+ ele = domEle;
+ taggableId = id;
+ taggableType = type;
+ width = parseInt(domEle.css('width').replace('px','')) >=100 ? parseInt(domEle.css('width').replace('px','')) : 100
+ domEle.html('');
+ domEle.parent().css("border","1px solid #ffffff");
+ $("#renameTagName").focus();
+ }
+ //监听所有的单击事件
+ $(document).click(function(e){
+ node = document.elementFromPoint(e.clientX, e.clientY);
+ if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+ 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": taggableId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim()}
+ )
+ }else{
+ ele.parent().css("border","");
+ ele.parent().html(tagNameHtml);
+ }
+ }
+ }
+ });
diff --git a/app/views/tags/update_tag_name.js.erb b/app/views/tags/update_tag_name.js.erb
index 276c050b8..ec81e7cbc 100644
--- a/app/views/tags/update_tag_name.js.erb
+++ b/app/views/tags/update_tag_name.js.erb
@@ -40,6 +40,8 @@ $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_nam
$('#tags_name').val("");
<% elsif @obj_flag == '10'%>
//$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide();
+<% elsif @obj_flag == '5'%>
+ $('#forum_tag_list').html('<%= escape_javascript(render :partial=>'forums/forum_tag_list',:locals=>{:forum=>@forum})%>')
<% else%>
$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');