From b39e00b5c7f16ff9bcc9c11d72fa67b19830acc3 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 09:26:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA--=E5=86=85=E5=AE=B9=E5=BF=85=E5=A1=AB=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_form_project.html.erb | 2 +- config/locales/projects/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb index 5724acf47..8e72544b5 100644 --- a/app/views/messages/_form_project.html.erb +++ b/app/views/messages/_form_project.html.erb @@ -25,7 +25,7 @@
  • - + <%= text_area :quote,:quote,:style => 'display:none' %> <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
    diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index d89fc33ee..c1850b7e4 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -415,4 +415,4 @@ zh: # field_sharing: 共享 label_title_code_review: 代码评审 - label_home_non_project: 您还没有创建项目，您可能对系统的其它项目感兴趣！ \ No newline at end of file + label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！ \ No newline at end of file From a7b2ac860b2804ab16ea857145d7ec8052463fa9 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 15:40:13 +0800 Subject: [PATCH 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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;}