From 10e644f9be919c2f0a6ba9e52e2a66ca19ff1b33 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 31 Oct 2016 15:12:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E6=8F=8F=E8=BF=B0=E6=8A=98=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_file_description.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/files/_file_description.html.erb b/app/views/files/_file_description.html.erb index bb838d415..e5cddec0b 100644 --- a/app/views/files/_file_description.html.erb +++ b/app/views/files/_file_description.html.erb @@ -1,5 +1,5 @@ -

')> - 资源描述：<% if file.description.blank? %>双击添加描述<% else %><%= file.description %><% end %> - <%#= file.description.blank? ? "该资源暂无描述" : file.description %> - <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%> +

')> + 资源描述：<% if file.description.blank? %>双击添加描述<% else %><%= file.description %><% end %> + <%#= file.description.blank? ? "该资源暂无描述" : file.description %> + <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%>

\ No newline at end of file From 1d8bd03678388de44233b9971525e4a99776137d Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 31 Oct 2016 15:22:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E7=A2=91=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E6=88=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/versions/_new_milestone.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/versions/_new_milestone.html.erb b/app/views/versions/_new_milestone.html.erb index 33c2fb9ad..0fbbb4f03 100644 --- a/app/views/versions/_new_milestone.html.erb +++ b/app/views/versions/_new_milestone.html.erb @@ -12,13 +12,13 @@ <%#= labelled_form_for @version, :html => {:id => "popub_new_project_version_form", :remote => true, :is_setting => true, :is_index => params[:is_index] } do |f| %> From b3abe74bf506f8bec971abc5b8afa490c9a6b496 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 31 Oct 2016 15:40:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91title=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 3a585afa1..f8769e799 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -944,7 +944,7 @@ p.pro_new_grey{ line-height: 1.9; } .undis {display:none;} .dis {display:block;} .new_roadmap_listbox{ padding:15px;border-bottom:1px solid #dbdbdb;} -.new_roadmap_listtitle a{ color: #333;display:block;max-width:840px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} +.new_roadmap_listtitle a{ color: #333;display:block;max-width:800px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .new_roadmap_listtitle a:hover{ color:#3498db;} .new_roadmap_list_txt{ color: #666;} .new_roadmap_list_txt li{ float: left; margin-right: 10px;} From e65f9bd98b42d9e9dbae23a2d3bc263a2822f2c3 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 31 Oct 2016 15:56:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?issue=E5=A4=9A=E7=BA=A7=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 4 ++-- .../projects/_project_issue_contents.html.erb | 13 +++++-------- db/schema.rb | 18 +++++++----------- public/stylesheets/css/public.css | 3 ++- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Gemfile b/Gemfile index 592d10c10..a5aee62c2 100644 --- a/Gemfile +++ b/Gemfile @@ -50,10 +50,10 @@ gem 'elasticsearch-model' gem 'elasticsearch-rails' #rails 3.2.22.2 bug - #gem "test-unit", "~>3.0" + gem "test-unit", "~>3.0" ### profile -# gem 'oneapm_rpm' + gem 'oneapm_rpm' group :development do gem 'grape-swagger' diff --git a/app/views/projects/_project_issue_contents.html.erb b/app/views/projects/_project_issue_contents.html.erb index df1f91ae4..cc7a2be16 100644 --- a/app/views/projects/_project_issue_contents.html.erb +++ b/app/views/projects/_project_issue_contents.html.erb @@ -7,20 +7,17 @@ <% parents_rely = get_reply_parents parents_rely, comment %> <% length = parents_rely.length %>
- <% if length <= 3 %> + <% if length <= 2 %> <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => comment.parent} %> <% else %>
-
- <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => parents_rely[length - 1]} %> -
- <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 2]} %> + <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 1]} %>
-
+
↓ - - <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %> + 已经隐藏<%=(length - 2).to_s %>个楼层 + <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class), :remote=>true, :class => 'linkBlue2' %>
<%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[0]} %>
diff --git a/db/schema.rb b/db/schema.rb index ffb4cc9a8..3bf495cd9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -325,16 +325,14 @@ ActiveRecord::Schema.define(:version => 20161028053000) do add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false + t.integer "repository_id", :null => false + t.string "revision", :null => false t.string "committer" - t.datetime "committed_on", :null => false + t.datetime "committed_on", :null => false t.text "comments" t.date "commit_date" t.string "scmid" t.integer "user_id" - t.integer "project_id" - t.integer "type", :default => 0 end add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" @@ -995,10 +993,6 @@ ActiveRecord::Schema.define(:version => 20161028053000) do t.datetime "updated_at", :null => false end - create_table "innodb_monitor", :id => false, :force => true do |t| - t.integer "a" - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1462,9 +1456,11 @@ ActiveRecord::Schema.define(:version => 20161028053000) do t.integer "question_type" t.integer "is_necessary" t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "question_number" + t.integer "max_choices", :default => 0 + t.integer "min_choices", :default => 0 end create_table "poll_users", :force => true do |t| diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index f0e5be8c9..4e686c4e3 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1398,7 +1398,8 @@ a:hover.comment_ding_link{ color:#269ac9;} .orig_textarea{width:90%; margin-bottom:10px;} .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;} .orig_sub:hover{ background:#297fb8;} -.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;} +.orig_cont_hide{ text-align:center; width:632px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;} +.orig_cont_hide_issue{ text-align:center; width:882px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;} .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;} .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}