From a7b2ac860b2804ab16ea857145d7ec8052463fa9 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 15:40:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6=E4=B8=8D=E8=83=BD=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_project_file_list.html.erb | 8 ++++---- ...0505025003_add_index_to_homeworkforcourse_course_id.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index 53ff70bbe..a53ebabc7 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -24,14 +24,14 @@ <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% if manage_allowed && file.container_id == project.id && file.container_type == "Project" %> - - <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post %> - + + <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post %> + <% else %> <% end %> <% else %> - <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> + <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(frrrffcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc443333333333333333333),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% end %> <% else %> <% end %> diff --git a/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb b/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb index cd60a00af..066ed5980 100644 --- a/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb +++ b/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb @@ -1,4 +1,4 @@ -class AddIndexToHomeworkattachCourseId < ActiveRecord::Migration +class AddIndexToHomeworkforcourseCourseId < ActiveRecord::Migration def change add_index(:homework_for_courses,:course_id) end From fd28310e15c9d02deac70a24b30ff49ccf52a320 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 16:37:18 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A4=AA=E9=95=BF=E6=8D=A2=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/courses/_course.html.erb | 4 ++-- public/stylesheets/project.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index 0e1b5caa6..755dd63b0 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -58,14 +58,14 @@ <%= content_tag('span', "#{garble @course.members.count}", :class => "info") %> <%= content_tag('span', l(:label_x_member, :count => memberCount(@course))) %>

- +

