From 4ceb0e8789edeb4db7d0565f2573e4239307bacc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 20 Oct 2014 14:39:39 +0800
Subject: [PATCH] =?UTF-8?q?#1289=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=85=A5?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E5=B9=B6=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E2=80=9C=E5=A2=9E=E5=8A=A0=E2=80=9D=E5=90=8E=EF=BC=8C=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE=E7=9A=84=E5=86=85=E5=AE=B9=E8=BF=98=E5=9C=A8=E6=96=87?=
=?UTF-8?q?=E6=9C=AC=E6=A1=86=E4=B8=AD=E7=9A=84BUG=20=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E6=96=B9=E6=A1=88=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE?=
=?UTF-8?q?=E5=90=8E=E5=A2=9E=E5=8A=A0js=E4=BB=A3=E7=A0=81=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=E8=BE=93=E5=85=A5=E6=A1=86=E5=86=85=E5=80=BC=E4=B8=BA?=
=?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/tags/_tag.html.erb | 35 ++++++++++++++++++++++-----------
app/views/users/tag_save.js.erb | 16 +++++++--------
2 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index b20b383ef..405f8f2e3 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -12,10 +12,16 @@
#end%>
<% if object_flag == '3' %>
- <%= image_tag("/images/sidebar/tags.png") %>
- <%= l(:label_tag) %>:
+
+ <%= image_tag("/images/sidebar/tags.png") %>
+
+
+ <%= l(:label_tag) %>:
+
<% if User.current.logged? %>
- <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %>
+
+ <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %>
+
<% end %>
@@ -36,7 +42,9 @@
<% elsif object_flag == '6' %>
<%#= image_tag("/images/sidebar/tags.png") %>
- <%= link_to (image_tag "/images/sidebar/add.png"), 'javascript:void(0);', :class => "tags_icona", :onclick=>"$('#put-tag-form-#{obj.class}-#{obj.id}').toggle(); readmore(this);" if User.current.logged? %>
+ <%= link_to (image_tag "/images/sidebar/add.png"), 'javascript:void(0);',
+ :class => "tags_icona",
+ :onclick=>"$('#put-tag-form-#{obj.class}-#{obj.id}').toggle(); readmore(this);" if User.current.logged? %>
<%#= toggle_link (image_tag "/images/sidebar/add.png"), "put-tag-form-#{obj.class}-#{obj.id}", {:focus => "put-tag-form-#{obj.class}-#{obj.id} #name"} if User.current.logged? %>
@@ -47,21 +55,24 @@
<%= render :partial => "courses/course_resources_html", :locals => {:obj => obj ,:object_flag => object_flag } %>
<% else %>
-
- <%= image_tag("/images/sidebar/tags.png") %>
- <%= l(:label_tag) %>:
-
+
+ <%= image_tag("/images/sidebar/tags.png") %>
+
+
+ <%= l(:label_tag) %>:
+
<% if User.current.logged? %>
- <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'tags_name'} %>
+
+ <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'tags_name'} %>
+
<% end %>
-
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
- :update => "tags_show",
- :complete => '$("#put-tag-form").hide();' do |f| %>
+ :update => "tags_show",
+ :complete => '$("#put-tag-form").hide();' do |f| %>
<%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
diff --git a/app/views/users/tag_save.js.erb b/app/views/users/tag_save.js.erb
index c406f32df..8c44fe19c 100644
--- a/app/views/users/tag_save.js.erb
+++ b/app/views/users/tag_save.js.erb
@@ -1,20 +1,18 @@
<% if @obj_flag == '3'%>
-
-$('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
- :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
+ $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+ :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
//$('#put-tag-form-issue').hide();
-$('#name-issue').val("");
+ $('#name-issue').val("");
<% elsif @obj_flag == '6'%>
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_name',
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
- //$("#put-tag-form-<%=@obj.class%>-<%=@obj.id%>").hide();
+ //$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide();
$("#put-tag-form-<%=@obj.class%>-<%=@obj.id%> #name").val("");
<% else %>
-
-$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
- :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
-$('#put-tag-form #name').val("");
+ $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+ :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>');
+ $('#tags_name').val("");
//$('#put-tag-form').hide();
<% end %>