From 348a4df8d8a71fd3d773cab87597e98f04848077 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 27 Oct 2015 14:31:46 +0800 Subject: [PATCH 001/125] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 131fdcd88..b388b660c 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -325,9 +325,6 @@ class CoursesService else @state = 1 end - else - @state = 1 - end else if params[:course_password] == course.password if params[:role] == "10" From 8ec2dc3196ebda4f3ccaa12cc15ce56413f9a655 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 13:53:35 +0800 Subject: [PATCH 002/125] =?UTF-8?q?=E5=A4=9A=E7=89=88=E6=9C=AC=E5=BA=93?= =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=9A=201=E3=80=81=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E6=8F=90=E4=BE=9B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=202=E3=80=81=E6=96=B0=E5=BB=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E5=BA=93=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 22 ++++++++++ .../settings/_new_repositories.html.erb | 43 +++++++------------ .../projects/settings/_rep_forge.html.erb | 38 ++++++++++++++++ .../projects/settings/_rep_gitlab.html.erb | 26 +++++++++++ public/stylesheets/public.css | 1 + public/stylesheets/repository.css | 9 ++++ 6 files changed, 111 insertions(+), 28 deletions(-) create mode 100644 app/views/projects/settings/_rep_forge.html.erb create mode 100644 app/views/projects/settings/_rep_gitlab.html.erb diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 41f25d1a3..c76006def 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -117,6 +117,28 @@ module ProjectsHelper end end + # 判断版本库是否为gitlab + def rep_is_gitlab?(project) + rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") + return rep.blank? ? true :false + end + + # 获取新增gitlab版本库 + def rep_gitlab(project) + rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") + end + + # 获取新项目的版本库地址 + def rep_gitlab_url(project) + gitlab_address = Redmine::Configuration['gitlab_address'] + url = gitlab_address.to_s+"/"+project.owner.to_s+"/"+project.identifier+"."+"git" + end + + # # 获取Forge历史版本库 + def rep_forge(project) + rep = Repository.where("project_id =? and type =?", project, "Repository::Git") + end + # Added by young def course_settings_tabs tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'}, diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index bfb87b16a..c6ddb9fca 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -8,39 +8,26 @@ <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> <% if @project.repositories.any? %> + <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> + <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> +
历史版本库
- - - - - - - - - <% @project.repositories.sort.each do |repository| %> + <% rep_forge(@project).sort.each do |repository| %> - - - + + <%if repository.scm_name=="Git"%> - + <%else %> - + <% end %> - - <% end %> @@ -50,7 +37,7 @@ <% end %> <%# 新建版本库 %> -<% if @project.repositories.count == 0 %> +<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> <% course_tag = @project.project_type %> diff --git a/app/views/projects/settings/_rep_forge.html.erb b/app/views/projects/settings/_rep_forge.html.erb new file mode 100644 index 000000000..e25849c38 --- /dev/null +++ b/app/views/projects/settings/_rep_forge.html.erb @@ -0,0 +1,38 @@ +
<%= l(:field_identifier) %> <%= l(:field_repository_is_default) %><%= l(:label_scm) %> <%= l(:label_repository_path) %>
- <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> <%= checked_image repository.is_default? %><%=h repository.scm_name %> + <%= repository.identifier %><%=h repository.scm_name %> <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%> + + <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %> + + <%=h truncate(repository.url,:length=>10) %><%=h truncate(repository.url,:length=>10) %> - <% if repository.scm_name=="Git"%> - <%if User.current.allowed_to?(:manage_repository, @project) %> - <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %> - <% end %> - <% end %> - - <% if repository.login.to_s==User.current.login.to_s %> - <%= delete_new_link repository_path(repository) %> - <% end %>
+ + 历史版本 + + + + + + + + + <% rep_forge(project).sort.each do |repository| %> + + + + + <%if repository.scm_name=="Git"%> + + <%else %> + + <% end %> + + + + <% end %> + +
<%= l(:field_identifier) %> <%= l(:field_repository_is_default) %><%= l(:label_scm) %> <%= l(:label_repository_path) %>
+ <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> <%= checked_image repository.is_default? %><%=h repository.scm_name %> <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%><%=h truncate(repository.url,:length=>10) %> + <% if repository.scm_name=="Git"%> + <%if User.current.allowed_to?(:manage_repository, @project) %> + <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %> + <% end %> + <% end %> + + <% if repository.login.to_s==User.current.login.to_s %> + <%= delete_new_link repository_path(repository) %> + <% end %>
\ No newline at end of file diff --git a/app/views/projects/settings/_rep_gitlab.html.erb b/app/views/projects/settings/_rep_gitlab.html.erb new file mode 100644 index 000000000..1de706b5d --- /dev/null +++ b/app/views/projects/settings/_rep_gitlab.html.erb @@ -0,0 +1,26 @@ +<% rep_gitlab(project).sort.each do |repository| %> + + + + + + + + + + + + + <%if repository.scm_name=="Gitlab"%> + + <%else %> + + <% end %> + +<% end %> + +
<%= l(:field_identifier) %><%= l(:label_scm) %> <%= l(:label_repository_path) %>
+ <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> + <%=h repository.scm_name %> + <%=truncate(rep_gitlab_url(project), :length => 360) %> + <%=h truncate(repository.url,:length=>10) %>
\ No newline at end of file diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 0be7a6ff0..ec1b2dc2a 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -133,6 +133,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w265{ width: 265px;} .w270{ width: 270px;} .w350 {width:350px;} +.w362 {width:362px;} .w430{ width:470px;} .w520{ width:520px;} .w543{ width:543px;} diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css index 71cbd47b6..6ed2ae924 100644 --- a/public/stylesheets/repository.css +++ b/public/stylesheets/repository.css @@ -275,4 +275,13 @@ li.commit .commit-row-info a { } li.commit .commit-row-info .committed_ago { display: inline-block; +} +.rep_history_title{ + text-align: center; + font-weight: bold; + font-size: 13px; + color: #7F7F7F; +} +.rep_history_grey{ + color: #7F7F7F; } \ No newline at end of file From eb3c65f1c621ecf0b5aacfa991e593912cce268c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 14:26:23 +0800 Subject: [PATCH 003/125] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98---=E9=A1=B9=E7=9B=AE=E5=B7=A6=E4=BE=A7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- app/views/projects/_development_group.html.erb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index c76006def..90ddca99f 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -117,7 +117,7 @@ module ProjectsHelper end end - # 判断版本库是否为gitlab + # 判断版本库是否初始为gitlab def rep_is_gitlab?(project) rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") return rep.blank? ? true :false diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 1770291f5..e6ba39aa3 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -43,6 +43,9 @@
<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id, to: 'gitlab'}, :class => "f14 c_blue02" %> (<%= @project.repositories.count %>) + <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %> + <%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'repositories') , :class => "subnav_green" %> + <% end %>
<% end %> From 83486c745e4b833af29114297b026a6ede7891f3 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 15:04:17 +0800 Subject: [PATCH 004/125] =?UTF-8?q?1=E3=80=81=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=96=B0=E5=A2=9E=E7=89=88=E6=9C=AC=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=87=B3=E9=85=8D?= =?UTF-8?q?=E7=BD=AE--=E6=96=B0=E5=A2=9E=202=E3=80=81=E5=B7=B2=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=BF=87gitlab=E9=A1=B9=E7=9B=AE=E5=88=99=E8=B7=B3?= =?UTF-8?q?=E8=87=B3gitlab=20=E7=89=88=E6=9C=AC=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 10 +- app/helpers/application_helper.rb | 6 + app/helpers/projects_helper.rb | 6 - .../projects/_development_group.html.erb | 8 +- .../settings/_new_repositories.html.erb | 131 +++++++++--------- 5 files changed, 85 insertions(+), 76 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 8a1b3bbe0..e05e79205 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -215,11 +215,11 @@ update end end - unless @repository.gitlab? - # redirect_to to_gitlab_project_repository_path(@project, @repository) - render :to_gitlab - return - end + # unless @repository.gitlab? + # # redirect_to to_gitlab_project_repository_path(@project, @repository) + # render :to_gitlab + # return + # end #if( !User.current.member_of?(@project) || @project.hidden_repo) @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 84364b4f6..01b126c26 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -609,6 +609,12 @@ module ApplicationHelper return @result end + # 判断版本库是否初始为gitlab + def rep_is_gitlab?(project) + rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") + return rep.blank? ? true :false + end + # 判断当前用户是否为项目管理员 def is_project_manager?(user_id, project_id) @result = false diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 90ddca99f..48766813c 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -117,12 +117,6 @@ module ProjectsHelper end end - # 判断版本库是否初始为gitlab - def rep_is_gitlab?(project) - rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") - return rep.blank? ? true :false - end - # 获取新增gitlab版本库 def rep_gitlab(project) rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index e6ba39aa3..67867ffbf 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -41,10 +41,14 @@ <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %> <% if visible_repository?(@project) %>
- <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id, to: 'gitlab'}, :class => "f14 c_blue02" %> + <% if rep_is_gitlab?(@project) %> + <%= link_to l(:project_module_repository), {:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories'}, :class => "f14 c_blue02" %> + <% else %> + <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id }, :class => "f14 c_blue02" %> + <% end %> (<%= @project.repositories.count %>) <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %> - <%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'repositories') , :class => "subnav_green" %> + <%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %> <% end %>
<% end %> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index c6ddb9fca..1eeb571cf 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -7,74 +7,79 @@ <%= str = error_messages_for 'repository' %> <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> -<% if @project.repositories.any? %> - <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> - <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> -
历史版本库
- - - <% rep_forge(@project).sort.each do |repository| %> - - + <%else %> + <% end %> - -
  • - - - - <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %> - <% unless @repository.identifier_frozen? %> - <%=l(:text_length_between,:min=>1,:max=>254)< - <% end %> -
    • -
    - - <%=l(:button_save)%> - <%=l(:button_cancel)%> - - <% end %> + + <% end %> + +
    +<%# 新建版本库 %> +
    + <% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> + + + <% course_tag = @project.project_type %> + <% if User.current.allowed_to?(:manage_repository, @project) %> + + <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>

    + <% end %> +     +
    + + <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %> +
    +
      +
    • + + <%= select_tag('repository_scm', + options_for_select(["Git"],@repository.class.name.demodulize), + :data => {:remote => true, :method => 'get'})%> + <% if @repository && ! @repository.class.scm_available %> + <%= l(:text_scm_command_not_available) %> + <% end %> +
      • +
    • + + + + <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %> + <% unless @repository.identifier_frozen? %> + <%=l(:text_length_between,:min=>1,:max=>254)< + <% end %> +
      • +
      +
    + <%=l(:button_save)%> + <%=l(:button_cancel)%> +
    + <% end %> + + <% end %> +
    + + <% if @project.repositories.any? %> + <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> + <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> +
    历史版本库
    + + + <% rep_forge(@project).sort.each do |repository| %> + + - - <%if repository.scm_name=="Git"%> - + <%if repository.scm_name=="Git"%> + - <%else %> - - <% end %> - - <% end %> - -
    <%= repository.identifier %><%=h repository.scm_name %><%=h repository.scm_name %> <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %> - <%=h truncate(repository.url,:length=>10) %>
    -<% else %> -

    <%= l(:label_repository_no_data) %>

    -<% end %> - -<%# 新建版本库 %> -<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> - - - <% course_tag = @project.project_type %> - <% if User.current.allowed_to?(:manage_repository, @project) %> - - <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>

    - <% end %> -     -
    - - <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %> -
    -
      -
    • - - <%= select_tag('repository_scm', - options_for_select(["Git"],@repository.class.name.demodulize), - :data => {:remote => true, :method => 'get'})%> - <% if @repository && ! @repository.class.scm_available %> - <%= l(:text_scm_command_not_available) %> +
    		<%=h truncate(repository.url,:length=>10) %>
    + <% else %> +

    <%= l(:label_repository_no_data) %>

    + <% end %> + + -<% end %> From 4c174781b1e958306234a19195897cb4ec8c69f5 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 2 Nov 2015 15:21:53 +0800 Subject: [PATCH 005/125] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=20=E8=B5=84=E6=BA=90=E4=B8=8A=E4=BC=A0=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_upload_show_project.html.erb | 4 ++-- app/views/files/create.js.erb | 2 +- app/views/layouts/base_projects.html.erb | 12 +++++++++++- app/views/projects/_development_group.html.erb | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/views/files/_upload_show_project.html.erb b/app/views/files/_upload_show_project.html.erb index 25a03b347..273aaec08 100644 --- a/app/views/files/_upload_show_project.html.erb +++ b/app/views/files/_upload_show_project.html.erb @@ -8,9 +8,9 @@ <%= form_tag(project_files_path(project), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> - <%= render :partial => 'attachement_list',:locals => {:project => project} %> + <%= render :partial => 'files/attachement_list',:locals => {:project => project} %>
    - <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %> diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb index 81810344e..f24d60811 100644 --- a/app/views/files/create.js.erb +++ b/app/views/files/create.js.erb @@ -22,7 +22,7 @@ $("#attachments_fields").children().remove(); $("#upload_file_count").text("未上传文件"); $('#upload_file_div').slideToggle('slow'); <% if @project %> - closeModal(); + hideModal(); $("#resource_list").html('<%= j(render partial: "project_file_new" ,locals: {project: @project}) %>'); $("#project_files_count_info").html("<%= @all_attachments.count%>"); $("#project_files_count_nav").html("(<%= @all_attachments.count%>)") diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index b418be4ab..e06db1d0f 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -13,7 +13,7 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %> - <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -223,6 +223,16 @@ } ); } + + function project_files_upload() + { + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_show_project',:locals => {:project => @project}) %>'); + showModal('ajax-modal', '513px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top","40%").css("left","36%"); + $('#ajax-modal').parent().addClass("popbox_polls"); + }
    123
    diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 1770291f5..1da51c6e4 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -34,7 +34,8 @@ <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> + <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> + +上传资源 <% end %> <% end %> From 4d5d012ecf23385280122f6cbe3dbe2303b00b93 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 16:41:15 +0800 Subject: [PATCH 006/125] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 21 ++++--- .../settings/_new_repositories.html.erb | 63 ++++++++++--------- config/locales/commons/zh.yml | 2 +- config/locales/projects/zh.yml | 3 + public/stylesheets/project.css | 1 + public/stylesheets/public.css | 1 + public/stylesheets/repository.css | 2 +- 7 files changed, 52 insertions(+), 41 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e05e79205..42e097180 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -215,11 +215,11 @@ update end end - # unless @repository.gitlab? - # # redirect_to to_gitlab_project_repository_path(@project, @repository) - # render :to_gitlab - # return - # end + unless @repository.gitlab? + # redirect_to to_gitlab_project_repository_path(@project, @repository) + render :to_gitlab + return + end #if( !User.current.member_of?(@project) || @project.hidden_repo) @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? @@ -252,11 +252,16 @@ update project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT ip = RepositoriesHelper::REPO_IP_ADDRESS gitlab_address = Redmine::Configuration['gitlab_address'] - if @repository.type.to_s=="Repository::Gitlab" + if @repository.type.to_s == "Repository::Gitlab" @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git" else - @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+ - @repository.url.slice(project_path_cut, @repository.url.length).to_s + # 默认选择历史版本库情况 + rep = Repository.where("project_id =? and type =?", @project, "Repository::Gitlab") + unless rep.blank? + @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+rep.identifier+"."+"git" + else + @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s + end end if @course_tag == 1 render :action => 'show', :layout => 'base_courses' diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 1eeb571cf..e614dc5fe 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -8,8 +8,9 @@ <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> <%# 新建版本库 %> -
    - <% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> + +<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> +
    <% course_tag = @project.project_type %> @@ -23,11 +24,11 @@ <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %> <% end %> +
    +<% end %> - <% end %> -
    - <% if @project.repositories.any? %> - <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> - <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> -
    历史版本库
    - - - <% rep_forge(@project).sort.each do |repository| %> - - + <%else %> + + <% end %> + + <% end %> + +
    +<% if @project.repositories.any? %> + <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> + <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> +
    历史版本库
    + + + <% rep_forge(@project).sort.each do |repository| %> + + - - <%if repository.scm_name=="Git"%> - + <%if repository.scm_name=="Git"%> + - <%else %> - - <% end %> - - <% end %> - -
    <%= repository.identifier %><%=h repository.scm_name %><%=h repository.scm_name %> <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %> - <%=h truncate(repository.url,:length=>10) %>
    - <% else %> -

    <%= l(:label_repository_no_data) %>

    - <% end %> +     		<%=h truncate(repository.url,:length=>10) %>
    +<% else %> +

    温馨提示：<%= l(:label_repository_no_data) %>

    +<% end %> diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 61bad2a00..3b5e9790e 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -200,7 +200,7 @@ zh: label_subject_empty: 主题不能为空 label_no_data: 没有任何数据可供显示 - label_repository_no_data: 您还没有创建版本库，每个项目只允许创建一个版本库！ + label_repository_no_data: 每个项目只能创建一个版本库！ # 项目、课程、用户公用 label_settings: 配置 label_information_plural: 信息 diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index cce03b13e..88a710633 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -88,6 +88,8 @@ zh: project_module_files: 资源库 project_module_repository: 版本库 project_module_create_repository: 创建版本库 + project_gitlab_create_repository: 新版本库 + label_project_more: 更多 project_module_news: 新闻 @@ -112,6 +114,7 @@ zh: label_project_overview: "项目简介" label_expend_information: 展开更多信息 label_project_create: "新建了项目" + lable_project_rep_create: 创建 # # 项目托管平台 diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index e769e14e4..2623fe65e 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -553,6 +553,7 @@ a:hover.member_btn{ background:#329cbd;} .pro_table tr td{ height:30px;} .pro_table_tit{ text-align:center; font-weight:bold;} .pro_table_on{ background:#f0fbff; } +.pro_table_on_forge{ background: #EAEAEA; } .pro_st_edit_issues{ display:none; margin-top:20px;} .pro_st_edit_issues ul li{ margin-bottom:10px;} .pro_st_edit_ban{ display:none; margin-top:20px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index ec1b2dc2a..0c4479907 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -71,6 +71,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml45{ margin-left:45px;} .ml55{ margin-left:55px;} .ml30{ margin-left:30px;} +.ml38{ margin-left:38px;} .ml60{ margin-left:60px;} .ml80{ margin-left:80px;} .ml90{ margin-left:90px;} diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css index 6ed2ae924..e2d636e2e 100644 --- a/public/stylesheets/repository.css +++ b/public/stylesheets/repository.css @@ -277,10 +277,10 @@ li.commit .commit-row-info .committed_ago { display: inline-block; } .rep_history_title{ - text-align: center; font-weight: bold; font-size: 13px; color: #7F7F7F; + padding-bottom: 10px; } .rep_history_grey{ color: #7F7F7F; From 36d61cd82f15e0b90cd56be44b22011ff422c9c1 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 17:36:45 +0800 Subject: [PATCH 007/125] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 18 ++++++------------ lib/tasks/update_rep_if_fault.rake | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 lib/tasks/update_rep_if_fault.rake diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 42e097180..0acf75c62 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -215,11 +215,11 @@ update end end - unless @repository.gitlab? - # redirect_to to_gitlab_project_repository_path(@project, @repository) - render :to_gitlab - return - end + # unless @repository.gitlab? + # # redirect_to to_gitlab_project_repository_path(@project, @repository) + # render :to_gitlab + # return + # end #if( !User.current.member_of?(@project) || @project.hidden_repo) @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? @@ -255,13 +255,7 @@ update if @repository.type.to_s == "Repository::Gitlab" @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git" else - # 默认选择历史版本库情况 - rep = Repository.where("project_id =? and type =?", @project, "Repository::Gitlab") - unless rep.blank? - @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+rep.identifier+"."+"git" - else - @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s - end + @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s end if @course_tag == 1 render :action => 'show', :layout => 'base_courses' diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/update_rep_if_fault.rake new file mode 100644 index 000000000..5353c7569 --- /dev/null +++ b/lib/tasks/update_rep_if_fault.rake @@ -0,0 +1,16 @@ +#coding=utf-8 + +namespace :rep_fault do + desc "update fault rep" + task :rep_update => :environment do + Project.all.each do |project| + if project.repositories.count > 0 + unless Repository.where("project_id =? and type = ?",project, "Repository::Gitlab").blank? + project.repositories.each do |repository| + repository.update_attributes(:is_default => true) + end + end + end + end + end +end \ No newline at end of file From f4b12d191a86d74f2832d5988ae00fd5388b0793 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 17:50:44 +0800 Subject: [PATCH 008/125] =?UTF-8?q?=E6=9B=B4=E6=96=B0repository=E7=9A=84ty?= =?UTF-8?q?pe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/update_rep_if_fault.rake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/update_rep_if_fault.rake index 5353c7569..7bcf63c4c 100644 --- a/lib/tasks/update_rep_if_fault.rake +++ b/lib/tasks/update_rep_if_fault.rake @@ -7,10 +7,16 @@ namespace :rep_fault do if project.repositories.count > 0 unless Repository.where("project_id =? and type = ?",project, "Repository::Gitlab").blank? project.repositories.each do |repository| - repository.update_attributes(:is_default => true) + repository.update_attributes(:is_default => false) end end end end end + + desc "update ossean's data" + task :update_type => :environment do + repository = Repository.find(400) + repository.update_attributes(:type => "Repository::Git") + end end \ No newline at end of file From 1c45afac8932bac32838d1e519b5b7971c62fa9f Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 19:14:55 +0800 Subject: [PATCH 009/125] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 5 +++++ app/views/projects/_development_group.html.erb | 2 +- .../projects/settings/_new_repositories.html.erb | 10 +++++++++- lib/tasks/update_rep_if_fault.rake | 13 +++++++------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 01b126c26..b6c4ec91b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -615,6 +615,11 @@ module ApplicationHelper return rep.blank? ? true :false end + # 获取单一gitlab项目 + def gitlab_repository(project) + rep = Repository.where("project_id =? and type =?", project.id,"Repository::Gitlab" ).first + end + # 判断当前用户是否为项目管理员 def is_project_manager?(user_id, project_id) @result = false diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 67867ffbf..1f4fabde5 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -44,7 +44,7 @@ <% if rep_is_gitlab?(@project) %> <%= link_to l(:project_module_repository), {:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories'}, :class => "f14 c_blue02" %> <% else %> - <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id }, :class => "f14 c_blue02" %> + <%= link_to l(:project_module_repository),({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).identifier}), :class => "f14 c_blue02" %> <% end %> (<%= @project.repositories.count %>) <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index e614dc5fe..a62bbc42f 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -7,8 +7,16 @@ <%= str = error_messages_for 'repository' %> <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> +<%# 提示 %> +<% if @project.repositories.count>1 %> +
    + 项目管理员您好！近日平台完成了版本库升级，以后每个项目将唯一的对应一个版本库。请您按照以下步骤完成项目版本库的更新： +

    1. 点击下面的"创建版本库按钮"，为本项目创建一个新的版本库；

    +

    2. 从本项目的历史版本库中选择一个您将使用的版本库，将其完整的克隆(clone)到本地，然后推送(push)到新建的版本库(注意不能仅推送代码，否则之前各开发者的提交记录将丢失)。

    +

    3. 本项目的历史版本库将在您新建版本库的一周内自动隐藏，如果您以后需要这些版本库，请与网站联系，我们将为您提供这些版本库的所有数据。

    +
    +<% end %> <%# 新建版本库 %> - <% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %>
    diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/update_rep_if_fault.rake index 7bcf63c4c..1c1f5a36e 100644 --- a/lib/tasks/update_rep_if_fault.rake +++ b/lib/tasks/update_rep_if_fault.rake @@ -7,16 +7,17 @@ namespace :rep_fault do if project.repositories.count > 0 unless Repository.where("project_id =? and type = ?",project, "Repository::Gitlab").blank? project.repositories.each do |repository| - repository.update_attributes(:is_default => false) + repository.is_default =1 + repository.save end end end end end - desc "update ossean's data" - task :update_type => :environment do - repository = Repository.find(400) - repository.update_attributes(:type => "Repository::Git") - end + # desc "update ossean's data" + # task :update_type => :environment do + # repository = Repository.find(400) + # repository.update_attributes(:type => "Repository::Git") + # end end \ No newline at end of file From afd9d435c22ea2f09e86b0f07642b86ad651bc8e Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 19:20:59 +0800 Subject: [PATCH 010/125] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_repositories.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index a62bbc42f..a802faef1 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -44,7 +44,7 @@
  • - + *<%=l(:label_repository_name)%>： <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %> <% unless @repository.identifier_frozen? %> <%=l(:text_length_between,:min=>1,:max=>254)< @@ -52,8 +52,8 @@
    • - <%=l(:lable_project_rep_create) %> - <%=l(:button_cancel)%> + <%=l(:lable_project_rep_create) %> + <%=l(:button_cancel)%>
    <% end %> From e0d5c948fa23816dc37f152c3b23be8988b1819c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 19:27:23 +0800 Subject: [PATCH 011/125] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_repositories.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index a802faef1..4653916a7 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -12,7 +12,7 @@
    项目管理员您好！近日平台完成了版本库升级，以后每个项目将唯一的对应一个版本库。请您按照以下步骤完成项目版本库的更新：

    1. 点击下面的"创建版本库按钮"，为本项目创建一个新的版本库；

    -

    2. 从本项目的历史版本库中选择一个您将使用的版本库，将其完整的克隆(clone)到本地，然后推送(push)到新建的版本库(注意不能仅推送代码，否则之前各开发者的提交记录将丢失)。

    +

    2. 从本项目的历史版本库中选择一个您将使用的版本库，将其完整的克隆(clone)到本地(需要提供您之前设置的版本库口令)，然后推送(push)到新建的版本库(注意不能仅推送代码，否则之前各开发者的提交记录将丢失)。

    3. 本项目的历史版本库将在您新建版本库的一周内自动隐藏，如果您以后需要这些版本库，请与网站联系，我们将为您提供这些版本库的所有数据。

    <% end %> From edf9b4a6b533839b3145b97338f02e43955de86f Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 20:01:19 +0800 Subject: [PATCH 012/125] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_repositories.html.erb | 2 +- public/javascripts/project.js | 5 +++++ public/stylesheets/public.css | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 4653916a7..5196fd8e8 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -72,7 +72,7 @@ <%= repository.identifier %> <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> - <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %> diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 5ba7c7145..9344434eb 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -517,6 +517,11 @@ function jsCopy(){ e.select(); document.execCommand("Copy"); } +function jsCopy2(){ + var e=document.getElementById("copy_rep_content2"); + e.select(); + document.execCommand("Copy"); +} function zip(){ alert("该功能正在紧张的开发中，我们会争取在最短时间内上线，如若对您工作造成不便敬请谅解！") diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 0c4479907..49b2906aa 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -117,6 +117,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mb10{ margin-bottom:10px !important;} .mb20{ margin-bottom:20px;} .pl15{ padding-left:15px;} +.pl5{ padding-left:5px;} .pt5{ padding-top:5px;} .pt10{ padding-top:10px;} .pb5{ padding-bottom: 5px;} From 4cd41e0a67de72ff59e1fa874e4db1de306f3f32 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 20:41:01 +0800 Subject: [PATCH 013/125] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 48766813c..51d1846d8 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -125,7 +125,7 @@ module ProjectsHelper # 获取新项目的版本库地址 def rep_gitlab_url(project) gitlab_address = Redmine::Configuration['gitlab_address'] - url = gitlab_address.to_s+"/"+project.owner.to_s+"/"+project.identifier+"."+"git" + url = gitlab_address.to_s+"/"+project.owner.to_s+"/"+ rep_gitlab(project).first.identifier+"."+"git" end # # 获取Forge历史版本库 From 3360a25a425b575c93b44834832e12b452e5bd00 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 10:28:13 +0800 Subject: [PATCH 014/125] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=20=E8=B5=84=E6=BA=90=E4=B8=8A=E4=BC=A0=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 3 + app/views/files/_attachement_list.html.erb | 48 +++++----- app/views/files/_course_file.html.erb | 4 + .../files/_new_style_attachment_list.html.erb | 71 +++++++++++++++ app/views/files/_upload_course_files.erb | 42 +++++++++ app/views/files/_upload_show.html.erb | 4 +- app/views/files/_upload_show_project.html.erb | 4 +- app/views/layouts/base_courses.html.erb | 14 ++- public/javascripts/attachments.js | 88 +++++++++---------- public/stylesheets/courses.css | 5 +- public/stylesheets/new_user.css | 1 + public/stylesheets/project.css | 2 +- 12 files changed, 212 insertions(+), 74 deletions(-) create mode 100644 app/views/files/_new_style_attachment_list.html.erb create mode 100644 app/views/files/_upload_course_files.erb diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 057d962c8..1cd5b0f15 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 # Redmine - project management software # Copyright (C) 2006-2013 Jean-Philippe Lang # @@ -378,6 +379,8 @@ class FilesController < ApplicationController tag_name = l(:label_media) when "4" tag_name = l(:label_code) + when "6" + tag_name = "论文" else tag_name = "" end diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb index 4c631d22f..01e5dca5f 100644 --- a/app/views/files/_attachement_list.html.erb +++ b/app/views/files/_attachement_list.html.erb @@ -1,26 +1,4 @@ -
    - -<% if defined?(container) && container && container.saved_attachments %> - <% container.attachments.each_with_index do |attachment, i| %> - - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> - <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> - <%= l(:field_is_public)%>: - <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> - <%= if attachment.id.nil? - #待补充代码 - else - link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') - end - %> - <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> - <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> - - <% end %> -<% end %> - -
    <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> <% if @course %> @@ -68,3 +46,29 @@     (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) +
    + +
    + +<% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= if attachment.id.nil? + #待补充代码 + else + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') + end + %> + <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> + + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + + <% end %> +<% end %> + +
    +
    \ No newline at end of file diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 8283e15b7..4176b72d0 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -26,6 +26,9 @@ case 4: $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 4}) %>'); break; + case 6: + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 6}) %>'); + break; default: $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 5}) %>'); } @@ -77,6 +80,7 @@ 软件 |  媒体 |  代码 |  + 论文 |  其他

    <% end %> diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb new file mode 100644 index 000000000..022486413 --- /dev/null +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -0,0 +1,71 @@ +<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> + +<% if @course %> + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => ie8? ? '':'file_selector', + :multiple => true, + :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");', + :style => ie8? ? '': 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> +<% else %> + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => ie8? ? '':'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this);', + :style => ie8? ? '': 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> +<% end %> + + + + + <%= l(:label_no_file_uploaded)%> + +(<%= l(:label_max_size) %>: +<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) +
    +
    + +<% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= if attachment.id.nil? + #待补充代码 + else + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') + end + %> + <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> + + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + + <% end %> +<% end %> + +
    \ No newline at end of file diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb new file mode 100644 index 000000000..7eafcaabc --- /dev/null +++ b/app/views/files/_upload_course_files.erb @@ -0,0 +1,42 @@ + +
    +
    +

    <%= l(:label_upload_files)%>

    +
    + <%= error_messages_for 'attachment' %> + + + <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> + + +
    + 课件 |  + 软件 |  + 媒体 |  + 代码 |  + 论文 |  + 其他 +
    +
    +
    + <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %> +
    +
    + <%= l(:button_cancel)%> + <%= l(:button_confirm)%> + + <% end %> +
    + +
    + <% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> + <% end %> +
    + + \ No newline at end of file diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb index e11a4bf38..21cd94d8d 100644 --- a/app/views/files/_upload_show.html.erb +++ b/app/views/files/_upload_show.html.erb @@ -1,7 +1,7 @@ -
    +
    -

    <%= l(:label_upload_files)%>

    +

    <%= l(:label_upload_files)%>

    <%= error_messages_for 'attachment' %> diff --git a/app/views/files/_upload_show_project.html.erb b/app/views/files/_upload_show_project.html.erb index 273aaec08..8223f071e 100644 --- a/app/views/files/_upload_show_project.html.erb +++ b/app/views/files/_upload_show_project.html.erb @@ -1,7 +1,7 @@ -
    +
    -

    <%= l(:label_upload_files)%>

    +

    <%= l(:label_upload_files)%>

    <%= error_messages_for 'attachment' %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 98e8f378d..11eeb8659 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -138,7 +138,10 @@
    <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %> <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %> - <%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %> + <% if is_teacher %> + + +上传资源 + <% end %>
    <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> @@ -246,6 +249,15 @@ }) + function course_files_upload(){ + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>'); + showModal('ajax-modal', '513px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top","").css("left",""); + $('#ajax-modal').parent().addClass("popbox_polls"); + } + \ No newline at end of file diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 329d0db5a..685699064 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -37,27 +37,27 @@ function addFile_board(inputEl, file, eagerUpload, id) { fileSpan.append( $('', { 'type': 'text', - 'class': 'filename readonly', + 'class': 'upload_filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly' }).val(file.name), - $('', { - 'type': 'text', - 'class': 'description', - 'name': 'attachments[' + attachmentId + '][description]', - 'maxlength': 254, - 'placeholder': $(inputEl).data('descriptionPlaceholder') - }).toggle(!eagerUpload), - $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ - 'class': 'ispublic-label' - }), - $('', { - 'type': 'checkbox', - 'class': 'is_public_checkbox', - 'value': 1, - 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', - checked: 'checked' - }).toggle(!eagerUpload), +// $('', { +// 'type': 'text', +// 'class': 'description', +// 'name': 'attachments[' + attachmentId + '][description]', +// 'maxlength': 254, +// 'placeholder': $(inputEl).data('descriptionPlaceholder') +// }).toggle(!eagerUpload), +// $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ +// 'class': 'ispublic-label' +// }), +// $('', { +// 'type': 'checkbox', +// 'class': 'is_public_checkbox', +// 'value': 1, +// 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', +// checked: 'checked' +// }).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload', @@ -103,27 +103,27 @@ function addFile(inputEl, file, eagerUpload) { fileSpan.append( $('', { 'type': 'text', - 'class': 'filename readonly', + 'class': 'upload_filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly' }).val(file.name), - $('', { - 'type': 'text', - 'class': 'description', - 'name': 'attachments[' + attachmentId + '][description]', - 'maxlength': 254, - 'placeholder': $(inputEl).data('descriptionPlaceholder') - }).toggle(!eagerUpload), - $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ - 'class': 'ispublic-label' - }), - $('', { - 'type': 'checkbox', - 'class': 'is_public_checkbox', - 'value': 1, - 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', - checked: 'checked' - }).toggle(!eagerUpload), +// $('', { +// 'type': 'text', +// 'class': 'description', +// 'name': 'attachments[' + attachmentId + '][description]', +// 'maxlength': 254, +// 'placeholder': $(inputEl).data('descriptionPlaceholder') +// }).toggle(!eagerUpload), +// $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ +// 'class': 'ispublic-label' +// }), +// $('', { +// 'type': 'checkbox', +// 'class': 'is_public_checkbox', +// 'value': 1, +// 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', +// checked: 'checked' +// }).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload' @@ -532,17 +532,17 @@ function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { fileSpan.append( $('', { 'type': 'text', - 'class': 'filename readonly', + 'class': 'upload_filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly' }).val(file.name), - $('', { - 'type': 'text', - 'class': 'description', - 'name': 'attachments[' + attachmentId + '][description]', - 'maxlength': 254, - 'placeholder': $(inputEl).data('descriptionPlaceholder') - }).toggle(!eagerUpload), +// $('', { +// 'type': 'text', +// 'class': 'description', +// 'name': 'attachments[' + attachmentId + '][description]', +// 'maxlength': 254, +// 'placeholder': $(inputEl).data('descriptionPlaceholder') +// }).toggle(!eagerUpload), $('
    ', { 'class': 'div_attachments', 'name': 'div_' + 'attachments_' + attachmentId diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 5612a774e..e4b31c61c 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -552,7 +552,7 @@ blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: bre #attachments_fields input.description {margin-left: 4px;width: 100px;} #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;} a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;} -#attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px; white-space: nowrap; text-overflow:ellipsis;} +#attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px; white-space: nowrap; } span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields span {display: block;white-space: nowrap;} .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);} @@ -570,7 +570,7 @@ a.remove-upload:hover {text-decoration:none !important;} .attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;} a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;} -.attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;} +.attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px;} span.add_attachment {font-size: 80%;line-height: 2.5em;} .attachments_fields span {display: block;white-space: nowrap;} .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);} @@ -889,6 +889,7 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} .student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index f753b191b..8b3c8f3ce 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1144,6 +1144,7 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } +.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index e769e14e4..e0bf981a1 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,7 +369,7 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } - +.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} .attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } From 193f83b7208d36e2703574b648e5c8bdd6eb274f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 10:33:23 +0800 Subject: [PATCH 015/125] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=20=E8=B5=84=E6=BA=90=E4=B8=8A=E4=BC=A0=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_upload_course_files.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index 7eafcaabc..62d5c68e4 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -22,7 +22,7 @@ <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %>
    - <%= l(:button_cancel)%> + <%= l(:button_cancel)%> <%= l(:button_confirm)%> <% end %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 11eeb8659..39de4faeb 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -253,7 +253,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>'); showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); + $('#ajax-modal').before(""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("popbox_polls"); } From a1275940b57fa119b4e6560f020367325b924c0b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 10:50:29 +0800 Subject: [PATCH 016/125] =?UTF-8?q?=E8=AF=B7=E5=8A=A0=E5=85=A5=E5=B8=88?= =?UTF-8?q?=E5=93=A5=E5=B8=88=E5=A7=90=E7=AD=94=E7=96=91=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 305187b02..fd25fc224 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -26,7 +26,7 @@ <%#= l(:label_technical_support) %> -

    请加入师姐答疑群

    173184401

     +

    请加入师姐师姐答疑群

    173184401

    From 7f3d44ce63beae1f9ccc2d8be58856f9c993510a Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 3 Nov 2015 10:52:32 +0800 Subject: [PATCH 017/125] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=9Agitlab=E5=92=8Ctrustie=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 0acf75c62..e25d01650 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -241,7 +241,7 @@ update #Modified by young # (show_error_not_found; return) unless @entries g = Gitlab.client - @changesets = g.get ("/projects/#{@project.gpid}/repository/commits") + @changesets = g.commits(@project.gpid) # @changesets = @repository.latest_changesets(@path, @rev) # @changesets_count = @repository.latest_changesets(@path, @rev).count @changesets_count = @changesets.count From 6f002613d0eb64ac117ad0e66e717eb8046cadd5 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 10:55:35 +0800 Subject: [PATCH 018/125] =?UTF-8?q?=E7=AD=94=E7=96=91=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/sidebar_bg.png | Bin 9913 -> 7281 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png index 9ceea0f9176902560fa21d8eddd17a372d761edd..e4d12da4dffa4b7d73d9767af38102b57212c1fa 100644 GIT binary patch literal 7281 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 F{{uzF(gXki literal 9913 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 Xn+&$9^GF@=?I574sG(3UXBP55+E<+Q From b84628af9df5a88d5ff0e40db5216aa350dd1e34 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:23:56 +0800 Subject: [PATCH 019/125] regist_btn color --- app/views/account/login.html.erb | 19 ++++++++++++++++--- public/stylesheets/new_user.css | 2 ++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index ed43f455a..fadf5e465 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -86,6 +86,9 @@ } function register(){ + if($("#loginUpButton").hasClass('loginUpDisableButton')){ + return; + } if($login_correct && $mail_correct && $passwd_correct && $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){ $("#main_reg_form").submit(); }else{ @@ -182,6 +185,16 @@ $('#main_login_form').submit(); } } + + function changeRegisterBtn(checkbox){ + if(checkbox.checked == true){ + $("#loginUpButton").removeClass('loginUpDisableButton'); + $("#loginUpButton").addClass('loginUpButton'); + }else{ + $("#loginUpButton").removeClass('loginUpButton') + $("#loginUpButton").addClass('loginUpDisableButton'); + } + }
    @@ -270,11 +283,11 @@
    - +
    我已阅读并接受Trustie服务协议条款
    -
    - 注册 +
    + 注册
    <% end %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 8b3c8f3ce..0c7cda2c7 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -726,6 +726,8 @@ a.loginChooseTab {color:#484848; height:30px; display:block;} .loginUpButton {width:315px; height:40px; background-color:#269ac9; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;} .loginInButton:hover {background-color: #297fb8} .loginUpButton:hover {background-color: #297fb8} +.loginUpDisableButton {width:315px; height:40px; background-color:#C1C1C1; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;} +.loginUpDisableButton:hover {background-color: #C1C1C1} .loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;} .loginSign {width:405px; background-color:#ffffff;} .loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;} From 3d87f65021c173a6dbc16e9f4f5abd92299637ce Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:27:43 +0800 Subject: [PATCH 020/125] new_feedback --- app/views/layouts/_new_feedback.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index fd25fc224..e3c0540fd 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -21,12 +21,11 @@ <% end %>
    -
    +
    <%#= l(:label_technical_support) %> - -

    请加入师姐师姐答疑群

    173184401

     +

    请加入师姐师姐答疑群

    173184401

    From 4342c510a7f4f0e4e908e4b9d50219c3137fc9bb Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:31:09 +0800 Subject: [PATCH 021/125] new_feedback --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index e3c0540fd..aa7540d61 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

    请加入师姐师姐答疑群

    173184401

    +

    请加入师姐师哥答疑群

    173184401

    From 4d1800e690868f0e320ebd5778356698c3ef652d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:31:27 +0800 Subject: [PATCH 022/125] new_feedback --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index aa7540d61..80a4c0fb2 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

    请加入师姐师哥答疑群

    173184401

    +

    请加入师哥师姐答疑群

    173184401

    From d4218fc81be07a60e17059e4f4a698459d1cbe34 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:33:42 +0800 Subject: [PATCH 023/125] new_feedback --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 80a4c0fb2..763b5a5d9 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

    请加入师哥师姐答疑群

    173184401

    +

    请加入师姐师兄答疑群

    173184401

    From 8ffbe8f30086ce4bdcf92ed2c1eee912225adc86 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:42:33 +0800 Subject: [PATCH 024/125] course manager can not apply to join that course --- app/services/courses_service.rb | 3 +++ app/views/courses/join.js.erb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 74580632f..c8af509f8 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -303,6 +303,7 @@ class CoursesService #@state == 7 您已经发送过申请了，请耐心等待 #@state == 8 您已经是该课程的教师了 #@state == 9 您已经是该课程的教辅了 + #@state == 10 您已经是该课程的管理员了 #@state 其他 未知错误，请稍后再试 def join_course params,current_user course = Course.find_by_id params[:object_id] @@ -325,6 +326,8 @@ class CoursesService #如果加入的角色教辅并且当前为教辅 elsif params[:role] == "7" && roleName == "TeachingAsistant" @state = 9 + elsif roleName == "Manager" + @state = 10 #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求 elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" ) #如果已经发送过消息了，那么就要给个提示 diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb index 2b4927f48..8102098d5 100644 --- a/app/views/courses/join.js.erb +++ b/app/views/courses/join.js.erb @@ -32,6 +32,10 @@ window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @co alert("您已经是该课程的教辅了"); hidden_join_course_form(); window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +<% elsif @state == 10%> +alert("您已经是该课程的管理员了"); +hidden_join_course_form(); +window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" <% else %> alert("未知错误，请稍后再试"); <% end %> From f1092d5072951920686ed934a9c360eb19cc0fac Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 14:33:59 +0800 Subject: [PATCH 025/125] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=90=8E=E7=9A=84=20=E5=8F=AF=E9=80=89=E7=9A=84?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/attachments.js | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 685699064..813c10dee 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -552,27 +552,27 @@ function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { fileSpan.append( $('', { 'type': 'text', - 'class': 'filename readonly', + 'class': 'upload_filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly' }).val(file.name), - $('', { - 'type': 'text', - 'class': 'description', - 'name': 'attachments[' + attachmentId + '][description]', - 'maxlength': 254, - 'placeholder': $(inputEl).data('descriptionPlaceholder') - }).toggle(!eagerUpload), - $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ - 'class': 'ispublic-label' - }), - $('', { - 'type': 'checkbox', - 'class': 'is_public_checkbox', - 'value': 1, - 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', - checked: 'checked' - }).toggle(!eagerUpload), +// $('', { +// 'type': 'text', +// 'class': 'description', +// 'name': 'attachments[' + attachmentId + '][description]', +// 'maxlength': 254, +// 'placeholder': $(inputEl).data('descriptionPlaceholder') +// }).toggle(!eagerUpload), +// $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ +// 'class': 'ispublic-label' +// }), +// $('', { +// 'type': 'checkbox', +// 'class': 'is_public_checkbox', +// 'value': 1, +// 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', +// checked: 'checked' +// }).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload' From 8d25b5676c6d6eb899a8828848054824e382d1b9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 14:56:32 +0800 Subject: [PATCH 026/125] =?UTF-8?q?tag=5Fname=E5=90=8D=E7=A7=B0=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E6=89=A9=E5=A4=A7=E8=87=B3120=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/index.html.erb | 6 ++--- app/views/layouts/base_forums.html.erb | 4 +-- config/settings.yml | 2 +- public/stylesheets/application.css | 34 +++++++++++++++++++------- public/stylesheets/leftside.css | 2 +- public/stylesheets/pleft.css | 2 +- public/stylesheets/user_leftside.css | 2 +- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 782efbb22..3dad88868 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -247,7 +247,7 @@ tagId = id; taggableType = type; width = parseInt(domEle.css('width').replace('px', '')) >= 100 ? parseInt(domEle.css('width').replace('px', '')) : 100 - domEle.html(''); + domEle.html(''); domEle.parent().css("border", "1px solid #ffffff"); $("#renameTagName").focus(); } @@ -295,8 +295,8 @@ // }else{ //否则就要更新tag名称了 //// if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){ 去掉询问 // $.post( -// '<%= update_tag_name_path %>', -// {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>} +// '<%#= update_tag_name_path %>', +// {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%#= @course.id%>} // ) //// }else{ //// ele.parent().css("border",""); diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index d32fbf4ed..e03ac2fc5 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -61,14 +61,14 @@ function addTag(){ if(<%=@forum.creator.id == User.current.id%>) { if ($("input[name='addTag']").val().trim() != "" ) { - if($("input[name='addTag']").val().trim().length <= 14) { + if($("input[name='addTag']").val().trim().length <= 120) { $.get( '<%= add_forum_tag_forum_path(@forum)%>' + "?tag_str=" + $("input[name='addTag']").val(), {} ); $("input[name='addTag']").val(''); }else{ - alert("标签名字长度不能超过14个字符"); + alert("标签名字长度不能超过120个字符"); } } } diff --git a/config/settings.yml b/config/settings.yml index d0af6d7a1..4286e0930 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -259,7 +259,7 @@ tags_min_length: default: 1 tags_max_length: format: int - default: 14 + default: 120 tags_show_search_results: format: int default: 5 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f8b5395d5..5646737f5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2745,15 +2745,31 @@ h2 img { vertical-align:middle; } /*added by william*/ #tag { - background: url(../images/issue_tag.png) no-repeat right -19px; - border-radius: 3px; - color: #3a587d !important; - padding: 1px 4px 2px 4px; - margin: 3px; - display: inline-block; - font-size: 13px; /*modified by linchun*/ - text-decoration: none; - cursor: pointer; + /*background: url(../images/issue_tag.png) no-repeat right -19px;*/ + /*border-radius: 3px;*/ + /*color: #3a587d !important;*/ + /*padding: 1px 4px 2px 4px;*/ + /*margin: 3px;*/ + /*display: inline-block;*/ + /*font-size: 13px; *//*modified by linchun*/ + /*text-decoration: none;*/ + /*cursor: pointer;*/ + border-radius: 3px; + color: #3a587d !important; + padding: 1px 4px 2px 4px; + margin: 3px; + display: inline-block; + font-size: 13px; + text-decoration: none; + cursor: pointer; + width: auto; + padding: 0 5px; + padding-top: 2px; + border: 1px solid #f8df8c; + background: #fffce6; + margin-right: 5px; + word-wrap: break-word; + word-break: break-all; } /*tanxianbo*/ diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css index 990c02d54..26976343e 100644 --- a/public/stylesheets/leftside.css +++ b/public/stylesheets/leftside.css @@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index 1f48c9166..1ce12bdda 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -59,7 +59,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} diff --git a/public/stylesheets/user_leftside.css b/public/stylesheets/user_leftside.css index e33e2c7d6..c8dfbe316 100644 --- a/public/stylesheets/user_leftside.css +++ b/public/stylesheets/user_leftside.css @@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} From 42ae539ffa355402803402168c27c1f96efb4025 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 15:51:11 +0800 Subject: [PATCH 027/125] =?UTF-8?q?=E7=AD=94=E7=96=91=E7=BE=A4=20=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 763b5a5d9..ffec82bce 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

    请加入师姐师兄答疑群

    173184401

    +

    请加入师姐师兄答疑群

    QQ群号：173184401

    From 6e7950983bc4a459758576e862d92486b0b8e065 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 3 Nov 2015 17:19:19 +0800 Subject: [PATCH 028/125] =?UTF-8?q?1=E3=80=81=E6=95=B0=E6=8D=AE=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=BF=81=E7=A7=BB=202=E3=80=81=E6=B7=BB=E5=8A=A0commi?= =?UTF-8?q?ts=E6=80=BB=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 18 ++++++++++++------ app/views/repositories/changes.html.erb | 2 +- app/views/repositories/show.html.erb | 2 +- lib/tasks/update_rep_if_fault.rake | 20 ++++---------------- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e25d01650..1f252cc24 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -224,10 +224,6 @@ update #if( !User.current.member_of?(@project) || @project.hidden_repo) @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? - # g = Gitlab.client - # project = g.project(20) - # rr = g.trees(project.id, @path) - # r = g.get ("/projects/#{@project}/repository/tree") # :name, :path, :kind, :size, :lastrev, :changeset @entries = @repository.entries(@path, @rev) # @trees = g.trees(project, @path) @@ -241,10 +237,18 @@ update #Modified by young # (show_error_not_found; return) unless @entries g = Gitlab.client + count = 0 + (0..100).each do |page| + if g.commits(@project.gpid,:page => page).count == 0 + break + else + count = count + g.commits(@project.gpid,:page => page).count + end + end @changesets = g.commits(@project.gpid) # @changesets = @repository.latest_changesets(@path, @rev) # @changesets_count = @repository.latest_changesets(@path, @rev).count - @changesets_count = @changesets.count + @changesets_all_count = count @changesets_latest_coimmit = @changesets[0] @properties = @repository.properties(@path, @rev) @repositories = @project.repositories @@ -271,7 +275,9 @@ update @entry = @repository.entry(@path, @rev) (show_error_not_found; return) unless @entry g = Gitlab.client - @changesets = g.get ("/projects/#{@project.gpid}/repository/commits?#{@rev}") + @commits = g.commits(@project.gpid, page:params[:pamge]) + @commit = g.commit(@project.gpid,@rev) + # @changesets = g.get ("/projects/#{@project.gpid}/repository/commits?#{@rev}") #@changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i) @properties = @repository.properties(@path, @rev) @changeset = @repository.find_changeset_by_name(@rev) diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb index f4037cb36..428799f07 100644 --- a/app/views/repositories/changes.html.erb +++ b/app/views/repositories/changes.html.erb @@ -14,7 +14,7 @@ <%= render_properties(@properties) %>
    - <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %> + <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @commits, :entry => @entry }) unless @commits.empty? %>
    <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 83f1a07ed..9601e5188 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -40,7 +40,7 @@ - <%=link_to @changesets_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev} %> 提交 + <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev} %> 提交 <% end %> diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/update_rep_if_fault.rake index 1c1f5a36e..3c7d119f2 100644 --- a/lib/tasks/update_rep_if_fault.rake +++ b/lib/tasks/update_rep_if_fault.rake @@ -1,23 +1,11 @@ #coding=utf-8 namespace :rep_fault do - desc "update fault rep" + desc "set ossean's type value" task :rep_update => :environment do - Project.all.each do |project| - if project.repositories.count > 0 - unless Repository.where("project_id =? and type = ?",project, "Repository::Gitlab").blank? - project.repositories.each do |repository| - repository.is_default =1 - repository.save - end - end - end - end + rep = Repository.find(400) + rep.type = "Repository::Gitlab" + rep.save end - # desc "update ossean's data" - # task :update_type => :environment do - # repository = Repository.find(400) - # repository.update_attributes(:type => "Repository::Git") - # end end \ No newline at end of file From e9a0334ab1c4f2fd0a946a315405030ce2d9f114 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 17:41:25 +0800 Subject: [PATCH 029/125] Merge branch 'szzh' into dev_zanle --- app/services/courses_service.rb | 56 ++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index e3b81d6d5..e566a8f46 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -326,45 +326,49 @@ class CoursesService #如果加入的角色教辅并且当前为教辅 elsif params[:role] == "7" && roleName == "TeachingAsistant" @state = 9 + elsif roleName == "Manager" + @state = 10 + #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求 + elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" ) + #如果已经发送过消息了，那么就要给个提示 + if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0 + @state = 7 + else + Mailer.run.join_course_request(course, User.current, params[:role]) + CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0) + @state = 6 + end #如果加入角色是学生，但是是当前课程的教师或者教辅 elsif params[:role] == "10" && roleName != "Student" member.role_ids = [params[:role]] member.save StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id]) @state = 0 - elsif roleName == "Manager" - @state = 10 - #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求 - elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" ) - Mailer.run.join_course_request(course, User.current, params[:role]) - #如果加入角色为教师或者教辅 - CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0) - @state = 6 end else @state = 1 end else - if params[:course_password] == course.password - if params[:role] == "10" || params[:role] == nil - members = [] - members << Member.new(:role_ids => [10], :user_id => current_user.id) - course.members << members - StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id]) - @state = 0 - else - #如果已经发送过消息了，那么就要给个提示 - if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0 - @state = 7 - else - Mailer.run.join_course_request(course, User.current, params[:role]) - CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0) - @state = 6 - end - end + if params[:course_password] == course.password + if params[:role] == "10" || params[:role] == nil + members = [] + members << Member.new(:role_ids => [10], :user_id => current_user.id) + course.members << members + StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id]) + @state = 0 else - @state = 1 + #如果已经发送过消息了，那么就要给个提示 + if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0 + @state = 7 + else + Mailer.run.join_course_request(course, User.current, params[:role]) + CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0) + @state = 6 + end end + else + @state = 1 + end end end else From 43d9c5636ab27167e84c8a9f9271b2a34a911790 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 4 Nov 2015 10:13:25 +0800 Subject: [PATCH 030/125] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9A=84=E5=9C=A8ie11=E4=B8=8B=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/course.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/course.js b/public/javascripts/course.js index da24e2878..7a93ab3ef 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -282,7 +282,7 @@ function regexTitle() function regexDescription() { var name = news_description_editor.html(); - if(name.length ==0) + if(news_description_editor.isEmpty()) { $("#description_notice_span").text("描述不能为空"); $("#description_notice_span").css('color','#ff0000'); From 04ba73fb7acd19d6d0c71bb4d96d8af9950fb899 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 4 Nov 2015 10:19:27 +0800 Subject: [PATCH 031/125] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=8F=91=E5=B8=96=20?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 8314c3902..25a4fae46 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -58,15 +58,15 @@ if(!check_memo_name()){ return; } - if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){ + if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){ memo_content.sync(); $("#new_memo").submit(); - }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){ + }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){ $("#error").html("主题和内容不能为空").show(); } - else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){ + else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){ $("#error").html("主题不能为空").show(); - }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().val().trim() == ""){ + }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){ $("#error").html("内容不能为空").show(); } } From ea6c4b09fe7542afb25c54e63e617f731464c208 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 4 Nov 2015 10:24:07 +0800 Subject: [PATCH 032/125] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=B8=96=20=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/edit.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 7ab460555..d26ebdbf8 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -2,7 +2,7 @@
    编辑作业
    @@ -18,6 +29,7 @@
    <%= form_for @homework do |f| %> +
    <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
    diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb index 7c56aea6e..0b1c02b88 100644 --- a/app/views/issues/add_journal.js.erb +++ b/app/views/issues/add_journal.js.erb @@ -1,3 +1,3 @@ -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>"); +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>"); init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); \ No newline at end of file diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb index 4cd1a86d6..ac80de3b4 100644 --- a/app/views/messages/reply.js.erb +++ b/app/views/messages/reply.js.erb @@ -1,6 +1,6 @@ <%if @project%> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>"); + $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <%elsif @course%> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>"); + $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <%end%> init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); \ No newline at end of file diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb index f49bb2c69..4739fba47 100644 --- a/app/views/student_work/_set_score_rule_detail.html.erb +++ b/app/views/student_work/_set_score_rule_detail.html.erb @@ -40,10 +40,12 @@ 教辅评分 <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i),homework.homework_detail_manual.ta_proportion), {:class => "markPercentage"} %>
    -
    - 学生匿评 - -
    + <% if homework.anonymous_comment == 0 %> +
    + 学生匿评 + +
    + <% end %>
    教师优先 /> @@ -51,7 +53,7 @@
    - 确定 + 确定
    取消 diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index c9be16521..6d929ac5f 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -56,8 +56,9 @@ <% if edit_mode %> 确定 或 - <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%> - <% else %> + <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%> + 取消 + <% else %> 发送 或 取消 From ee7b21de7231940a06f97949fa383dd62833a2ae Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 4 Nov 2015 10:54:09 +0800 Subject: [PATCH 034/125] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 23 +++++++++- app/views/courses/_course_activity.html.erb | 2 +- .../alert_forbidden_anonymous_comment.js.erb | 6 +++ .../_alert_forbidden_anonymous.html.erb | 16 +++++++ .../_evaluation_un_title.html.erb | 14 +++--- .../student_work/_evaluation_un_work.html.erb | 5 ++- .../forbidden_anonymous_comment.js.erb | 7 +++ app/views/users/_course_homework.html.erb | 24 ++++++---- app/views/users/_user_activities.html.erb | 17 ++++--- .../users/_user_homework_detail.html.erb | 44 +++++++++++++------ config/routes.rb | 3 ++ ...dd_anonymous_comment_to_homework_common.rb | 5 +++ db/schema.rb | 11 ++--- lib/tasks/homework_evaluation.rake | 4 +- 14 files changed, 132 insertions(+), 49 deletions(-) create mode 100644 app/views/homework_common/alert_forbidden_anonymous_comment.js.erb create mode 100644 app/views/student_work/_alert_forbidden_anonymous.html.erb create mode 100644 app/views/student_work/forbidden_anonymous_comment.js.erb create mode 100644 db/migrate/20151102085318_add_anonymous_comment_to_homework_common.rb diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 25782ec4b..38b953732 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -3,11 +3,11 @@ class StudentWorkController < ApplicationController include StudentWorkHelper require 'bigdecimal' require "base64" - before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule] + before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment] before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work] before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work] before_filter :author_of_work, :only => [:edit, :update, :destroy] - before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule] + before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment] ### def program_test @@ -469,6 +469,25 @@ class StudentWorkController < ApplicationController end end + def forbidden_anonymous_comment + @homework.update_column('anonymous_comment', 1) + homework_detail_manual = @homework.homework_detail_manual + homework_detail_programing = @homework.homework_detail_programing + if homework_detail_programing + homework_detail_manual.update_column('ta_proportion', 0.4) + homework_detail_programing.update_column('ta_proportion', 0.6) + else + homework_detail_manual.update_column('ta_proportion', 1.0) + end + @homework.student_works.each do |student_work| + set_final_score @homework,student_work + student_work.save + end + @user_activity_id = params[:user_activity_id].to_i + @is_in_course = params[:is_in_course].to_i + @course_activity = params[:course_activity].to_i + end + private #获取作业 def find_homework diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 4a7cb900d..a54e0667e 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -92,7 +92,7 @@ <% act = activity.course_act %> <% case activity.course_act_type.to_s %> <% when 'HomeworkCommon' %> - <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :course_activity => 1} %> <% when 'News' %> <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %> <% when 'Message' %> diff --git a/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb new file mode 100644 index 000000000..5177f4d92 --- /dev/null +++ b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb @@ -0,0 +1,6 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity => @course_activity}) %>'); +showModal('ajax-modal', '500px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed"); \ No newline at end of file diff --git a/app/views/student_work/_alert_forbidden_anonymous.html.erb b/app/views/student_work/_alert_forbidden_anonymous.html.erb new file mode 100644 index 000000000..55f21048f --- /dev/null +++ b/app/views/student_work/_alert_forbidden_anonymous.html.erb @@ -0,0 +1,16 @@ +
    +
    +

    禁用匿评

    +

    + 禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？ +

    +
    + + 确  定 + + + 取  消 + +
    +
    +
    \ No newline at end of file diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index 9a21e109b..26c69d225 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -35,12 +35,14 @@ <% end%> -
  • - <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> - <% if @show_all && @order == "student_score"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <% end%> -
    • + <% if @homework.anonymous_comment == 0%> +
  • + <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "student_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> +
    • + <% end %>
  • <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 832350e3e..6996ed6a6 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -47,7 +47,8 @@
    • <% end%> -
  • + <% if @homework.anonymous_comment == 0%> +
  • <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%> <% unless student_work.student_score.nil?%> @@ -61,7 +62,7 @@
    • <% end%> - + <% end %> <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
  • diff --git a/app/views/student_work/forbidden_anonymous_comment.js.erb b/app/views/student_work/forbidden_anonymous_comment.js.erb new file mode 100644 index 000000000..a72c29509 --- /dev/null +++ b/app/views/student_work/forbidden_anonymous_comment.js.erb @@ -0,0 +1,7 @@ +<% if @user_activity_id == -1 %> +$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>"); +init_activity_KindEditor_data(<%= @homework.id%>,"","87%"); +<% else %> +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>"); +init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); +<% end %> \ No newline at end of file diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index aa0344800..4dd6f1a0a 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -57,25 +57,33 @@
    • <% if is_teacher%> + <% comment_status = activity.homework_detail_manual.comment_status %>
      • - <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%> + <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity), :class => "postOptionLink"%>
      • - <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %> + <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %>
      • <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %>
        • -
      • - <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%> -
        • -
      • - <%= homework_anonymous_comment activity %> -
        • + <% if activity.anonymous_comment == 0 %> +
      • + <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%> +
        • +
      • + <%= homework_anonymous_comment activity %> +
        • + <% end %> + <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%> +
      • + <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%> +
        • + <% end %>
    diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index f4ddcc050..669953afa 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -11,7 +11,6 @@ .ke-inline-block{display: none;} div.ke-container{float:left;} -<% first_user_activity = user_activities.first.id unless user_activities.first.nil? %> <% user_activities.each do |user_activity| if user_activities %> \ No newline at end of file diff --git a/app/views/student_work/create.js.erb b/app/views/student_work/create.js.erb index 69dd8364d..42b1db8b8 100644 --- a/app/views/student_work/create.js.erb +++ b/app/views/student_work/create.js.erb @@ -1,7 +1,16 @@ -$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>'); -showModal('ajax-modal', '500px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before("" + - ""); -$('#ajax-modal').parent().css("top","").css("left",""); -$('#ajax-modal').parent().addClass("anonymos"); \ No newline at end of file +<% if @submit_result%> + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>'); + showModal('ajax-modal', '500px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before("" + + ""); + $('#ajax-modal').parent().css("top","").css("left",""); + $('#ajax-modal').parent().addClass("anonymos"); +<% else %> + window.location.href = '<%= new_student_work_url(:homework => @homework.id)%>'; +<% end %> + +function clickCanel() { + hideModal('#popbox02'); + window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>'; +} \ No newline at end of file From c08c327f7333bf9d9a2fc3335c24f990a124883b Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 6 Nov 2015 11:26:37 +0800 Subject: [PATCH 066/125] =?UTF-8?q?=E7=81=AB=E7=8B=90=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E4=B8=8B=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 1 + app/views/users/_course_homework.html.erb | 1 + app/views/words/leave_homework_message.js.erb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 6ad1a66b4..8590b836a 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -272,6 +272,7 @@ class WordsController < ApplicationController format.js{ @user_activity_id = params[:user_activity_id] @is_in_course = params[:is_in_course] + @course_activity = params[:course_activity] @homework_common_id = params[:homework_common_id] } end diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index f442e34e4..f77dd13bf 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -167,6 +167,7 @@
    <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%> <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %> + <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
    diff --git a/app/views/words/leave_homework_message.js.erb b/app/views/words/leave_homework_message.js.erb index 91525c889..08fed725c 100644 --- a/app/views/words/leave_homework_message.js.erb +++ b/app/views/words/leave_homework_message.js.erb @@ -1,5 +1,5 @@ <% if @user_activity_id %> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id}) %>"); + $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>"); init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); <% elsif @homework_common_id && @is_in_course %> $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>"); From 71728a15e42e0cc18f6ac4bd042689ec5732f7c3 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 6 Nov 2015 14:39:15 +0800 Subject: [PATCH 067/125] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BAGit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/gitlab_to_git.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/gitlab_to_git.rake b/lib/tasks/gitlab_to_git.rake index 3c7d119f2..8b7f7279e 100644 --- a/lib/tasks/gitlab_to_git.rake +++ b/lib/tasks/gitlab_to_git.rake @@ -4,7 +4,7 @@ namespace :rep_fault do desc "set ossean's type value" task :rep_update => :environment do rep = Repository.find(400) - rep.type = "Repository::Gitlab" + rep.type = "Repository::Git" rep.save end From 334de6444afe03f65770b7aa25f140ac9a3c8fc5 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 6 Nov 2015 14:57:16 +0800 Subject: [PATCH 068/125] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=A4=8D=E5=88=B6title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_repositories.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 4ac5424f9..43535153d 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -73,8 +73,7 @@ <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> <% rep_url = "http://" + repository.login.to_s + '_'+ repository.identifier.to_s + "@" + ip.to_s + h( repository.url.slice(project_path_cut, repository.url.length)) %> - + From 5d03a27170714fc59f376d01ada6096609ac2ad0 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 6 Nov 2015 14:57:39 +0800 Subject: [PATCH 069/125] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E5=92=8C=E5=85=B3=E9=97=AD=E5=8C=BF=E8=AF=84=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0=E8=AF=A5=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 9 +++++++++ app/helpers/application_helper.rb | 6 +++--- app/helpers/homework_common_helper.rb | 6 +++--- .../homework_common/_alert_anonyoms.html.erb | 2 +- .../start_anonymous_comment.js.erb | 19 +++++++++++++------ .../stop_anonymous_comment.js.erb | 12 ++++++++++-- app/views/users/_course_homework.html.erb | 2 +- .../users/_user_homework_detail.html.erb | 2 +- 8 files changed, 41 insertions(+), 17 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 1e68ed2ed..687ef9503 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -147,6 +147,9 @@ class HomeworkCommonController < ApplicationController else @statue = 3 end + @user_activity_id = params[:user_activity_id].to_i + @is_in_course = params[:is_in_course].to_i + @course_activity = params[:course_activity].to_i end #关闭匿评 @@ -162,6 +165,9 @@ class HomeworkCommonController < ApplicationController # 匿评关闭消息邮件通知 send_message_anonymous_comment(@homework, m_status = 3) Mailer.send_mail_anonymous_comment_close(@homework).deliver + @user_activity_id = params[:user_activity_id].to_i + @is_in_course = params[:is_in_course].to_i + @course_activity = params[:course_activity].to_i respond_to do |format| format.js end @@ -188,6 +194,9 @@ class HomeworkCommonController < ApplicationController @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count} end @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100) + @user_activity_id = params[:user_activity_id].to_i + @is_in_course = params[:is_in_course].to_i + @course_activity = params[:course_activity].to_i respond_to do |format| format.js end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 795147446..e5cd9b52b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2307,15 +2307,15 @@ module ApplicationHelper end #获取匿评相关连接代码 - def homework_anonymous_comment homework + def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1) if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评" elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2 case homework.homework_detail_manual.comment_status when 1 - link = link_to '启动匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink' + link = link_to '启动匿评', alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink' when 2 - link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink' + link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink' when 3 # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束" end diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb index a03c4ccd7..2d3c72c20 100644 --- a/app/helpers/homework_common_helper.rb +++ b/app/helpers/homework_common_helper.rb @@ -57,12 +57,12 @@ module HomeworkCommonHelper end #根据传入作业确定跳转到开启匿评还是关闭匿评功能 - def alert_anonyoms_path homework,homework_detail_manual + def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,is_in_course,course_activity link = "" if homework_detail_manual.comment_status == 1 - link = start_anonymous_comment_homework_common_url homework.id + link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity elsif homework_detail_manual.comment_status == 2 - link = stop_anonymous_comment_homework_common_url homework.id + link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity end link end diff --git a/app/views/homework_common/_alert_anonyoms.html.erb b/app/views/homework_common/_alert_anonyoms.html.erb index 73f240b02..3b1f6f692 100644 --- a/app/views/homework_common/_alert_anonyoms.html.erb +++ b/app/views/homework_common/_alert_anonyoms.html.erb @@ -34,7 +34,7 @@

    <% end %>
    - + 确  定 diff --git a/app/views/homework_common/start_anonymous_comment.js.erb b/app/views/homework_common/start_anonymous_comment.js.erb index b0424bf7a..ea63ea12c 100644 --- a/app/views/homework_common/start_anonymous_comment.js.erb +++ b/app/views/homework_common/start_anonymous_comment.js.erb @@ -1,12 +1,19 @@ <% if @statue == 1%> -alert('启动成功'); -$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>'); + alert('启动成功'); + <% if @user_activity_id == -1 %> + $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>"); + init_activity_KindEditor_data(<%= @homework.id%>,"","87%"); + <% else %> + $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>"); + init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); + <% end %> +/*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/ <% elsif @statue == 2 %> -alert('启动失败\n作业总数大于等于2份时才能启动匿评'); + alert('启动失败\n作业总数大于等于2份时才能启动匿评'); <% elsif @statue == 3%> -alert("已开启匿评，请务重复开启"); + alert("已开启匿评，请务重复开启"); <% elsif @statue == 4%> -alert("您没有权限开启匿评"); + alert("您没有权限开启匿评"); <% elsif @statue == 5%> -alert("作业提交截止之后才能启动匿评"); + alert("作业提交截止之后才能启动匿评"); <% end %> \ No newline at end of file diff --git a/app/views/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb index 4725d5731..214a157dc 100644 --- a/app/views/homework_common/stop_anonymous_comment.js.erb +++ b/app/views/homework_common/stop_anonymous_comment.js.erb @@ -1,2 +1,10 @@ -$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith(''); -alert('关闭成功'); \ No newline at end of file +alert('关闭成功'); +<% if @user_activity_id == -1 %> +$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>"); +init_activity_KindEditor_data(<%= @homework.id%>,"","87%"); +<% else %> +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>"); +init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%"); +<% end %> +/* +$("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/ diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index f77dd13bf..38a4d6edd 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -93,7 +93,7 @@ <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
  • - <%= homework_anonymous_comment activity %> + <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %>
    • <% end %> <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index e920cf409..0c2a28e5c 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -100,7 +100,7 @@ <% end %> <% if homework_common.anonymous_comment == 0%>
  • - <%= homework_anonymous_comment homework_common %> + <%= homework_anonymous_comment(homework_common, is_in_course) %>
    • <% end %> <% if homework_common.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%> From bdce627061210200b987ec7e2ffca3a9ea041883 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 15:06:14 +0800 Subject: [PATCH 070/125] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_resources_list.html.erb | 2 +- app/views/users/user_resource.html.erb | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index f134e8f42..34d609487 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -5,7 +5,7 @@ <% else %> <% attachments.each do |attach| %> -
      +
        • diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 5c6339e59..f6bb3c8cb 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -145,7 +145,6 @@ var id; //资源id var sendType; //发送到课程 1 发送到项目 2 var lastSendType; //保存上次发送的发送类型 - var last_op $("#resources_list").mousedown(function(e) { //如果是右键的话 if (3 == e.which) { @@ -180,28 +179,6 @@ last_line = line; } }); - - //鼠标经过时，背景颜色设为灰色 - $("#resources_list").mouseover(function(e){ - pageX = e.clientX; - pageY = e.clientY; - var ele = document.elementFromPoint(pageX,pageY); - line = $(ele).parent(); - if(last_op != null){ - last_op.children().css("background-color", 'white'); - restore(); - last_op == null; - } - //如果当前的tag是li，那么还要li的父级元素 - if(line.get(0).tagName === 'LI'){ - line = line.parent(); - } - //将当前的元素的所有子元素的背景色改为蓝色 - line.children().css("background-color", '#e1e1e1'); - //将当前元素赋给 上一个对象 保存起来。 - last_op = line; - }); - //元素包含关系计算 var contains = function(root, el) { if (root.compareDocumentPosition) From 7f63ceea76fa5065371962bcc98c7b0a69ba8254 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 6 Nov 2015 15:47:32 +0800 Subject: [PATCH 071/125] =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=A1=86=E7=9A=84=E9=99=84=E4=BB=B6=E5=8F=AF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_work_information.html.erb | 8 +++----- public/stylesheets/courses.css | 3 ++- public/stylesheets/css.css | 3 ++- public/stylesheets/new_user.css | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb index 2b5e3b67a..f8a55a03d 100644 --- a/app/views/student_work/_work_information.html.erb +++ b/app/views/student_work/_work_information.html.erb @@ -9,13 +9,11 @@

        附件： - <% if @student_work.attachments.count == 0%> + <% if @student_work.attachments.empty? %> <%= "无附件"%> <% else %> -

        - <% @student_work.attachments.each do |attachment| %> - <%=attachment.filename %> - <% end %> +
        + <%= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %>
        <% end %>

        diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1cff7e07a..8b5e2fba3 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -480,7 +480,7 @@ a.xls{ margin-left:5px; color:#136b3b;} /* 开启匿评弹框 */ .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81; overflow:auto;} -.ni_con { width:425px; margin:25px 30px;} +.ni_con { width:425px; margin:25px 30px;font-family:"微软雅黑","宋体";} .ni_con h2{ display:block; height:40px; width:425px; text-align:center; color:#3a3a3a;} .ni_con p{ color:#808181; } .ni_con a:hover{ text-decoration:none;} @@ -491,6 +491,7 @@ a:hover.tijiao{ background:#0f99a9;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } a.xls{ margin-left:5px; color:#136b3b;} +.grey_c{ color:#808181;} /* 学生列表*/ .st_list{ width:670px;} .st_search{ } diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 6114c1b4d..b740436f9 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -152,11 +152,12 @@ a:hover.tijiao{ background:#0f99a9 !important;} /* 匿名评分弹框 */ .alert_praise{width:480px;height:200px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;} -.ni_con { width:425px; margin:25px 30px;} +.ni_con { width:425px; margin:25px 30px;font-family:"微软雅黑","宋体";} .ni_con h2{ display:block; height:40px; width:188px; margin:0 auto;} .ni_con p{ color:#808181;} .ni_con a:hover{ text-decoration:none;} +.grey_c{ color:#808181;} /*弹框*/ .black_overlay{display:none;position:absolute;top:0%;left:0%;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.3;opacity:.30;filter:alpha(opacity=30);} .upload_box{display:none;position:absolute;top:25%;left:35%;width:30%;height: auto;padding:5px;border:3px solid #15bccf; background:#fff;z-index:1002;overflow:auto;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 0308ee748..7263c2f58 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1297,7 +1297,7 @@ a:hover.SetUpIcon{background: url(../images/homepage_icon.png) 0px -486px no-rep /* 开启匿评弹框 */ .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81; overflow:auto;} -.ni_con { width:425px; margin:15px;} +.ni_con { width:425px; margin:15px;font-family:"微软雅黑","宋体";} .ni_con h2{ display:block; height:40px; width:425px; text-align:center; color:#3a3a3a;} .ni_con p{ color:#808181; } .ni_con a:hover{ text-decoration:none;} @@ -1307,7 +1307,7 @@ a:hover.tijiao{ background:#297fb8;} .c_pink{ color:#e65d5e;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } - +.grey_c{ color:#808181;} a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} From bf1333ece9f1cba9d0397b4cd3259b107ab25d4f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:11:12 +0800 Subject: [PATCH 072/125] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=81=B6=E5=B0=94=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index af501fdf9..b71220df1 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -21,7 +21,7 @@ class AccountController < ApplicationController # prevents login action to be filtered by check_if_login_required application scope filter skip_before_filter :check_if_login_required - + protect_from_forgery :except => [:login,:logout] # Login request and validation def login if request.get? From 7aff7bc20b98c54dbf8f06b384f1f89c8d3105e4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:32:19 +0800 Subject: [PATCH 073/125] =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index b71220df1..33d988e35 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -21,7 +21,6 @@ class AccountController < ApplicationController # prevents login action to be filtered by check_if_login_required application scope filter skip_before_filter :check_if_login_required - protect_from_forgery :except => [:login,:logout] # Login request and validation def login if request.get? From 1e33e38fe2b76708ef47f1fdd1e0b767e623a4ed Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:34:37 +0800 Subject: [PATCH 074/125] =?UTF-8?q?token=E4=B8=8D=E5=AF=B9=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E9=82=A3=E5=B0=B1=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bb2138062..6387a97a4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -663,7 +663,8 @@ class ApplicationController < ActionController::Base if api_request? logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)." end - render_error "Invalid form authenticity token." + #render_error "Invalid form authenticity token." + redirect_to signin_path(:login=>true) end def render_feed(items, options={}) From 3cc9fbe6934b330c4570cc7e70320a33ba67d5cb Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:44:46 +0800 Subject: [PATCH 075/125] =?UTF-8?q?24=E7=82=B9=E6=94=B9=E4=B8=BA=2023:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index b05afc63b..41c7c1eee 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,9 +66,9 @@
      • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
      • 作业标题：<%= ma.course_message.name %>
        • -
      • 提交截止：<%= ma.course_message.end_time %>  24点
        • -
      • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
        • -
      • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
        • +
      • 提交截止：<%= ma.course_message.end_time %>  23:59
        • +
      • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
        • +
      • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
      • 迟交扣分：<%= ma.course_message.late_penalty %>分
      • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      @@ -81,9 +81,9 @@
    • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
      • -
    • 提交截止：<%= ma.course_message.end_time %>  24点
      • -
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
      • -
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
      • +
    • 提交截止：<%= ma.course_message.end_time %>  23:59
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
    @@ -116,9 +116,9 @@
    • 课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
      • -
    • 提交截止：<%= ma.course_message.end_time %>  24点
      • -
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
      • -
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
      • +
    • 提交截止：<%= ma.course_message.end_time %>  23:59
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

      • 请抓紧时间提交您的作品，谢谢！

      @@ -154,7 +154,7 @@
    • 课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      • -
    • 匿评截止：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
      • +
    • 匿评截止：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
    <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>

    请您尽早完成匿评！如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。

    @@ -215,7 +215,7 @@
  • 失败原因：提交作品的人数低于2人
  • 课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)
  • 作业标题：<%= ma.course_message.name %>
    • -
  • 提交截止：<%= ma.course_message.end_time%>  24点
    • +
  • 提交截止：<%= ma.course_message.end_time%>  23:59
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -314,7 +314,7 @@ <% end %>

    - 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！ + 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！

    <% end %> @@ -397,7 +397,7 @@
    • 课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)
    • 作业标题：<%= ma.course_message.homework_common.name %>
      • -
    • 提交截止：<%= ma.course_message.homework_common.end_time %> 24:00
      • +
    • 提交截止：<%= ma.course_message.homework_common.end_time %> 23:59
    • 提交时间：<%= format_time(ma.course_message.created_at) %>
    • 迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分
    From 88dc0070119d7a97424d13feb7aaec5708545e00 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 6 Nov 2015 17:45:06 +0800 Subject: [PATCH 076/125] =?UTF-8?q?=E6=9F=90=E4=BA=9B=E8=BF=9F=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E2=80=9C?= =?UTF-8?q?[=E8=BF=9F=E4=BA=A4]=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_un_work.html.erb | 2 +- app/views/student_work/_evaluation_work.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 6996ed6a6..02e73aaab 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -28,7 +28,7 @@
  • <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] <% end %> <% end %> diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 4a6a4eb68..78114d62b 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -48,7 +48,7 @@
  • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] <% end %>
    • From 48547f3e113f844cf610d407cf936b089a8cdb8c Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 6 Nov 2015 17:47:56 +0800 Subject: [PATCH 077/125] =?UTF-8?q?1/=E6=B7=BB=E5=8A=A0members=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=202=E3=80=81=E8=BF=87=E6=BB=A4=E6=8E=89=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=BA=93identifier=E9=87=8D=E5=A4=8D=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=BA=93=203=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0puts=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/gitlab_to_git.rake | 11 +++++++++++ lib/tasks/sync_sigle_rep.rake | 26 +++++++++++++++++--------- lib/trustie/gitlab/sync.rb | 20 ++++++++++++++++++++ 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/lib/tasks/gitlab_to_git.rake b/lib/tasks/gitlab_to_git.rake index 8b7f7279e..c7b97e00d 100644 --- a/lib/tasks/gitlab_to_git.rake +++ b/lib/tasks/gitlab_to_git.rake @@ -8,4 +8,15 @@ namespace :rep_fault do rep.save end + desc "forge and ossean's members" + task :sync_members => :environment do + projects = [] + projects << Project.where("id =? ",2) + projects << Project.where("id =? ",299) + puts projects + s = Trustie::Gitlab::Sync.new + projects.each do |project| + s.only_members(project.first) + end + end end \ No newline at end of file diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake index b99221c83..591dcce84 100644 --- a/lib/tasks/sync_sigle_rep.rake +++ b/lib/tasks/sync_sigle_rep.rake @@ -3,19 +3,27 @@ namespace :sync_rep do desc "sync some projects which just have sigle repository" task :sigle => :environment do - projects = Project.all + projects = Project.where("user_id !=?",12) projects.each do |project| # 针对类型为Git并且只有一个版本库的项目 if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git" rep = project.repositories.first - s = Trustie::Gitlab::Sync.new - s.sync_project(project, path: rep.identifier, import_url: rep.url) - rep.type = 'Repository::Gitlab' - rep.save - puts "*************************************" - puts project.id - puts rep.id - puts rep.identifier + count = Repository.find_by_sql("SELECT * FROM `repositories` where identifier = '#{rep.identifier}'").count + puts count + unless count > 1 + rep.identifier + puts "################################" + puts project.id + puts rep.id + s = Trustie::Gitlab::Sync.new + s.sync_project(project, path: rep.identifier, import_url: rep.url) + rep.type = 'Repository::Gitlab' + rep.save + puts "*************************************" + puts project.id + puts rep.id + puts rep.identifier + end end end end diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb index 8c84984ee..a303b22fb 100644 --- a/lib/trustie/gitlab/sync.rb +++ b/lib/trustie/gitlab/sync.rb @@ -69,6 +69,11 @@ module Trustie # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git # can use password + puts "@@@@@@@@@@@@@@@@@@@@@@@" + puts path + puts project.description + puts gid + puts import_url gproject = self.g.create_project(path, path: path, description: project.description, @@ -81,6 +86,7 @@ module Trustie user_id: gid, import_url: import_url ) + puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" project.gpid = gproject.id project.save! puts "Successfully created #{project.name}" @@ -100,6 +106,20 @@ module Trustie end end + def only_members(project) + project.members.each do |m| + begin + gid = m.user.gid + unless gid + gid = sync_user(m.user).id + end + self.g.add_team_member(project.gpid, gid, UserLevel::DEVELOPER) + rescue => e + puts e + end + end + end + def remove_project end end From 4e62dd121978fea218a862eb75f890aab2314ed9 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Sat, 7 Nov 2015 19:58:19 +0800 Subject: [PATCH 078/125] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/new_user_commit_homework.html.erb | 2 +- app/views/users/user_commit_homework.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index c3a736058..0e2648509 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -112,7 +112,7 @@
    <% if test.status.to_i == -2 %> -
    <%= test.results.first %>
    + 
    <%= test.results.first %>
    <% else %>
      diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb index a7416cf40..6f14ce05d 100644 --- a/app/views/users/user_commit_homework.html.erb +++ b/app/views/users/user_commit_homework.html.erb @@ -86,7 +86,7 @@
    <% if test.status.to_i == -2 %> -
    <%= test.results.first %>
    + 
    <%= test.results.first %>
    <% else %>
      From f229d18776be27caed0cdda006bd0797fce718c6 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 10:03:06 +0800 Subject: [PATCH 079/125] =?UTF-8?q?=E5=9C=A8=E8=AF=BE=E7=A8=8B=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 6 +++ app/views/files/_upload_course_files.erb | 2 +- app/views/files/_upload_show_project.html.erb | 1 + app/views/files/create.js.erb | 45 +++++++++++-------- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 1cd5b0f15..dd8dc84c4 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -332,6 +332,9 @@ class FilesController < ApplicationController #modify by nwb if @project @addTag=false + if params[:in_project_toolbar] + @in_project_toolbar = params[:in_project_toolbar] + end container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id])) attachments = Attachment.attach_filesex(container, params[:attachments], params[:attachment_type]) render_attachment_warning_if_needed(container) @@ -363,6 +366,9 @@ class FilesController < ApplicationController end elsif @course @addTag=false + if params[:in_course_toolbar] + @in_course_toolbar = params[:in_course_toolbar] + end attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type]) if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index 62d5c68e4..3578d4eb9 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -7,7 +7,7 @@ <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> - +
      课件 |  diff --git a/app/views/files/_upload_show_project.html.erb b/app/views/files/_upload_show_project.html.erb index 8223f071e..53c57b3c6 100644 --- a/app/views/files/_upload_show_project.html.erb +++ b/app/views/files/_upload_show_project.html.erb @@ -8,6 +8,7 @@ <%= form_tag(project_files_path(project), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> + <%= render :partial => 'files/attachement_list',:locals => {:project => project} %>
      <%= l(:button_cancel)%> diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb index f24d60811..9de7aa042 100644 --- a/app/views/files/create.js.erb +++ b/app/views/files/create.js.erb @@ -23,26 +23,35 @@ $("#upload_file_count").text("未上传文件"); $('#upload_file_div').slideToggle('slow'); <% if @project %> hideModal(); - $("#resource_list").html('<%= j(render partial: "project_file_new" ,locals: {project: @project}) %>'); - $("#project_files_count_info").html("<%= @all_attachments.count%>"); - $("#project_files_count_nav").html("(<%= @all_attachments.count%>)") -// 添加文件上传成功提示 - <% unless params[:attachments].nil? %> - var div = $('
      文件上传成功！
      '); - $("#course_list").prepend(div); - setTimeout( function(){div.remove();},3000) + <%if @in_project_toolbar%> + window.location.href = '<%= project_files_path(@project)%>' + <%else%> + + $("#resource_list").html('<%= j(render partial: "project_file_new" ,locals: {project: @project}) %>'); + $("#project_files_count_info").html("<%= @all_attachments.count%>"); + $("#project_files_count_nav").html("(<%= @all_attachments.count%>)") + // 添加文件上传成功提示 + <% unless params[:attachments].nil? %> + var div = $('
      文件上传成功！
      '); + $("#course_list").prepend(div); + setTimeout( function(){div.remove();},3000) + <% end %> <% end %> <%elsif @course%> - closeModal(); - $("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>'); - $("#courses_files_count_info").html("<%= @all_attachments.count%>"); - $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)") - // 添加文件上传成功提示, - <% unless params[:attachments].nil? %> - var div = $('
      文件上传成功！
      '); - $("#course_list").prepend(div); - setTimeout( function(){div.remove();},3000) - <% end %> + hideModal(); + <%if @in_course_toolbar %> + window.location.href='<%= course_files_path(@course)%>' + <%else%> + $("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>'); + $("#courses_files_count_info").html("<%= @all_attachments.count%>"); + $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)") + // 添加文件上传成功提示, + <% unless params[:attachments].nil? %> + var div = $('
      文件上传成功！
      '); + $("#course_list").prepend(div); + setTimeout( function(){div.remove();},3000) + <% end %> + <%end%> <% end %> <% end %> $(document).ready(img_thumbnails); From 8e66bb8fe166c4f9ead3c5be7b4f93c221564018 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 10:07:12 +0800 Subject: [PATCH 080/125] =?UTF-8?q?=E5=9C=A8=E8=AF=BE=E7=A8=8B=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index b7e1bfa1c..11662fc7b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -528,26 +528,23 @@ ActiveRecord::Schema.define(:version => 20151102090519) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :primary_key => "Num", :force => true do |t| - t.string "Defect", :limit => 50 - t.string "Category", :limit => 50 - t.string "File" - t.string "Method" - t.string "Module", :limit => 20 - t.string "Variable", :limit => 50 - t.integer "StartLine" - t.integer "IPLine" - t.string "IPLineCode", :limit => 200 - t.string "Judge", :limit => 15 - t.integer "Review", :limit => 1 + create_table "dts", :force => true do |t| + t.string "IPLineCode" t.string "Description" - t.text "PreConditions", :limit => 2147483647 - t.text "TraceInfo", :limit => 2147483647 - t.text "Code", :limit => 2147483647 + t.string "Num" + t.string "Variable" + t.string "TraceInfo" + t.string "Method" + t.string "File" + t.string "IPLine" + t.string "Review" + t.string "Category" + t.string "Defect" + t.string "PreConditions" + t.string "StartLine" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "enabled_modules", :force => true do |t| @@ -817,6 +814,16 @@ ActiveRecord::Schema.define(:version => 20151102090519) 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" From 4b272b6b9c622dbc009da3de584847ae3a1cc083 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:14:24 +0800 Subject: [PATCH 081/125] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA40000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/memo.rb | 2 +- app/views/forums/show.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/memo.rb b/app/models/memo.rb index 33b24db50..f6449a550 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base # 若是主题帖，则内容可以是空 #validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? } validates_length_of :subject, maximum: 50 - validates_length_of :content, maximum: 5000 + validates_length_of :content, maximum: 40000 validate :cannot_reply_to_locked_topic, :on => :create acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC" diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 25a4fae46..3d239cff1 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,10 +76,10 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } -// if(memo_content.html().trim().length > 5000){ -// $("#error").html("内容 过长（最长为 5000 个字符）").show(); -// return false; -// } + if(memo_content.html().trim().length > 40000){ + $("#error").html("内容 过长（最长为 40000 个字符）").show(); + return false; + } return true; } From 1edd87f9e020cc69efd3f41d0689fd6baf76ba06 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:15:01 +0800 Subject: [PATCH 082/125] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA20000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/memo.rb | 2 +- app/views/forums/show.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/memo.rb b/app/models/memo.rb index f6449a550..94ff5cee2 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base # 若是主题帖，则内容可以是空 #validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? } validates_length_of :subject, maximum: 50 - validates_length_of :content, maximum: 40000 + validates_length_of :content, maximum: 20000 validate :cannot_reply_to_locked_topic, :on => :create acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC" diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 3d239cff1..4bbf81668 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,8 +76,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().trim().length > 40000){ - $("#error").html("内容 过长（最长为 40000 个字符）").show(); + if(memo_content.html().trim().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); return false; } return true; From 463262e83819c9039f3adeac4765773a4ffdc777 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Nov 2015 11:16:19 +0800 Subject: [PATCH 083/125] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E6=97=B6=E7=AB=8B=E9=A9=AC=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 12 ++++++++++++ app/views/student_work/edit.html.erb | 13 +++++++++++-- app/views/student_work/new.html.erb | 13 +++++++++++-- app/views/student_work/update.js.erb | 16 ++++++++++++++++ public/javascripts/course.js | 10 ++++++++-- public/javascripts/new_user.js | 10 ++++++++-- 6 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 app/views/student_work/update.js.erb diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index c36877092..9ad46cd69 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -221,24 +221,36 @@ class StudentWorkController < ApplicationController def update if params[:student_work] + @submit_result = true @work.name = params[:student_work][:name] @work.description = params[:student_work][:description] @work.project_id = params[:student_work][:project] @work.save_attachments(params[:attachments]) render_attachment_warning_if_needed(@work) if @work.save +=begin respond_to do |format| format.html { flash[:notice] = l(:notice_successful_edit) redirect_to student_work_index_url(:homework => @homework.id) } +=end + @student_work = @work + respond_to do |format| + format.js end return end end +=begin respond_to do |format| format.html{redirect_to edit_student_work_url(@work)} end +=end + @submit_result = false + respond_to do |format| + format.js + end end def show diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb index 25a65f039..517a238b0 100644 --- a/app/views/student_work/edit.html.erb +++ b/app/views/student_work/edit.html.erb @@ -26,7 +26,7 @@
      - <%= labelled_form_for @work,:html => { :multipart => true } do |f|%> + <%= labelled_form_for @work,:html => { :multipart => true },:remote=>true do |f|%>
      提示：作品名称和描述中不要出现真实的姓名信息
      @@ -52,7 +52,7 @@
      - 确定 + 确定 或 <%= link_to "取消", student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
      @@ -60,3 +60,12 @@ <% end%>
    + \ No newline at end of file diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index db83fd432..fdf1e31a3 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -111,11 +111,20 @@
    - 确定 + 确定 或 <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
    <% end%> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/student_work/update.js.erb b/app/views/student_work/update.js.erb new file mode 100644 index 000000000..79733db31 --- /dev/null +++ b/app/views/student_work/update.js.erb @@ -0,0 +1,16 @@ +<% if @submit_result%> +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>'); +showModal('ajax-modal', '500px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("anonymos"); +<% else %> +window.location.href = '<%= edit_student_work_url(@work)%>'; +<% end %> + +function clickCanel() { + hideModal('#popbox02'); + window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>'; +} \ No newline at end of file diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 0c7f4156f..84e087c49 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -954,13 +954,19 @@ function regexStudentWorkDescription() function new_student_work() { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#new_student_work").submit();} + { + $("#new_student_work").submit(); + $("#ajax-indicator").hide(); + } } function edit_student_work(id) { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#edit_student_work_" + id).submit();} + { + $("#edit_student_work_" + id).submit(); + $("#ajax-indicator").hide(); + } } // diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js index ca7b28ee7..a0647b592 100644 --- a/public/javascripts/new_user.js +++ b/public/javascripts/new_user.js @@ -250,13 +250,19 @@ function regex_evaluation_num(){ function new_student_work() { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#new_student_work").submit();} + { + $("#new_student_work").submit(); + $("#ajax-indicator").hide(); + } } function edit_student_work(id) { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#edit_student_work_" + id).submit();} + { + $("#edit_student_work_" + id).submit(); + $("#ajax-indicator").hide(); + } } //验证作品名称 From 2d321d2dbc2d11b9a79fe19c147400c424c849d4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:24:20 +0800 Subject: [PATCH 084/125] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA20000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=EF=BC=8C=E8=B6=85=E8=BF=87=E4=B8=A4=E4=B8=87?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 4bbf81668..8e5a6b8e0 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,7 +76,7 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().trim().length > 20000){ + if(memo_content.html().length > 20000){ $("#error").html("内容 过长（最长为 20000 个字符）").show(); return false; } From 2e092b0d04078f0a1c09f0dfcaf4d9c8d30fc71d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:27:05 +0800 Subject: [PATCH 085/125] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA30000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=EF=BC=8C=E8=B6=85=E8=BF=87=E4=B8=A4=E4=B8=87?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/memo.rb | 2 +- app/views/forums/show.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/memo.rb b/app/models/memo.rb index 94ff5cee2..7c4fbdcf1 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base # 若是主题帖，则内容可以是空 #validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? } validates_length_of :subject, maximum: 50 - validates_length_of :content, maximum: 20000 + validates_length_of :content, maximum: 30000 validate :cannot_reply_to_locked_topic, :on => :create acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC" diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 8e5a6b8e0..523ab1300 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,8 +76,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().length > 20000){ - $("#error").html("内容 过长（最长为 20000 个字符）").show(); + if(memo_content.html().length > 30000){ + $("#error").html("内容 过长（最长为 30000 个字符）").show(); return false; } return true; From d461e1be0d95d785c54652a49d5e75215e2cb7c9 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Nov 2015 11:54:33 +0800 Subject: [PATCH 086/125] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E2=80=9C=E6=82=A8?= =?UTF-8?q?=E5=B0=9A=E6=9C=AA=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_list.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index d834bc845..64f097114 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -2,10 +2,10 @@ 作品 - （<%= @student_work_count%>） + (已有<%= @student_work_count%>人提交) <% if !@is_teacher && @stundet_works.empty?%> - 未提交 + 您尚未提交作品 <% end %> <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> From 157ba12513784cb6f9526c8cb2df64d4dd67e203 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 14:04:51 +0800 Subject: [PATCH 087/125] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E8=99=9A?= =?UTF-8?q?=E7=BA=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_resources_list.html.erb | 2 ++ public/stylesheets/new_user.css | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index 34d609487..6f47e3535 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -21,5 +21,7 @@
  • <%= format_date(attach.created_on) %>
  • <%= attach.id %>
    • +
      + <% end %> <% end %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 7263c2f58..a4b8da25f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -401,7 +401,8 @@ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: a.resourcesBlack:hover {font-size:12px; color:#000000;} .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;} .resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;} -.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} +.resourcesList {width:710px; height:39px; background-color:#ffffff; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} /*border-bottom:1px dashed #eaeaea;*/ +.resourcesListDashLine {width:710px;border-bottom:1px dashed #eaeaea !important; margin-left:auto; margin-right:auto; padding-bottom: 2px} /*border-bottom:1px dashed #eaeaea;*/ .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;} .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;} .resourcesSelectSend {float:right;} From 0c202a47bb5436b3249996a1efb35efce4b1ace2 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 14:35:12 +0800 Subject: [PATCH 088/125] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 2d4754a0a..54c9541f2 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -164,7 +164,7 @@
      <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> - <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'canel_message_replay();', :class => " grey_btn fr c_white mt10 mr5" %> + <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %> <% end %>
      From 0e42554ef9b706fbabbb8fae68543f2886327cf9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 14:58:01 +0800 Subject: [PATCH 089/125] =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=92=8C=20=E7=9B=B4=E6=8E=A5=E4=B8=8A=E4=BC=A0=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=9C=A8=E5=90=8C=E4=B8=80=E5=88=97=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/import_resources_to_homework.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/import_resources_to_homework.js.erb b/app/views/users/import_resources_to_homework.js.erb index c929f48e5..804b4ec44 100644 --- a/app/views/users/import_resources_to_homework.js.erb +++ b/app/views/users/import_resources_to_homework.js.erb @@ -2,7 +2,7 @@ <% @attachments.each do |attachment| %> $("#attachments_fields").append( ''+ - '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+ + '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "upload_filename link_file", :readonly=>"readonly")%>'+ '<%= text_field_tag("attachments[p#{attachment.id}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+ '<%= l(:field_is_public)%>:'+ '<%= check_box_tag("attachments[p#{attachment.id}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+ From dc7a90cab5280ee9c17debb3cb531a44397648ee Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Nov 2015 15:07:33 +0800 Subject: [PATCH 090/125] =?UTF-8?q?=E5=8A=A9=E6=95=99=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_add_score.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index 961f351de..0258b3b83 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -16,7 +16,7 @@ <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
      <%end%> - 提交 + 提交
      <% end%> \ No newline at end of file From 20b49385de29a421d0ea8b6ce7cd0d6b238c7933 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 15:36:32 +0800 Subject: [PATCH 091/125] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E4=BD=9C=E4=B8=9A=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 1 + config/application.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 41c7c1eee..eb15fa717 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,6 +66,7 @@
    • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
      • +
    • 发布时间：<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M:%S').to_s %>
    • 提交截止：<%= ma.course_message.end_time %>  23:59
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
      • diff --git a/config/application.rb b/config/application.rb index 90cc299c6..6e4a2983a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -41,7 +41,7 @@ module RedmineApp config.active_record.store_full_sti_class = true config.active_record.default_timezone = :local - + config.time_zone = 'Beijing' # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' From 7bd9c5b65cf0f1b05f34d1c1913cd52ee6ba0dad Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 15:55:55 +0800 Subject: [PATCH 092/125] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E4=BD=9C=E4=B8=9A=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index eb15fa717..384a91e54 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,10 +66,10 @@
    • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
      • -
    • 发布时间：<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M:%S').to_s %>
      • -
    • 提交截止：<%= ma.course_message.end_time %>  23:59
      • -
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
      • -
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
      • +
    • 发布时间：<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %>
      • +
    • 提交截止：<%= ma.course_message.end_time %> 23:59
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %> 23:59
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %> 23:59
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      • @@ -382,7 +382,7 @@
    • <%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %>
    • <%=link_to ma.course_message.homework_common.user.show_name, user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %> - ">发布的作业： + ">老师发布的作业：
    • <%= link_to "作业题目：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id), From 3c93103bc75755f97c62806f6a9f95cf939476ff Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 15:59:24 +0800 Subject: [PATCH 093/125] =?UTF-8?q?=E8=BF=9F=E4=BA=A4=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E8=80=81=E5=B8=88=E5=90=8D=E7=A7=B0=E8=A6=81=E7=BB=99?= =?UTF-8?q?=E7=A7=B0=E5=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 384a91e54..da649663d 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -381,8 +381,8 @@ diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 4a6a4eb68..253a6418a 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -1,62 +1,63 @@ - -
        - <% is_my_work = student_work.user == User.current%> -
      • -
          - <% if is_my_work%> -
        • - <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %> -
          • -
        • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
          - <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> -
          -
          • -
        • -
            -
          • - <%= student_work.user.show_name%> -
            • -
          • - <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
            • -
          -
          • - <% else%> -
        • - <%= image_tag(url_to_avatar(""),width:"40", height: "40") %> -
          • -
        • -
          - <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> -
          -
          • -
        • -
            -
          • - 匿名 -
            • -
          • - -- -
            • -
          -
          • - <% end%> - -
        -
        • -
      • - <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> - [迟交] - <% end %> -
        • - - - <% my_score = student_work_score(student_work,User.current) %> -
      • - <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%> -
        • -
      - + +
        + <% is_my_work = student_work.user == User.current%> +
      • +
          + <% if is_my_work%> +
        • + <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %> +
          • +
        • + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
          + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> +
          +
          • +
        • +
            +
          • + <%= student_work.user.show_name%> +
            • +
          • + <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> +
            • +
          +
          • + <% else%> +
        • + <%= image_tag(url_to_avatar(""),width:"40", height: "40") %> +
          • +
        • +
          + <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> +
          +
          • +
        • +
            +
          • + 匿名 +
            • +
          • + -- +
            • +
          +
          • + <% end%> + +
        +
        • +
      • + <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> + [迟交] + <% end %> +
        • + + + <% my_score = student_work_score(student_work,User.current) %> +
      • + <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%> +
        • +
      • 点击查看详情
        • +
      + diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1cff7e07a..97af45fa2 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -43,10 +43,13 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .pingBackTit{ float:left; width:573px; margin-left:10px; } .hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; background-color: #f6f6f6;} .hworkH30 {height:30px !important; line-height:30px !important;} -.hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle;} +.hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle; position: relative;} .hworkListRow:hover {background-color:#f6f6f7;} .hworkUl li{ float:left;} .hworkListRow li{ float:left;} +.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-108px; top:20px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} +.hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} +.hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;} .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;} .hworkList80 {width:80px; text-align:center;} .hworkList50 {width:50px; text-align:center;} From 4adc6deabf8f0dbddceb0b2ff3683087589ea275 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 14:18:39 +0800 Subject: [PATCH 096/125] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=8F=90=E9=86=92=E7=94=A8=E6=88=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_term_select.html.erb | 41 +++++++++++++++++++++++++ app/views/courses/settings.html.erb | 19 ++++++++++-- public/stylesheets/courses.css | 7 +++++ 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 app/views/courses/_term_select.html.erb diff --git a/app/views/courses/_term_select.html.erb b/app/views/courses/_term_select.html.erb new file mode 100644 index 000000000..e295e7c94 --- /dev/null +++ b/app/views/courses/_term_select.html.erb @@ -0,0 +1,41 @@ +
      +
      +

      + 当前课程的学期信息不能修改。如果您希望为本课程新建学期，请根据需要执行以下两种操作之一（目前复制学期正在改进中，将尽快上线）。选择前请参考按钮右侧的说明： +

      +
      +
      + + 新建学期 + + 新建学期将为您创建一个新的课程学期，新学期不包括之前学期的任何内容。 +
      +
      +
      + +
      + 复制学期 + (开发中...) +
      + 复制学期将为您创建一个新的课程学期，新学期将继承本学期的相关资源，具体您稍后可以选择。 +
      +
      +
      + + 如何复制之前学期的资源？ + + 退  出 +
      +
      +
      + + \ No newline at end of file diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index a462db79d..a90be14ea 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -36,8 +36,8 @@
    • - <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {} %> - <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{} %> + <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time_selected"} %> + <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"} %>
    • @@ -92,4 +92,17 @@ -
      \ No newline at end of file +
      + \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 8b5e2fba3..85d2e3334 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -492,6 +492,13 @@ a:hover.tijiao{ background:#0f99a9;} .ni_con_work p{ color:#808181; } a.xls{ margin-left:5px; color:#136b3b;} .grey_c{ color:#808181;} + +.disable_btn { height:46px; display:block; width:90px; color:#fff; background:#d0d2d0; text-align:center; padding-top:4px; margin-right:15px;} +a.term_btn{ height:38px; display:block; width:90px; color:#fff; background:#269ac9; text-align:center; padding-top:12px; margin-right:15px;} +a:hover.term_btn{ background:#297fb8;} +p.c_black{ color:#000000;} +a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3c3; text-align:center; padding-top:4px;} +.lh22{ line-height: 22px;} /* 学生列表*/ .st_list{ width:670px;} .st_search{ } From 8d94f57ec33fd3a37eb47be8f9dc0bebf4aa2361 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 14:33:46 +0800 Subject: [PATCH 097/125] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D=E8=A7=81=E4=BA=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 ++ public/stylesheets/new_user.css | 2 ++ public/stylesheets/project.css | 2 ++ 3 files changed, 6 insertions(+) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 8b5e2fba3..da4c03398 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -893,6 +893,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a4b8da25f..2ba5a7374 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1153,6 +1153,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 4594d0c51..6a4254046 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,6 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From dcdffe5d04782f3e8dd4d0ba01fe0685e31e190b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 14:37:16 +0800 Subject: [PATCH 098/125] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D=E8=A7=81=E4=BA=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 ++ public/stylesheets/new_user.css | 2 ++ public/stylesheets/project.css | 2 ++ 3 files changed, 6 insertions(+) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 2fd06bf69..054dd5ffc 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -903,6 +903,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 7263c2f58..2fbf79c30 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1152,6 +1152,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 4594d0c51..6a4254046 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,6 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From 4be3b16b60f4d4acfca25b115dab9be49d8eac86 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 14:51:44 +0800 Subject: [PATCH 099/125] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_un_work.html.erb | 2 +- app/views/student_work/_evaluation_work.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 0d55cb130..ebe3d4cc6 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -80,6 +80,6 @@ <% end%>
      • -
    • 点击查看详情
      • + diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index aa6009466..81d868a50 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -48,7 +48,7 @@
    • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] <% end %>
      • @@ -58,6 +58,6 @@
    • <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
      • -
    • 点击查看详情
      • + From 82c377a60aa1988a562073bb088163e378f617f3 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 15:18:13 +0800 Subject: [PATCH 100/125] =?UTF-8?q?=E5=9C=A8=E5=AF=BC=E8=88=AA=E5=A4=84?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/_new_style_attachment_list.html.erb | 82 +++++-------------- app/views/files/_upload_course_files.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- .../_upload_project_files_list.html.erb | 35 ++++++++ .../_upload_project_files_on_navbar.html.erb | 30 +++++++ public/stylesheets/courses.css | 4 +- public/stylesheets/new_user.css | 4 +- public/stylesheets/project.css | 4 +- 8 files changed, 95 insertions(+), 68 deletions(-) create mode 100644 app/views/projects/_upload_project_files_list.html.erb create mode 100644 app/views/projects/_upload_project_files_on_navbar.html.erb diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index 022486413..af679c4d3 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -1,71 +1,33 @@ + <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> - -<% if @course %> - <%= file_field_tag 'attachments[dummy][file]', - :id => '_file', - :class => ie8? ? '':'file_selector', - :multiple => true, - :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");', - :style => ie8? ? '': 'display:none', - :data => { - :max_file_size => Setting.attachment_max_size.to_i.kilobytes, - :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), - :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js'), - :description_placeholder => l(:label_optional_description), - :field_is_public => l(:field_is_public), - :are_you_sure => l(:text_are_you_sure), - :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) - } %> -<% else %> - <%= file_field_tag 'attachments[dummy][file]', - :id => '_file', - :class => ie8? ? '':'file_selector', - :multiple => true, - :onchange => 'addInputFiles(this);', - :style => ie8? ? '': 'display:none', - :data => { - :max_file_size => Setting.attachment_max_size.to_i.kilobytes, - :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), - :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js'), - :description_placeholder => l(:label_optional_description), - :field_is_public => l(:field_is_public), - :are_you_sure => l(:text_are_you_sure), - :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) - } %> -<% end %> - + + <%= file_field_tag 'attachments[dummy][file]', + :id => "_file#{container.id}", + :class => ie8? ? '':'file_selector', + :multiple => true, + :onchange => "addInputFiles_board(this, '#{container.id}');", + :style => ie8? ? '': 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> + - + <%= l(:label_no_file_uploaded)%> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
      - -<% if defined?(container) && container && container.saved_attachments %> - <% container.attachments.each_with_index do |attachment, i| %> - - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> - <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> - <%= l(:field_is_public)%>: - <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> - <%= if attachment.id.nil? - #待补充代码 - else - link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') - end - %> - <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> - - <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> - - <% end %> -<% end %> +
      \ No newline at end of file diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index 3578d4eb9..9c7021383 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -19,7 +19,7 @@
      - <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %> + <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
      <%= l(:button_cancel)%> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index e06db1d0f..d2186118d 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -226,7 +226,7 @@ function project_files_upload() { - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_show_project',:locals => {:project => @project}) %>'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>'); showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb new file mode 100644 index 000000000..59da30012 --- /dev/null +++ b/app/views/projects/_upload_project_files_list.html.erb @@ -0,0 +1,35 @@ + +<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> + + <%= file_field_tag 'attachments[dummy][file]', + :id => "_file#{container.id}", + :class => ie8? ? '':'file_selector', + :multiple => true, + :onchange => "addInputFiles_board(this, '#{container.id}');", + :style => ie8? ? '': 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> + + + + + <%= l(:label_no_file_uploaded)%> + +(<%= l(:label_max_size) %>: +<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) +
      + +
      + + +
      +
      \ No newline at end of file diff --git a/app/views/projects/_upload_project_files_on_navbar.html.erb b/app/views/projects/_upload_project_files_on_navbar.html.erb new file mode 100644 index 000000000..591e159f1 --- /dev/null +++ b/app/views/projects/_upload_project_files_on_navbar.html.erb @@ -0,0 +1,30 @@ + +
      +
      +

      <%= l(:label_upload_files)%>

      +
      + <%= error_messages_for 'attachment' %> + + + <%= form_tag(project_files_path(container), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> + + + <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %> +
      + <%= l(:button_cancel)%> + <%= l(:button_confirm)%> + <% end %> +
      + +
      + <% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> + <% end %> +
      + + \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index da4c03398..342833981 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -893,8 +893,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2ba5a7374..f21a4b1fd 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1153,8 +1153,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 6a4254046..e7a24b151 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,8 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From c20ff6980bd3aba176ec265608b08eb53d778560 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 15:22:10 +0800 Subject: [PATCH 101/125] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D?= =?UTF-8?q?=E8=A7=81=E4=BA=86bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 4 ++-- public/stylesheets/new_user.css | 4 ++-- public/stylesheets/project.css | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 054dd5ffc..48c6a2d88 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -903,8 +903,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2fbf79c30..11ce8e613 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1152,8 +1152,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 6a4254046..e7a24b151 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,8 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From 6dd264990e08efaece2ee5605d9c9eeb98f7a43e Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 15:27:59 +0800 Subject: [PATCH 102/125] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_evaluation_un_work.html.erb | 15 ++++++++++++--- .../student_work/_evaluation_work.html.erb | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index ebe3d4cc6..2a0962244 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -5,7 +5,7 @@
    • <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
      • -
      +
    • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
      @@ -25,7 +25,7 @@
      • -
    • +
    • <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> @@ -80,6 +80,15 @@
      • <% end%> - + + diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 81d868a50..e336b0282 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -7,13 +7,13 @@
    • <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
      • -
    • +
    • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
      <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
      • -
    • +
      • <%= student_work.user.show_name%> @@ -27,12 +27,12 @@
      • <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
        • -
      • +
      • <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
        • -
      • +
        • 匿名 @@ -46,7 +46,7 @@
        • -
      • +
      • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] @@ -58,6 +58,13 @@
      • <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
        • - +
      + From ef74d8d95693e50f4f69444c16c1680f27a5c119 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 10 Nov 2015 15:31:24 +0800 Subject: [PATCH 103/125] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1--?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E4=B8=8D?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/gitlab_to_git.rake | 22 ----------- lib/tasks/sync_gitlab_user.rake | 39 +++++++++++++++++++ lib/trustie/gitlab/helper.rb | 68 ++++++++++++++++----------------- 3 files changed, 73 insertions(+), 56 deletions(-) delete mode 100644 lib/tasks/gitlab_to_git.rake create mode 100644 lib/tasks/sync_gitlab_user.rake diff --git a/lib/tasks/gitlab_to_git.rake b/lib/tasks/gitlab_to_git.rake deleted file mode 100644 index c7b97e00d..000000000 --- a/lib/tasks/gitlab_to_git.rake +++ /dev/null @@ -1,22 +0,0 @@ -#coding=utf-8 - -namespace :rep_fault do - desc "set ossean's type value" - task :rep_update => :environment do - rep = Repository.find(400) - rep.type = "Repository::Git" - rep.save - end - - desc "forge and ossean's members" - task :sync_members => :environment do - projects = [] - projects << Project.where("id =? ",2) - projects << Project.where("id =? ",299) - puts projects - s = Trustie::Gitlab::Sync.new - projects.each do |project| - s.only_members(project.first) - end - end -end \ No newline at end of file diff --git a/lib/tasks/sync_gitlab_user.rake b/lib/tasks/sync_gitlab_user.rake new file mode 100644 index 000000000..c932ca36c --- /dev/null +++ b/lib/tasks/sync_gitlab_user.rake @@ -0,0 +1,39 @@ +#coding=utf-8 + +namespace :gitlab do + desc "sync gitlab's users which lost in last sync" + task :add_gid => :environment do + users = User.find_by_sql("select * from users where gid is null") + s = Trustie::Gitlab::Sync.new + g = Gitlab.client + users.each do |user| + us = g.get("/users?search=#{user.mail}") + puts user.mail + if us.blank? + puts "55555555555555555" + s.sync_user(user) + else + # 解决查询的时候出现多值的情况，比如:123@163.com和g123@163.com + puts "66666666666666666666" + puts user.id + if Array === us + us.each do |u| + if u.email == user.mail + user.gid = u.id + user.save + end + end + end + end + end + end + + task :sync_members => :environment do + projects = Project.all + s = Trustie::Gitlab::Sync.new + projects.each do |project| + puts project.id + s.only_members(project.first) + end + end +end \ No newline at end of file diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb index 57c333875..61c1fbd17 100644 --- a/lib/trustie/gitlab/helper.rb +++ b/lib/trustie/gitlab/helper.rb @@ -3,46 +3,46 @@ module Trustie module Gitlab module Helper - def change_password(uid, en_pwd, salt) - return unless uid - options = {:encrypted_password=>en_pwd, :password_salt=>salt} - self.g.put("/users/ext/#{uid}", :body => options) - # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt) - end + def change_password(uid, en_pwd, salt) + return unless uid + options = {:encrypted_password=>en_pwd, :password_salt=>salt} + self.g.put("/users/ext/#{uid}", :body => options) + # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt) + end - def find_user(user) - us = self.g.get("/users?search=#{user.mail}") - if Array === us - us.each do |u| - return u if u.email == user.mail - end + def find_user(user) + us = self.g.get("/users?search=#{user.mail}") + if Array === us + us.each do |u| + return u if u.email == user.mail end - return nil end + return nil + end - def add_user(user) - u = nil - begin - u = find_user(user) - unless u - u = self.g.create_user(user.mail, - user.hashed_password, - name: user.show_name, - username: user.login, - confirm: "true") - user.gid = u.id - end - change_password(u.id, user.hashed_password, user.salt) - rescue => e - puts e - end - return u + def add_user(user) + u = nil + begin + u = find_user(user) + unless u + u = self.g.create_user(user.mail, + user.hashed_password, + name: user.show_name, + username: user.login, + confirm: "true") + user.gid = u.id + end + change_password(u.id, user.hashed_password, user.salt) + rescue => e + puts e end + return u + end - def del_user(user) - return unless user.gid - self.g.delete_user(user.gid) - end + def del_user(user) + return unless user.gid + self.g.delete_user(user.gid) + end end end From 463b6e91f5e5ebbf38ab0911fac13989eddb1685 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 16:03:06 +0800 Subject: [PATCH 104/125] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index fadf5e465..b316aa406 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -128,6 +128,11 @@ }); $mail.blur(function (event) { + if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){ + $('#mail_req').html( '邮件格式不对').show(); + $mail_correct = false; + return ; + } if ($(this).is('#user_mail')) { $.get('<%=account_valid_ajax_path%>', { valid: "mail", From db0978c6571e5645fc5cc931d911e145b8fcc68a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 17:07:37 +0800 Subject: [PATCH 105/125] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 186 +++++++++++++++++---------------- app/views/memos/edit.html.erb | 9 +- public/javascripts/feedback.js | 38 ++++++- 3 files changed, 136 insertions(+), 97 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 523ab1300..5bbc52db2 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -1,96 +1,5 @@ <%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %> -
      -
      \ No newline at end of file +
      • + \ No newline at end of file diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index d26ebdbf8..b2b7d73f0 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -7,10 +7,11 @@ $("#error").html('主题不能超过50个字符').show(); return; } -// if(memo_content.html().trim().length > 5000 ){ -// $("#error").html('内容不能超过5000个字符').show(); -// return; -// } + if(memo_content.html().length > 30000){ + $("#error").html("内容 过长（最长为 30000 个字符）").show(); + $("html,body").animate({scrollTop:$("#error").offset().top},1000) + return false; + } memo_content.sync(); $("#edit_memo").submit(); }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){ diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js index b30c8f91d..97209131e 100644 --- a/public/javascripts/feedback.js +++ b/public/javascripts/feedback.js @@ -1,5 +1,10 @@ (function($){ $.fn.fix = function(options){ + var u = navigator.userAgent; + if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ + $("#scrollsidebar").css("display","none"); + return; + } var defaults = { float : 'right', minStatue : true, @@ -73,6 +78,11 @@ function cookieget(n) $(function(){ + var u = navigator.userAgent; + if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ + $("#scrollsidebar").css("display","none"); + return; + } $(".closeSidebar").click(function(){ $(".show_btn").css("display","none"); $("#scrollsidebar").css("display","none"); @@ -109,4 +119,30 @@ $(function(){ $("#textCount").text(50-$("#subject").val().length) } }); -}); \ No newline at end of file +}); + +//var browser={ +// versions:function(){ +// var u = navigator.userAgent, app = navigator.appVersion; +// return {//移动终端浏览器版本信息 +// trident: u.indexOf('Trident') > -1, //IE内核 +// presto: u.indexOf('Presto') > -1, //opera内核 +// webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核 +// gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核 +// mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端 +// ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端 +// android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 +// iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 +// iPad: u.indexOf('iPad') > -1, //是否iPad +// webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部 +// }; +// }(), +// language:(navigator.browserLanguage || navigator.language).toLowerCase() +//} +//document.writeln("语言版本: "+browser.language); +//document.writeln(" 是否为移动终端: "+browser.versions.mobile); +//document.writeln(" ios终端: "+browser.versions.ios); +//document.writeln(" android终端: "+browser.versions.android); +//document.writeln(" 是否为iPhone: "+browser.versions.iPhone); +//document.writeln(" 是否iPad: "+browser.versions.iPad); +//document.writeln(navigator.userAgent); \ No newline at end of file From 2cf61ad74f9eb6a0f05cd5645bc805107b15a3fe Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 17:34:18 +0800 Subject: [PATCH 106/125] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 4 ++-- app/views/memos/edit.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 5bbc52db2..05c086ed4 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -128,8 +128,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().length > 30000){ - $("#error").html("内容 过长（最长为 30000 个字符）").show(); + if(memo_content.html().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); $("html,body").animate({scrollTop:$("#error").offset().top},1000) return false; } diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index b2b7d73f0..cace5bcc8 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -7,8 +7,8 @@ $("#error").html('主题不能超过50个字符').show(); return; } - if(memo_content.html().length > 30000){ - $("#error").html("内容 过长（最长为 30000 个字符）").show(); + if(memo_content.html().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); $("html,body").animate({scrollTop:$("#error").offset().top},1000) return false; } From 508ca7f823c474d756d002b437557633b3648a3e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 11 Nov 2015 11:19:10 +0800 Subject: [PATCH 107/125] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=20=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form_course.html.erb | 3 ++- .../files/_new_style_attachment_list.html.erb | 3 ++- .../_upload_project_files_list.html.erb | 3 ++- public/javascripts/attachments.js | 17 ++++++++++++++--- public/stylesheets/courses.css | 3 ++- public/stylesheets/new_user.css | 3 ++- public/stylesheets/project.css | 4 ++-- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb index b66632c7f..dddd0209e 100644 --- a/app/views/attachments/_form_course.html.erb +++ b/app/views/attachments/_form_course.html.erb @@ -60,7 +60,8 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) + :delete_all_files => l(:text_are_you_sure_all), + :containerid => "#{container.id}" } %> <% if container.nil? %> <%= l(:label_no_file_uploaded)%> diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index af679c4d3..7147769da 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -16,7 +16,8 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) + :delete_all_files => l(:text_are_you_sure_all), + :containerid => "#{container.id}" } %>       diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb index 59da30012..b072faa24 100644 --- a/app/views/projects/_upload_project_files_list.html.erb +++ b/app/views/projects/_upload_project_files_list.html.erb @@ -16,7 +16,8 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) + :delete_all_files => l(:text_are_you_sure_all), + :containerid => "#{container.id}" } %> diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 813c10dee..424e0e572 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -178,6 +178,17 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { }) .done(function(result) { progressSpan.progressbar('value', 100).remove(); + var containerid = $(inputEl).data('containerid'); + console.log($(inputEl)) + if(containerid == undefined ){ + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + } + else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + } + fileSpan.find('input.description, a').css('display', 'inline-block'); fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block'); }) @@ -202,7 +213,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var containerid = $(inputEl).data('containerid'); if (containerid == undefined) { var count = $('#attachments_fields>span').length; - $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + //$('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -216,7 +227,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } else { var count = $('#attachments_fields' + containerid + '>span').length; - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + //$('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; @@ -240,7 +251,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } - var progressSpan = $('
      ').insertAfter(fileSpan.find('input.filename')); + var progressSpan = $('
      ').insertAfter(fileSpan.find('input.upload_filename')); progressSpan.progressbar(); fileSpan.addClass('ajax-waiting'); diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 48c6a2d88..71b473abe 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -905,7 +905,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} -.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } +.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} .student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index f21a4b1fd..b9e7bf227 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1155,7 +1155,8 @@ img.ui-datepicker-trigger { } .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} -.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } +.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index e7a24b151..3dedf1396 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -371,10 +371,10 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} .reply_btn:hover{ background:#999; color:#fff; } .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} -.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} -.attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } +div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } a.remove-upload:hover {text-decoration:none !important;} .attachments_fields input.is_public_checkbox {width:20px;} From d13205bd3de9e40c0a35d0eb2e545e69dedda452 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 11 Nov 2015 11:39:02 +0800 Subject: [PATCH 108/125] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 1 + app/views/attachments/_form_course.html.erb | 1 + app/views/attachments/_form_project.html.erb | 2 ++ app/views/attachments/_new_form.html.erb | 1 + app/views/blog_comments/_blog_attachments.erb | 1 + app/views/files/_attachement_list.html.erb | 2 ++ app/views/files/_new_style_attachment_list.html.erb | 1 + app/views/forums/_file_form.html.erb | 1 + app/views/projects/_upload_project_files_list.html.erb | 1 + app/views/student_work/_student_work_attachment_form.html.erb | 1 + app/views/users/_attachment_list.html.erb | 1 + app/views/users/_user_homework_attachment.html.erb | 1 + config/locales/projects/zh.yml | 1 + public/javascripts/attachments.js | 4 ++-- 14 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 3dbc8d8ba..ab8b80dcb 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -62,6 +62,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb index dddd0209e..ef5385647 100644 --- a/app/views/attachments/_form_course.html.erb +++ b/app/views/attachments/_form_course.html.erb @@ -61,6 +61,7 @@ :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), :delete_all_files => l(:text_are_you_sure_all), + :lebel_file_uploding => l(:lebel_file_uploding), :containerid => "#{container.id}" } %> <% if container.nil? %> diff --git a/app/views/attachments/_form_project.html.erb b/app/views/attachments/_form_project.html.erb index d1cdf8cc9..a9cb068ad 100644 --- a/app/views/attachments/_form_project.html.erb +++ b/app/views/attachments/_form_project.html.erb @@ -60,7 +60,9 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all), + :lebel_file_uploding => l(:lebel_file_uploding), :containerid => "#{container.id}" } %> <%= l(:label_no_file_uploaded)%> diff --git a/app/views/attachments/_new_form.html.erb b/app/views/attachments/_new_form.html.erb index 47f6fd202..75efb448e 100644 --- a/app/views/attachments/_new_form.html.erb +++ b/app/views/attachments/_new_form.html.erb @@ -42,6 +42,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/blog_comments/_blog_attachments.erb b/app/views/blog_comments/_blog_attachments.erb index 48fe91099..dd8be659b 100644 --- a/app/views/blog_comments/_blog_attachments.erb +++ b/app/views/blog_comments/_blog_attachments.erb @@ -62,6 +62,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb index 01e5dca5f..c5a3b9af0 100644 --- a/app/views/files/_attachement_list.html.erb +++ b/app/views/files/_attachement_list.html.erb @@ -17,6 +17,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> <% else %> @@ -35,6 +36,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> <% end %> diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index 7147769da..174a05047 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -17,6 +17,7 @@ :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), :delete_all_files => l(:text_are_you_sure_all), + :lebel_file_uploding => l(:lebel_file_uploding), :containerid => "#{container.id}" } %> diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb index 560afc6d9..2510952f1 100644 --- a/app/views/forums/_file_form.html.erb +++ b/app/views/forums/_file_form.html.erb @@ -63,6 +63,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb index b072faa24..c399bf210 100644 --- a/app/views/projects/_upload_project_files_list.html.erb +++ b/app/views/projects/_upload_project_files_list.html.erb @@ -16,6 +16,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all), :containerid => "#{container.id}" } %> diff --git a/app/views/student_work/_student_work_attachment_form.html.erb b/app/views/student_work/_student_work_attachment_form.html.erb index 265ff9be7..d82aea7f9 100644 --- a/app/views/student_work/_student_work_attachment_form.html.erb +++ b/app/views/student_work/_student_work_attachment_form.html.erb @@ -19,6 +19,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all), :containerid => "#{work.id}" } %> diff --git a/app/views/users/_attachment_list.html.erb b/app/views/users/_attachment_list.html.erb index 33e944498..3d44fa267 100644 --- a/app/views/users/_attachment_list.html.erb +++ b/app/views/users/_attachment_list.html.erb @@ -18,6 +18,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %> diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb index 9b7c6c06a..24d37ae63 100644 --- a/app/views/users/_user_homework_attachment.html.erb +++ b/app/views/users/_user_homework_attachment.html.erb @@ -40,6 +40,7 @@ :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) } %>
      diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 88a710633..1a18e5a14 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -183,6 +183,7 @@ zh: label_optional_description: 可选的描述 label_file_count: "个文件已上传" + lebel_file_uploding: "个文件正在上传" # diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 424e0e572..5718983fa 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -213,7 +213,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var containerid = $(inputEl).data('containerid'); if (containerid == undefined) { var count = $('#attachments_fields>span').length; - //$('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -227,7 +227,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } else { var count = $('#attachments_fields' + containerid + '>span').length; - //$('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; From 16c31e254e5f21a9f63be6c149b90964d886bb9e Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 15:33:43 +0800 Subject: [PATCH 109/125] =?UTF-8?q?=E5=8C=BA=E5=88=86Gitlab=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E9=A1=B9=E7=9B=AE=E5=92=8C=E7=A7=81=E6=9C=89=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/trustie/gitlab/sync.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb index a303b22fb..ac01a44ec 100644 --- a/lib/trustie/gitlab/sync.rb +++ b/lib/trustie/gitlab/sync.rb @@ -10,6 +10,9 @@ module Trustie DEVELOPER = 30 MASTER = 40 OWNER = 50 + # 项目公开和私有 + PUBLIC = 20 + PRIVATE = 0 end class Sync @@ -45,7 +48,8 @@ module Trustie issues_enabled: false, snippets_enabled: false, public: false, - user_id: gid + user_id: gid, + visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE ) project.gpid = gproject.id project.save! @@ -84,7 +88,8 @@ module Trustie merge_requests_enabled: true, public: false, user_id: gid, - import_url: import_url + import_url: import_url, + visibility_level: project.is_public? ? UserLevel::PUBLIC : UserLevel::PRIVATE ) puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" project.gpid = gproject.id From b8999e1c6edca3e74b87f584f8c4f1a4b5674a26 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Nov 2015 15:35:47 +0800 Subject: [PATCH 110/125] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/_edit.html.erb | 2 +- app/views/blog_comments/_new.html.erb | 2 +- public/stylesheets/new_user.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb index d56557ce7..375c948d4 100644 --- a/app/views/blog_comments/_edit.html.erb +++ b/app/views/blog_comments/_edit.html.erb @@ -3,7 +3,7 @@
      - +

      diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb index 2a2281a40..48f152c4e 100644 --- a/app/views/blog_comments/_new.html.erb +++ b/app/views/blog_comments/_new.html.erb @@ -3,7 +3,7 @@
      - +

      - <%= l(:button_cancel)%> - <%= l(:button_confirm)%> + <%= l(:button_cancel)%> + + <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %> <% end %>
      diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb index 21cd94d8d..dbd0277d7 100644 --- a/app/views/files/_upload_show.html.erb +++ b/app/views/files/_upload_show.html.erb @@ -11,7 +11,8 @@ <%= render :partial => 'attachement_list',:locals => {:course => course} %>
      <%= l(:button_cancel)%> - <%= l(:button_confirm)%> + + <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %> <% end %>
      diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index fdf1e31a3..b71d36f97 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -95,7 +95,7 @@
      - <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %> + <%= render :partial => 'users/special_user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
      @@ -111,9 +111,11 @@
      - 确定 + + <%= submit_tag '确定',:onclick=>'popupRegex();new_student_work();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText fr' %> 或 - <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> + <%#= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> + <%= l(:button_cancel)%>
      <% end%> diff --git a/app/views/users/_attachment_list.html.erb b/app/views/users/_attachment_list.html.erb index 3d44fa267..939513627 100644 --- a/app/views/users/_attachment_list.html.erb +++ b/app/views/users/_attachment_list.html.erb @@ -7,7 +7,7 @@ :id => '_file', :class => ie8? ? '':'file_selector', :multiple => true, - :onchange => 'addInputFiles(this);', + :onchange => 'addInputFiles(this,"'+'upload_files_submit_btn'+'");', :style => ie8? ? '': 'display:none', :data => { :max_file_size => Setting.attachment_max_size.to_i.kilobytes, diff --git a/app/views/users/_special_user_homework_attachment.html.erb b/app/views/users/_special_user_homework_attachment.html.erb new file mode 100644 index 000000000..2f5a4e8e3 --- /dev/null +++ b/app/views/users/_special_user_homework_attachment.html.erb @@ -0,0 +1,61 @@ +
      + + <% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
      + <% end %> + <% container.saved_attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
      + <% end %> + <% end %> +       + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => ie8? ? '' : 'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this,"'+'upload_files_submit_btn'+'");', + :style => ie8? ? '' : 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js',:project =>nil), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), + :delete_all_files => l(:text_are_you_sure_all) + } %> +
      +
      + +
      + + 上传附件 + <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr20",:remote => true%> + <% if defined?(has_program) && has_program %> + 编程 + + <% end %> +
      + +<% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> +<% end %> \ No newline at end of file diff --git a/app/views/users/_upload_resource.html.erb b/app/views/users/_upload_resource.html.erb index d73b2986a..c973217f6 100644 --- a/app/views/users/_upload_resource.html.erb +++ b/app/views/users/_upload_resource.html.erb @@ -45,9 +45,9 @@
      - <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:class=>'sendSourceText' %> + <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
      -
      取消
      +
      取消
      <% end %>
      diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 5718983fa..20e845424 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -22,7 +22,7 @@ function reload(fileSpan) { } -function addFile_board(inputEl, file, eagerUpload, id) { +function addFile_board(inputEl, file, eagerUpload, id,btnId) { var attachments_frame = '#attachments_fields' + id; if ($(attachments_frame).children().length < 30) { @@ -80,7 +80,7 @@ function addFile_board(inputEl, file, eagerUpload, id) { ).appendTo(attachments_frame); if (eagerUpload) { - ajaxUpload(file, attachmentId, fileSpan, inputEl); + ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId); } return attachmentId; @@ -88,7 +88,7 @@ function addFile_board(inputEl, file, eagerUpload, id) { return null; } -function addFile(inputEl, file, eagerUpload) { +function addFile(inputEl, file, eagerUpload,btnId) { var attachments_frame = '#attachments_fields'; if ($(attachments_frame).children().length < 30) { @@ -145,7 +145,7 @@ function addFile(inputEl, file, eagerUpload) { ).appendTo('#attachments_fields'); if (eagerUpload) { - ajaxUpload(file, attachmentId, fileSpan, inputEl); + ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId); } return attachmentId; @@ -154,7 +154,7 @@ function addFile(inputEl, file, eagerUpload) { } addFile.nextAttachmentId = 1; -function ajaxUpload(file, attachmentId, fileSpan, inputEl) { +function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { function onLoadstart(e) { fileSpan.removeClass('ajax-waiting'); @@ -168,7 +168,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } - function actualUpload(file, attachmentId, fileSpan, inputEl) { + function actualUpload(file, attachmentId, fileSpan, inputEl,btnId) { ajaxUpload.uploading++; @@ -182,9 +182,15 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { console.log($(inputEl)) if(containerid == undefined ){ var count = $('#attachments_fields>span').length; + $('#'+btnId).removeAttr("disabled"); + $('#'+btnId).val('确定') + $('#'+btnId).css('background-color','#269ac9') $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); } else{ + $('#'+btnId).removeAttr("disabled"); + $('#'+btnId).val('确定') + $('#'+btnId).css('background-color','#269ac9') var count = $('#attachments_fields' + containerid + '>span').length; $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); } @@ -213,6 +219,9 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var containerid = $(inputEl).data('containerid'); if (containerid == undefined) { var count = $('#attachments_fields>span').length; + $('#'+btnId).attr("disabled",true); + $('#'+btnId).val('提交中'); + $('#'+btnId).css('background-color','#c1c1c1') $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment'); @@ -227,6 +236,9 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { } } else { var count = $('#attachments_fields' + containerid + '>span').length; + $('#'+btnId).attr("disabled",true); + $('#'+btnId).val('提交中'); + $('#'+btnId).css('background-color','#c1c1c1') $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { @@ -258,7 +270,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var maxSyncUpload = $(inputEl).data('max-concurrent-uploads'); if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) - actualUpload(file, attachmentId, fileSpan, inputEl); + actualUpload(file, attachmentId, fileSpan, inputEl,btnId); else $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl)); } @@ -323,11 +335,11 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { }); } -function addInputFiles(inputEl) { +function addInputFiles(inputEl,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { // upload files using ajax - uploadAndAttachFiles(inputEl.files, inputEl); + uploadAndAttachFiles(inputEl.files, inputEl,btnId); // $(inputEl).remove(); } else { // browser not supporting the file API, upload on form submission @@ -349,12 +361,12 @@ function addInputFiles(inputEl) { //clearedFileInput.insertAfter('#attachments_fields'); } -function addInputFiles_board(inputEl, id) { +function addInputFiles_board(inputEl, id,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { // upload files using ajax - uploadAndAttachFiles_board(inputEl.files, inputEl, id); + uploadAndAttachFiles_board(inputEl.files, inputEl, id,btnId); // $(inputEl).remove(); } else { // browser not supporting the file API, upload on form submission @@ -374,7 +386,7 @@ function addInputFiles_board(inputEl, id) { //clearedFileInput.insertAfter('#attachments_fields'); } -function uploadAndAttachFiles(files, inputEl) { +function uploadAndAttachFiles(files, inputEl,btnId) { var maxFileSize = $(inputEl).data('max-file-size'); var maxFileSizeExceeded = $(inputEl).data('max-file-size-message'); @@ -389,12 +401,12 @@ function uploadAndAttachFiles(files, inputEl) { window.alert(maxFileSizeExceeded); } else { $.each(files, function() { - addFile(inputEl, this, true); + addFile(inputEl, this, true,btnId); }); } } -function uploadAndAttachFiles_board(files, inputEl, id) { +function uploadAndAttachFiles_board(files, inputEl, id,btnId) { var maxFileSize = $(inputEl).data('max-file-size'); var maxFileSizeExceeded = $(inputEl).data('max-file-size-message'); @@ -409,7 +421,7 @@ function uploadAndAttachFiles_board(files, inputEl, id) { window.alert(maxFileSizeExceeded); } else { $.each(files, function() { - addFile_board(inputEl, this, true, id); + addFile_board(inputEl, this, true, id,btnId); }); } } @@ -482,10 +494,11 @@ $(function() { //课程课件 function addInputFilesCourseSource(inputEl) { checkBox = arguments[1] == 'public' ? false : true; + btnId = arguments[2]; // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { // upload files using ajax - uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox); + uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox,btnId); // $(inputEl).remove(); } else { // browser not supporting the file API, upload on form submission @@ -507,7 +520,7 @@ function addInputFilesCourseSource(inputEl) { //clearedFileInput.insertAfter('#attachments_fields'); } -function uploadAndAttachFilesCourseSource(files, inputEl,checkBox) { +function uploadAndAttachFilesCourseSource(files, inputEl,checkBox,btnId) { var maxFileSize = $(inputEl).data('max-file-size'); var maxFileSizeExceeded = $(inputEl).data('max-file-size-message'); @@ -522,12 +535,12 @@ function uploadAndAttachFilesCourseSource(files, inputEl,checkBox) { window.alert(maxFileSizeExceeded); } else { $.each(files, function() { - addFileCourseSource(inputEl, this, true,checkBox); + addFileCourseSource(inputEl, this, true,checkBox,btnId); }); } } -function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { +function addFileCourseSource(inputEl, file, eagerUpload,checkBox,btnId) { var attachments_frame = '#attachments_fields'; if ($(attachments_frame).children().length < 30) { @@ -606,7 +619,7 @@ function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { } if (eagerUpload) { - ajaxUpload(file, attachmentId, fileSpan, inputEl); + ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId); } return attachmentId; diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 71b473abe..0cb6e203f 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1128,3 +1128,15 @@ a.postRouteLink:hover {text-decoration:underline;} .syllabusSettingIcon:hover {cursor: pointer} .pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;} + +/*确定按钮*/ +input.sendSourceText { + font-size: 14px; + color: #ffffff; + background-color: #269ac9; + cursor: pointer; + outline: none; + border: none; + width: 50px; + height: 25px; +} From 84348d15ea0341d25cffbafaa6249daa2d1da895 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 11 Nov 2015 16:32:13 +0800 Subject: [PATCH 112/125] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=20=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?=E8=81=94=E5=8A=A8=20=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/new.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index b71d36f97..fdf1e31a3 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -95,7 +95,7 @@
      - <%= render :partial => 'users/special_user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %> + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
      @@ -111,11 +111,9 @@
      - - <%= submit_tag '确定',:onclick=>'popupRegex();new_student_work();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText fr' %> + 确定 或 - <%#= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> - <%= l(:button_cancel)%> + <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
      <% end%> From 3aa73fba35712f916d3e2e1d56886648d371295e Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 16:33:09 +0800 Subject: [PATCH 113/125] =?UTF-8?q?Gitlab=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AEGitlab=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 9 +++++++++ lib/gitlab-cli/lib/gitlab/client/projects.rb | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d26e465ba..58dea46b7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -607,6 +607,15 @@ class ProjectsController < ApplicationController @project.organization_id = params[:organization_id] params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0 + # 更新公开私有时同步gitlab公开私有 + g = Gitlab.client + gproject = g.project(@project.gpid) + if params[:project][:is_public] + g.edit_project(gproject.id, 20) + else + g.edit_project(gproject.id, 0) + end + # end if validate_parent_id && @project.save @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') if params[:project][:is_public] == '0' diff --git a/lib/gitlab-cli/lib/gitlab/client/projects.rb b/lib/gitlab-cli/lib/gitlab/client/projects.rb index 04ea682aa..6247294f3 100644 --- a/lib/gitlab-cli/lib/gitlab/client/projects.rb +++ b/lib/gitlab-cli/lib/gitlab/client/projects.rb @@ -72,6 +72,23 @@ class Gitlab::Client post(url, :body => {:name => name}.merge(options)) end + # Updates a project team member to a specified access level. + # id (required) - The ID of a project + # name (optional) - project name + # path (optional) - repository name for project + # description (optional) - short project description + # default_branch (optional) + # issues_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) + # public (optional) - if true same as setting visibility_level = 20 + # visibility_level (optional) + + def edit_project(id, visibility_level) + put("/projects/#{id}", :body => {:visibility_level => visibility_level}) + end + # Deletes a project. # # @example From 2596f0a78844af5dbbaec1031be71610884a3f5f Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Nov 2015 16:39:05 +0800 Subject: [PATCH 114/125] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 58dea46b7..065adf596 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -608,12 +608,10 @@ class ProjectsController < ApplicationController params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0 # 更新公开私有时同步gitlab公开私有 - g = Gitlab.client - gproject = g.project(@project.gpid) - if params[:project][:is_public] - g.edit_project(gproject.id, 20) - else - g.edit_project(gproject.id, 0) + unless @project.gpid.nil? + g = Gitlab.client + gproject = g.project(@project.gpid) + params[:project][:is_public] ? g.edit_project(gproject.id, 20) : g.edit_project(gproject.id, 0) end # end if validate_parent_id && @project.save From 7dd299255bc8edf11fd0f11c2a81ba1287ab9817 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Nov 2015 17:16:19 +0800 Subject: [PATCH 115/125] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 4 ++-- app/views/blogs/_article_list.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 54c9541f2..cf24f0f2d 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -28,7 +28,7 @@ showNormalImage('message_description_<%= @article.id %>'); }); -
      +
      <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> @@ -165,7 +165,7 @@ <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> - <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %> + <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %> <% end %>
      diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index e397da2cc..b8bcc9ad0 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -32,7 +32,7 @@ <%#end%> -
      +
      <%= @user.name%>的博客 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ea45fdbd0..7d8944094 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -261,7 +261,7 @@ a:hover.grey_n_btn{ background:#717171; color:#fff;} .green_btn{ background:#28be6c; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;} a.green_btn{background:#28be6c;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.green_btn{ background:#14ad5a;} -.blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 8px; text-align:center;} +.blue_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 8px; text-align:center;} a.blue_btn{background:#64bdd9;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.blue_btn{ background:#329cbd;} a.orange_btn{ background:#ff5722;color:#fff; font-weight:normal; padding:2px 10px; text-align:center; } From 41751f08bac7c32866f75158c27fdd62f19cf87c Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 11:31:35 +0800 Subject: [PATCH 116/125] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4icon=E5=A2=9E=E5=8A=A0tip?= =?UTF-8?q?=EF=BC=8C=E4=B8=A4=E4=B8=AAicon=E7=9A=84=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index 286d5eb39..1b0202536 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -9,10 +9,10 @@ <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
    • - <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %> + <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除") %>
      • -
    • - <%= link_to "",edit_student_work_path(work),:class => "pic_edit"%> +
    • + <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
      • <% end%> <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%> From 8fa790dd6b453255b297b043d3ed046eeeb494f4 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 11:48:27 +0800 Subject: [PATCH 117/125] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_list.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 64f097114..c18ec4c73 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -2,10 +2,14 @@ 作品 - (已有<%= @student_work_count%>人提交) + (<%= @student_work_count%>人已交) <% if !@is_teacher && @stundet_works.empty?%> 您尚未提交作品 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交且不可再修改，因为截止日期已过 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交，您还可以修改 <% end %> <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> From 3f60893591a4316c3d96956c09d45a0f37239dba Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 14:53:12 +0800 Subject: [PATCH 118/125] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=9C=A8=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E5=8F=98=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/homework_publishtime.rake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index 4d79086d4..8e231fafd 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -1,7 +1,7 @@ #coding=utf-8 namespace :homework_publishtime do - desc "start publish homework" + desc "start publish homework and end homework" task :publish => :environment do homework_commons = HomeworkCommon.where("publish_time = '#{Date.today}'") homework_commons.each do |homework| @@ -20,4 +20,16 @@ namespace :homework_publishtime do end end end + + task :end => :environment do + homework_commons = HomeworkCommon.where("end_time < '#{Date.today}'") + homework_commons.each do |homework| + if homework.anonymous_comment == 1 + homework_detail_manual = homework.homework_detail_manual + if homework_detail_manual.comment_status == 1 + homework_detail_manual.update_column('comment_status', 3) + end + end + end + end end \ No newline at end of file From 506709b4742176806663692ea2096ee36e26e585 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 16:35:13 +0800 Subject: [PATCH 119/125] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=AF=BE=E7=A8=8B=20=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=201.=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20=202.=E7=BB=99=E5=87=BA=E6=98=8E=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=20=203.=E6=8C=89=E9=92=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/attachments.js | 95 +++++++++++++++++++------------ 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 20e845424..d7b49c8be 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -155,13 +155,13 @@ function addFile(inputEl, file, eagerUpload,btnId) { addFile.nextAttachmentId = 1; function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { - + //上传开始调用函数 function onLoadstart(e) { fileSpan.removeClass('ajax-waiting'); fileSpan.addClass('ajax-loading'); $('input:submit', $(this).parents('form')).attr('disabled', 'disabled'); } - + //更改progressbar的值 function onProgress(e) { if (e.lengthComputable) { this.progressbar('value', e.loaded * 100 / e.total); @@ -177,40 +177,43 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { progressEventHandler: onProgress.bind(progressSpan) }) .done(function(result) { - progressSpan.progressbar('value', 100).remove(); - var containerid = $(inputEl).data('containerid'); - console.log($(inputEl)) - if(containerid == undefined ){ - var count = $('#attachments_fields>span').length; - $('#'+btnId).removeAttr("disabled"); - $('#'+btnId).val('确定') - $('#'+btnId).css('background-color','#269ac9') - $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); - } - else{ - $('#'+btnId).removeAttr("disabled"); - $('#'+btnId).val('确定') - $('#'+btnId).css('background-color','#269ac9') - var count = $('#attachments_fields' + containerid + '>span').length; - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); - } - + progressSpan.progressbar('value', 100).remove(); //上传完成就去掉该文件名后的进度条 fileSpan.find('input.description, a').css('display', 'inline-block'); fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block'); }) .fail(function(result) { - progressSpan.text(result.statusText); - if ($("#network_issue")) { + progressSpan.text("网络错误"); + if ($("#network_issue")) { //在上传处都要给出一个network_issue的div用来显示错误 $("#network_issue").show(); } }).always(function() { ajaxUpload.uploading--; fileSpan.removeClass('ajax-loading'); - var form = fileSpan.parents('form'); - if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) { - $('input:submit', form).removeAttr('disabled'); + var containerid = $(inputEl).data('containerid');//多个上传控件需要的容器id + if(containerid == undefined ){ + var count = 1;//同步上传参数为1，所以不需要去获取正在上传的文件就知道是1 + $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); } - form.dequeue('upload'); + else{ + var count = 1; + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); + } + var form = fileSpan.parents('form'); + if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) { //所有文件上传完毕,更改状态 + $('input:submit', form).removeAttr('disabled'); + $('#' + btnId).removeAttr("disabled"); + $('#' + btnId).val('确定') + $('#' + btnId).css('background-color', '#269ac9') + if(containerid == undefined ){ + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + }else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count'+containerid).html("" + count + "" + $(inputEl).data('fileCount')); + } + + } + form.dequeue('upload');//上传完成一个就退出一个 }); //gcm files count and add delete_all link @@ -222,7 +225,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { $('#'+btnId).attr("disabled",true); $('#'+btnId).val('提交中'); $('#'+btnId).css('background-color','#c1c1c1') - $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); + $('#upload_file_count').html("1" + $(inputEl).data('lebelFileUploding'));//目前肯定是穿一个文件 if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -239,7 +242,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { $('#'+btnId).attr("disabled",true); $('#'+btnId).val('提交中'); $('#'+btnId).css('background-color','#c1c1c1') - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); + $('#upload_file_count' + containerid).html("1" + $(inputEl).data('lebelFileUploding'));//目前肯定是穿一个文件 if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; @@ -262,17 +265,25 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { //gcm } - + //在插入文件名的后边插入div var progressSpan = $('
      ').insertAfter(fileSpan.find('input.upload_filename')); - progressSpan.progressbar(); - fileSpan.addClass('ajax-waiting'); - - var maxSyncUpload = $(inputEl).data('max-concurrent-uploads'); - + progressSpan.progressbar(); //将div处理成progress bar + fileSpan.addClass('ajax-waiting'); //添加文件正在上传的状态 + var containerid = $(inputEl).data('containerid');//多个上传控件需要的容器id + if(containerid == undefined ){ //选择了多少个文件也要显示，因为有时候文件过大，一时半会传不完，但还是显示文件没有选择 + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + '个文件被选择'); + }else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count'+containerid).html("" + count + "" + '个文件被选择'); + } + //最大的同步上传参数 + var maxSyncUpload = 1 //$(inputEl).data('max-concurrent-uploads'); + //如果没有指定同步上传参数 或者参数不对，或者需要上传的文件已经小于同步上传的个数，那么直接上传 if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) actualUpload(file, attachmentId, fileSpan, inputEl,btnId); - else - $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl)); + else //否则就进行队列上传 + $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl,btnId)); } ajaxUpload.uploading = 0; @@ -338,6 +349,10 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { function addInputFiles(inputEl,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFiles(inputEl.files, inputEl,btnId); // $(inputEl).remove(); @@ -365,6 +380,10 @@ function addInputFiles_board(inputEl, id,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFiles_board(inputEl.files, inputEl, id,btnId); // $(inputEl).remove(); @@ -497,6 +516,10 @@ function addInputFilesCourseSource(inputEl) { btnId = arguments[2]; // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox,btnId); // $(inputEl).remove(); From ab868d7b65654746ae12ea2d848a8184b7a9eef6 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 16:52:42 +0800 Subject: [PATCH 120/125] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/news_controller.rb | 4 ++-- app/models/news.rb | 2 +- app/views/news/_course_form.html.erb | 4 ++++ app/views/news/_course_news_list.html.erb | 3 +++ app/views/news/_course_show.html.erb | 3 +++ app/views/users/_course_news.html.erb | 6 +++++- db/migrate/20151112072948_add_news_sticky.rb | 9 +++++++++ db/schema.rb | 3 ++- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 1 + 10 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20151112072948_add_news_sticky.rb diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 5d83c1320..be2b44c06 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -74,10 +74,10 @@ class NewsController < ApplicationController @q = params[:subject] if params[:subject].nil? || params[:subject].blank? scope_order = scope.all(:include => [:author, :course], - :order => "#{News.table_name}.created_on DESC") + :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC") else scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course], - :order => "#{News.table_name}.created_on DESC") + :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC") end # :offset => @offset, diff --git a/app/models/news.rb b/app/models/news.rb index a9e9d1d18..e9b8b5314 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -66,7 +66,7 @@ class News < ActiveRecord::Base scope :course_visible, lambda {|*args| includes(:course).where(Course.allowed_to_condition(args.shift || User.current, :view_course_news, *args)) } - safe_attributes 'title', 'summary', 'description' + safe_attributes 'title', 'summary', 'description', 'sticky' def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_news, project) diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index 0a5488714..a51b85870 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -4,6 +4,10 @@

      +
    • + <%= f.check_box :sticky, :value => is_new ? 0 : @news.sticky %> + <%= label_tag 'news_sticky', l(:label_board_sticky) %> +
    • <% if is_new %> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> diff --git a/app/views/news/_course_news_list.html.erb b/app/views/news/_course_news_list.html.erb index 74a70e33d..3db222f25 100644 --- a/app/views/news/_course_news_list.html.erb +++ b/app/views/news/_course_news_list.html.erb @@ -13,6 +13,9 @@ <%= l(:label_release_news) %>： <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %> + <% if news.sticky == 1%> + 置顶 + <% end%> <%=link_to "#{news.comments.all.count}".html_safe, news_path(news.id), :class => "pro_mes_w" %>
      diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 2d8dae59d..34e6e943f 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -8,6 +8,9 @@

      <%=h @news.title %>

      + <% if @news.sticky == 1%> + 置顶 + <% end%> <%= link_to(l(:button_edit), edit_news_path(@news), :class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index f9087f057..475a982e5 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -12,9 +12,13 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
      • -
      + + <% if activity.sticky == 1%> + 置顶 + <% end%> +
      发布时间：<%= format_time(activity.created_on) %>
      diff --git a/db/migrate/20151112072948_add_news_sticky.rb b/db/migrate/20151112072948_add_news_sticky.rb new file mode 100644 index 000000000..85001debe --- /dev/null +++ b/db/migrate/20151112072948_add_news_sticky.rb @@ -0,0 +1,9 @@ +class AddNewsSticky < ActiveRecord::Migration + def up + add_column :news, :sticky, :integer, :default => 0 + end + + def down + remove_column :news, :sticky + end +end diff --git a/db/schema.rb b/db/schema.rb index 7898b3f4d..419b30c3e 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 => 20151109080256) do +ActiveRecord::Schema.define(:version => 20151112072948) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -953,6 +953,7 @@ ActiveRecord::Schema.define(:version => 20151109080256) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 0cb6e203f..05bba54f6 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -555,7 +555,6 @@ a:hover.st_add{ color:#ff8e15;} a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} -.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} .respond-form{display: none;margin: auto;clear: both;} @@ -987,6 +986,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .m_w505{max-width: 505px;} .m_w500{max-width: 500px;} .m_w530{max-width: 530px;} +.m_w600{max-width: 600px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ea45fdbd0..490de9e08 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1082,6 +1082,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w530{max-width: 530px;} +.m_w600{max-width: 600px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } From 2c5cd1a4b33a39c8884b05d7ef5f3dd0d22c6e15 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 18:14:56 +0800 Subject: [PATCH 121/125] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=92=8C=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9Flabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 6d929ac5f..0baf31ab2 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -17,11 +17,13 @@
      <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%> +
      <%= calendar_for('homework_end_time')%>
      -
      + +
      <%= calendar_for('homework_publish_time')%>
      From e7d53f5e16ad2c44bd9461f3c493d0a8e3073811 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 11:17:47 +0800 Subject: [PATCH 122/125] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=81=E8=AE=B8=E5=A4=9A=E9=80=89tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 54 +++++++++++++++--------- app/views/files/_upload_course_files.erb | 12 +++--- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index dd8dc84c4..cbbf36ea8 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -374,30 +374,29 @@ class FilesController < ApplicationController if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') Mailer.run.attachments_added(attachments[:files]) end - - if params[:course_attachment_type] && params[:course_attachment_type] != "5" - case params[:course_attachment_type] - when "1" - tag_name = l(:label_courseware) - when "2" - tag_name = l(:label_software) - when "3" - tag_name = l(:label_media) - when "4" - tag_name = l(:label_code) - when "6" - tag_name = "论文" - else - tag_name = "" + if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array) + params[:course_attachment_type].each do |type| + tag_name = get_tag_name_by_type_number type + if !attachments.empty? && attachments[:files] && tag_name != "" + attachments[:files].each do |attachment| + attachment.tag_list.add(tag_name) + attachment.save + end + end end - if !attachments.empty? && attachments[:files] && tag_name != "" - attachments[:files].each do |attachment| - attachment.tag_list.add(tag_name) - attachment.save + else + if params[:course_attachment_type] && params[:course_attachment_type] != "5" + tag_name = get_tag_name_by_type_number params[:course_attachment_type] + if !attachments.empty? && attachments[:files] && tag_name != "" + attachments[:files].each do |attachment| + attachment.tag_list.add(tag_name) + attachment.save + end end end end + # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", @@ -424,6 +423,23 @@ class FilesController < ApplicationController end end + def get_tag_name_by_type_number type + case type + when "1" + tag_name = l(:label_courseware) + when "2" + tag_name = l(:label_software) + when "3" + tag_name = l(:label_media) + when "4" + tag_name = l(:label_code) + when "6" + tag_name = "论文" + else + tag_name = "" + end + end + def tag_saveEx @tags = params[:tag_name][:name] @obj_id = params[:object_id] diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index f023e8413..86ec79e67 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -10,12 +10,12 @@
      - 课件 |  - 软件 |  - 媒体 |  - 代码 |  - 论文 |  - 其他 + 课件 |  + 软件 |  + 媒体 |  + 代码 |  + 论文 |  + 其他
      From 28a6e09edd74eae70323792cf0f4faba56c67d25 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 14:56:18 +0800 Subject: [PATCH 123/125] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_resources_list.html.erb | 2 +- app/views/users/user_resource.html.erb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index 6f47e3535..156da0f07 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -7,7 +7,7 @@ <% attachments.each do |attach| %>
      • - +
      • diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index f6bb3c8cb..3bd114e7c 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -287,7 +287,11 @@ //批量删除 function batch_delete(){ var data = $("#resources_list_form").serialize(); - if(data != "" && confirm('您删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) { + if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){ + alert("含有上传者不是您的资源"); + return; + } + if(data != "" && confirm('确认要删除这些资源吗？')) { $.post( '<%= user_resource_delete_user_path(@user)%>', $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交 From 465bc9bd6c64d52eb6c5f0f70361df353874da20 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 15:04:50 +0800 Subject: [PATCH 124/125] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=E6=95=B0=E6=8D=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource_create.js.erb | 2 +- app/views/users/user_resource_delete.js.erb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb index 2d6c4f4d8..f69057273 100644 --- a/app/views/users/user_resource_create.js.erb +++ b/app/views/users/user_resource_create.js.erb @@ -2,6 +2,6 @@ closeModal(); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); //这里不能将翻页的更新 -$("#res_all_count").html(parseInt($("#res_all_count").html())+1); +$("#res_all_count").html('<%= @atta_count%>'); $("#res_count").html(0); $("#checkboxAll").attr('checked',false); \ No newline at end of file diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb index a956ed212..e16abf28d 100644 --- a/app/views/users/user_resource_delete.js.erb +++ b/app/views/users/user_resource_delete.js.erb @@ -1,2 +1,5 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); -$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ No newline at end of file +$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); +$("#res_all_count").html('<%= @atta_count%>') +$("#res_count").html(0); +$("#checkboxAll").attr('checked',false); \ No newline at end of file From 78ebeaee3b98cdd4074da3c6934c11ec0c89c2a9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 15:38:16 +0800 Subject: [PATCH 125/125] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 3bd114e7c..4fd4d0cb9 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -288,7 +288,7 @@ function batch_delete(){ var data = $("#resources_list_form").serialize(); if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){ - alert("含有上传者不是您的资源"); + alert("您只能删除自己上传的资源，请重新选择后再删除。"); return; } if(data != "" && confirm('确认要删除这些资源吗？')) {