From d8a4e4d710582f0764558a4cbd15ba384f573346 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 11:33:52 +0800 Subject: [PATCH 1/7] =?UTF-8?q?issue=E5=BA=8F=E5=8F=B7=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20issue=E7=BC=A9=E8=BF=9B=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E5=90=8C=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 16 +++++++++++----- public/stylesheets/prettify.css | 3 +++ public/stylesheets/project.css | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 6edcdcc42..abc7017e6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150930011457) do +ActiveRecord::Schema.define(:version => 20150917022239) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -575,8 +575,6 @@ ActiveRecord::Schema.define(:version => 20150930011457) do t.integer "viewed" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "secret_key" - t.integer "status" end create_table "forums", :force => true do |t| @@ -785,6 +783,16 @@ ActiveRecord::Schema.define(:version => 20150930011457) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_details_copy", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -903,7 +911,6 @@ ActiveRecord::Schema.define(:version => 20150930011457) do t.datetime "updated_on", :null => false t.boolean "locked", :default => false t.integer "sticky", :default => 0 - t.integer "reply_id" end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" @@ -1369,7 +1376,6 @@ ActiveRecord::Schema.define(:version => 20150930011457) do t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.text "description" - t.string "subject" end create_table "taggings", :force => true do |t| diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css index 489f1959b..4ae3a5e0d 100644 --- a/public/stylesheets/prettify.css +++ b/public/stylesheets/prettify.css @@ -48,6 +48,9 @@ ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px;margin-left: 0px list-style-type: decimal; margin-left: 10px !important; } +.linenums li { + margin-left: 0px !important; +} li.L0, li.L1, li.L2, diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index fb6da363a..f769ff9e6 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -221,6 +221,7 @@ a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;} +.issue_desc li{list-style-type: decimal;margin-left: 20px;} .talk_info img {max-width:100%;} a.talk_edit{ color:#426e9a; margin-right:5px;} a:hover.talk_edit{ color:#ff5722;} From 0cd96f579e87a942193b41d658cdd03f244c0291 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 11:34:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 0eb779a23..76e178120 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -28,7 +28,7 @@ 'action_menu' %>
<% if @issue.description? || @issue.attachments.any? -%> -
+
<% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> From c8357a6364b40da04fac565b935d74725d6842ca Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 13:51:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/index.html.erb | 1 + public/javascripts/course.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 3825a9b09..ac0c50980 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -255,6 +255,7 @@ isdb = false; //这是单击 node = document.elementFromPoint(e.clientX, e.clientY); if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了 + isdb = true; // return; } if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态 diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 6102801df..3818d447d 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -752,7 +752,7 @@ function search_tag_attachment(url,tag_name,q,course_id,sort) //clearTimeout(clickFunction); clickFunction = setTimeout(function() { search_func() - }, 200); + }, 500); function search_func(){ if(isdb!= false ) return; $.get( From 7d04ce80d487a2f1f904811204fc1dc8189d5e14 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 13:56:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=20tag=E4=B8=BA=E5=8F=AF=E4=BB=A5=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=9A=84=E6=97=B6=E5=80=99=20=E6=98=AF=20=E6=89=8B?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index c6e9b27d3..11d38eb58 100644 --- a/public/stylesheets/courses.css +++ b/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作业评分*/ From 7cbee4cd5379ff6f5195374bb4439ed5e7c50048 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 14:11:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BC=96=E8=BE=91tag=E6=9C=89=E6=97=B6?= =?UTF-8?q?=E5=80=99=E4=B8=8D=E8=83=BD=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/tags_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 0ffa334c2..4f1a343d5 100644 --- a/app/controllers/tags_controller.rb +++ b/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) From e76f9a169e88d5f888618ec8507fdb58cc754c5b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 14:14:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index ac0c50980..6b1fdb2e9 100644 --- a/app/views/files/index.html.erb +++ b/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,则处于编辑状态 From 9291758ef4dd06da176b2c3b5b307aaf35f942f5 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 8 Oct 2015 14:24:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=88=B0tag?= =?UTF-8?q?=E4=B8=8A=E5=8F=98=E6=89=8B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_tag_yun.html.erb | 2 +- app/views/tags/_tag_list.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb index 6d3ebdf68..159384c6e 100644 --- a/app/views/files/_tag_yun.html.erb +++ b/app/views/files/_tag_yun.html.erb @@ -4,7 +4,7 @@ <%= k%>×<%= v%> <% else%> - <%= k%>×<%= v%> <% end%> diff --git a/app/views/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb index 49c9b2351..bc4a5b54e 100644 --- a/app/views/tags/_tag_list.html.erb +++ b/app/views/tags/_tag_list.html.erb @@ -2,8 +2,8 @@ <% if @tags.size > 0 %> <% @tags.each do |tag| %> - <%#= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> - <%= tag %> + <%#= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> + <%= tag %> <% case object_flag %> <% when '10' %>