<%= content_tag('span', link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %> <%= content_tag('span', l(:label_x_activity, :count => @course_activity_count[@course.id])) %>

- +
<% if(course_endTime_timeout? @course) %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 019ffa57a..c22c90bf8 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -76,7 +76,7 @@ a.problem_name{ color:#ff5722; } a:hover.problem_name{ color:#d33503;} a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} a.problem_tit02{ color:#0781b4; font-weight:bold;max-width:400px;} -.problem_tit_div{ color:#0781b4; font-weight:bold;width:400px; } +.problem_tit_div{ color:#0781b4; font-weight:bold;max-width:400px; } a.problem_tit_a{ color:#0781b4; } .problem_tit_a:hover{ color:#09658c; } a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; } From aabdd1a4d77e3d32b47cb60b0695cf5364e16102 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 16:56:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=8A=B6=E6=80=81=E6=97=B6=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/trackers_controller.rb | 13 +++++++------ app/views/files/_project_file_list.html.erb | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 01bc47a2f..64ad9c83a 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -38,12 +38,13 @@ class TrackersController < ApplicationController @tracker ||= Tracker.new(params[:tracker]) @trackers = Tracker.sorted.all @projects = Project.where("project_type = #{Project::ProjectType_project}").all - @courses = Course.all - @course_activity_count=Hash.new - @courses.each do |course| - @course_activity_count[course.id]=0 - end - @course_activity_count=get_course_activity @courses,@course_activity_count + # 去掉原因，这块代码已经没有用到 + # @courses = Course.all + # @course_activity_count=Hash.new + # @courses.each do |course| + # @course_activity_count[course.id]=0 + # end + # @course_activity_count=get_course_activity @courses,@course_activity_count end def create diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index a53ebabc7..3dd5134d7 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -31,7 +31,7 @@ <% end %> <% else %> - <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(frrrffcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc443333333333333333333),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> + <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% end %> <% else %> <% end %> From 3c72af69ea6ba936028e48839c97375c5e62e446 Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 6 May 2015 17:41:18 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=97=B6=E2=80=9Cgit=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=87=E5=8D=97=E2=80=9D=E5=B1=95=E5=BC=80=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 2 +- public/javascripts/project.js | 22 ++++++++++++++++++++++ public/stylesheets/project.css | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 96e3b84be..ceb675dcb 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -30,7 +30,7 @@

-
收起Git操作指南
+
展开Git操作指南

diff --git a/public/javascripts/project.js b/public/javascripts/project.js index f85f744e3..6dbb0ff6b 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -71,13 +71,35 @@ function showhelpAndScrollTo(id) { { cookiesave("repositories_visiable", true,'','',''); } + var information = $("#showgithelp"); + var val = information.attr("value"); + if(val=="show_help") + { + $("#showgithelp").text("收起Git操作指南"); + information.attr("value", "hide_help"); + } + else + { + $("#showgithelp").text("展开Git操作指南"); + information.attr("value", "show_help"); + } } + + $(function(){ + var information = $("#showgithelp"); + var val = information.attr("value"); if(cookieget("repositories_visiable") == "true") { $('#repos_git_more').hide(); } + else + { + $('#repos_git_more').show(); + $("#showgithelp").text("收起Git操作指南"); + information.attr("value", "hide_help"); + } }); diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 019ffa57a..a5554fd6b 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -180,6 +180,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col /* 版本库展示Git操作文档 */ .repos_more{height:23px; width:100%; border:1px solid #CCC; background:#F6F6F6; text-align:center; font-size:12px; padding-top:2px;} .lh23{line-height: 23px;} +.repos_git_more{display: none;} /* 弹框 新样式还没设计出来，暂时用的课程那边的样式 */ .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;} From 700d2985f6331961d2189b3a64784e7968f2729c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:02:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 6 +++++- app/views/issues/index.html.erb | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 80be8c5d5..bd905dec0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -75,7 +75,11 @@ class IssuesController < ApplicationController else @limit = 10#per_page_option end - + @assign_to_id = params[:assign_to_id] + @author_id = params[:author_id] + @priority_id = params[:priority_id] + @status_id = params[:status_id] + @subject = params[:subject] @issue_count = @query.issue_count @issue_pages = Paginator.new @issue_count, @limit, params['page'] @offset ||= @issue_pages.offset diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 3fb604f06..9445d88cf 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,31 +34,31 @@ <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
- + " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> 搜索
<%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@assign_to_id.nil? ? @assign_to_id : 0 }, {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"} ) %> <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@priority_id ? @priority_id : 0 }, {:onchange=>"remote_function();",:id=>"priority_id",:name=>"v[priority_id]",:class=>"w90"} ) %> <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@status_id ? @status_id : 0 }, {:onchange=>"remote_function();",:id=>"status_id",:name=>"v[status_id]",:class=>"w90"} ) %> <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@author_id ? @author_id : 0 }, {:onchange=>"remote_function();",:id=>"author_id",:name=>"v[author_id]",:class=>"w90"} ) From 6c7b92558ceea30ce2cb35d84802e3270a379cc4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:08:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9445d88cf..c1c3ab957 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,7 +34,7 @@ <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
- " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> + " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> 搜索
From f08357d300158690b965ba20de9f38a40b39d443 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 7 May 2015 09:17:47 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E7=BB=99=E8=80=81=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/commons/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 1703ac193..231c5280a 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -351,7 +351,7 @@ zh: # 意见反馈 # label_feedback: 意见反馈 - label_feedback_tips: "有什么想说的，尽管来咆哮吧~~" + label_feedback_tips: "欢迎反馈网站问题，课程中遇到的问题请反馈给相关老师!" label_technical_support: "技术支持：" label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" label_feedback_value: "该帖来自用户反馈:)" From 1cb3dfc833b24cebdca8f9f76c6b02abf5c44735 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:20:11 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index c1c3ab957..6e89e5e10 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -40,7 +40,7 @@
<%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]), - { :include_blank => false,:selected=>@assign_to_id.nil? ? @assign_to_id : 0 + { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0 }, {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"} ) From c9d66c7f5f5b0fd2f04ba45738ecb2e504f857ce Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:22:30 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index bd905dec0..12ee4bc3b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -75,7 +75,7 @@ class IssuesController < ApplicationController else @limit = 10#per_page_option end - @assign_to_id = params[:assign_to_id] + @assign_to_id = params[:assigned_to_id] @author_id = params[:author_id] @priority_id = params[:priority_id] @status_id = params[:status_id]