From 01120d063d4eb011f6dee2ecb35d77697cae75ef Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 27 Oct 2014 17:14:34 +0800 Subject: [PATCH 01/13] =?UTF-8?q?#1127=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=EF=BC=8C=E8=8F=9C=E5=8D=95=E6=A0=8F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=88=B6=E8=8F=9C=E5=8D=95=E5=8F=98=E8=89=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 1 + app/views/layouts/base_courses.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 8402c05f0..8a5bfd9fb 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -8,6 +8,7 @@ class CoursesController < ApplicationController menu_item :overview menu_item :feedback, :only => :feedback menu_item :homework, :only => :homework + menu_item :new_homework menu_item l(:label_sort_by_time), :only => :index menu_item l(:label_sort_by_active), :only => :index diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index b7b832fb5..fd21b97a0 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -153,7 +153,7 @@ - + <%= l(:label_main_teacher) %> : From 4e7965d060081cc9c6d70fa6defcd10179005ade Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 09:30:43 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= =?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/models/issue_query.rb | 5 ++++ app/views/queries/_filters.html.erb | 42 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 7e70d55c7..c55143ca8 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -137,6 +137,11 @@ class IssueQuery < Query :type => :list_optional, :values => role_values ) unless role_values.empty? + #done_values = [10,20,30,40,50,60,70,80,90,100] + #add_available_filter("done_ratio_111", + # :type => :list_optional, :values => done_values + #) + if versions.any? add_available_filter "fixed_version_id", :type => :list_optional, diff --git a/app/views/queries/_filters.html.erb b/app/views/queries/_filters.html.erb index 795f8075f..b7a18e8fc 100644 --- a/app/views/queries/_filters.html.erb +++ b/app/views/queries/_filters.html.erb @@ -1,28 +1,28 @@ <%= javascript_tag do %> -var operatorLabels = <%= raw_json Query.operators_labels %>; -var operatorByType = <%= raw_json Query.operators_by_filter_type %>; -var availableFilters = <%= raw_json query.available_filters_as_json %>; -var labelDayPlural = <%= raw_json l(:label_day_plural) %>; -var allProjects = <%= raw query.all_projects_values.to_json %>; -$(document).ready(function(){ - initFilters(); - <% query.filters.each do |field, options| %> - addFilter("<%= field %>", <%= raw_json query.operator_for(field) %>, <%= raw_json query.values_for(field) %>); - <% end %> -}); + var operatorLabels = <%= raw_json Query.operators_labels %>; + var operatorByType = <%= raw_json Query.operators_by_filter_type %>; + var availableFilters = <%= raw_json query.available_filters_as_json %>; + var labelDayPlural = <%= raw_json l(:label_day_plural) %>; + var allProjects = <%= raw query.all_projects_values.to_json %>; + $(document).ready(function(){ + initFilters(); + <% query.filters.each do |field, options| %> + addFilter("<%= field %>", <%= raw_json query.operator_for(field) %>, <%= raw_json query.values_for(field) %>); + <% end %> + }); <% end %> - - - - + + + +
- -
-		 -<%= label_tag('add_filter_select', l(:label_filter_add)) %> -<%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %> -
+ +
+ 		+ <%= label_tag('add_filter_select', l(:label_filter_add)) %> + <%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %> +
<%= hidden_field_tag 'f[]', '' %> <% include_calendar_headers_tags %> From 9d91e85fe4a52897ddd6dc2293d9866a39dc3e22 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 14:19:13 +0800 Subject: [PATCH 03/13] =?UTF-8?q?#863=20=E5=A2=9E=E5=8A=A0=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E8=BF=9C=E7=A8=8B=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=B8=80=E4=B8=AA=E8=BF=9C=E7=A8=8B=E5=88=86=E6=94=AF?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=88=87=E6=8D=A2=E5=88=B0=E8=AF=A5=E5=88=86?= =?UTF-8?q?=E6=94=AF=E7=9A=84=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 132 ++++++++++++++++----------- 1 file changed, 77 insertions(+), 55 deletions(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index d11fd2564..570f87064 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -7,79 +7,93 @@ <%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
- <%if @repository.type.to_s=="Repository::Git"%> - <%= @repos_url%> - <%else %> - <%=h @repository.url %> - <% end %> + <%if @repository.type.to_s=="Repository::Git"%> + <%= @repos_url%> + <%else %> + + <%=h @repository.url %> + + <% end %>
-

- (<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| - link_to h(repo.name), - {:controller => 'repositories', :action => 'show', - :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, - :class => 'repository' + (repo == @repository ? ' selected' : '') - }.join(' | ').html_safe %>)

-

项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码

-

建立版本库文件夹，打开命令行执行如下：

-
-

git init

-

git add *

-

git commit -m "first commit"

-

git remote add origin <%= @repos_url%>

-

git config http.postBuffer 524288000 #设置本地post缓存为500MB

-

git push -u origin master:master

-
-

已经有本地库，还没有配置远程地址，打开命令行执行如下：

-
-

git remote add origin <%= @repos_url%>

-

git add .

+

+ (<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| + link_to h(repo.name), + {:controller => 'repositories', :action => 'show', + :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, + :class => 'repository' + (repo == @repository ? ' selected' : '') + }.join(' | ').html_safe %>) +

+

项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码

+

建立版本库文件夹，打开命令行执行如下：

+
+

git init

+

git add *

git commit -m "first commit"

+

git remote add origin + <%= @repos_url%> +

git config http.postBuffer 524288000 #设置本地post缓存为500MB

-

git push -u origin master:master

-
- -

从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：

-
-

git remote add trustie <%= @repos_url%>

+

git push -u origin master:master

+
+

已经有本地库，还没有配置远程地址，打开命令行执行如下：

+
+

git remote add origin <%= @repos_url%>

git add .

git commit -m "first commit"

git config http.postBuffer 524288000 #设置本地post缓存为500MB

-

git push -u trustie master:master

-

<%= link_to "李海提供", user_path(646)%>

-
+

git push -u origin master:master

+
+

已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：

+
+

git clone <%= @repos_url%>

+

git push

+

git checkout -b branch_name

+

git push origin branch_name

+
+

从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：

+
+

git remote add trustie + <%= @repos_url%> +

+

git add .

+

git commit -m "first commit"

+

git config http.postBuffer 524288000 #设置本地post缓存为500MB

+

git push -u trustie master:master

+

<%= link_to "李海", user_path(646)%>提供

+
+ <% if !@entries.nil? && authorize_for('repositories', 'browse') %> <%= render :partial => 'dir_list' %> <% end %> <%= render_properties(@properties) %> - <% if authorize_for('repositories', 'revisions') %> <% if @changesets && !@changesets.empty? %> -

<%= l(:label_latest_revision_plural) %>

+

+ <%= l(:label_latest_revision_plural) %> +

<%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => nil }%> <% end %>

- <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) - sep = '' %> - <% if @repository.supports_all_revisions? && @path.blank? %> - <%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project, - :repository_id => @repository.identifier_param %> - <% sep = '|' %> - <% end %> - <% if @repository.supports_directory_revisions? && - ( has_branches || !@path.blank? || !@rev.blank? ) %> - <%= sep %> - <%= link_to l(:label_view_revisions), - :action => 'changes', - :path => to_path_param(@path), - :id => @project, - :repository_id => @repository.identifier_param, - :rev => @rev %> - <% end %> + <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) + sep = '' %> + <% if @repository.supports_all_revisions? && @path.blank? %> + <%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project, + :repository_id => @repository.identifier_param %> + <% sep = '|' %> + <% end %> + <% if @repository.supports_directory_revisions? && ( has_branches || !@path.blank? || !@rev.blank? ) %> + <%= sep %> + <%= link_to l(:label_view_revisions), + :action => 'changes', + :path => to_path_param(@path), + :id => @project, + :repository_id => @repository.identifier_param, + :rev => @rev %> + <% end %>

<% if @repository.supports_all_revisions? %> <% content_for :header_tags do %> @@ -99,7 +113,15 @@ <% end %> -<%= l(:label_how_commit_code) %> <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%> | <%= link_to('English', en_usage_path, :class => "usage")%> + + + <%= l(:label_how_commit_code) %> + + +  +<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%> + |  +<%= link_to('English', en_usage_path, :class => "usage")%> From 8cbc4eb938bb6173d1dd6a6d9b823d029a0cb835 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 28 Oct 2014 14:26:21 +0800 Subject: [PATCH 04/13] =?UTF-8?q?#1318=20=E8=AF=BE=E7=A8=8B/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80=E8=AF=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0,=E5=8E=9F=E5=AE=9E=E7=8E=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8E=E7=8E=B0=E5=AD=98=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9C=89=E5=86=B2=E7=AA=81=EF=BC=8C=E6=89=A9=E5=B1=95=E4=BA=86?= =?UTF-8?q?=E5=85=B6=E5=AE=9E=E7=8E=B0=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E4=B9=8B=E5=85=BC=E5=AE=B9=E7=8E=B0=E6=9C=89=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/tags_controller.rb | 70 +++++++++++++++------- app/helpers/attachments_helper.rb | 4 +- app/helpers/bids_helper.rb | 4 +- app/helpers/contests_helper.rb | 4 +- app/helpers/courses_helper.rb | 4 +- app/helpers/forums_helper.rb | 4 +- app/helpers/issues_helper.rb | 4 +- app/helpers/open_source_projects_helper.rb | 4 +- app/helpers/projects_helper.rb | 4 +- app/helpers/users_helper.rb | 4 +- app/views/projects/search.html.erb | 4 +- app/views/tags/_related_tags.html.erb | 6 +- app/views/tags/_selected_tags.html.erb | 6 +- app/views/tags/_sidebar_tags.html.erb | 12 ++-- app/views/tags/_tag_name.html.erb | 2 +- app/views/tags/index.html.erb | 6 +- 16 files changed, 83 insertions(+), 59 deletions(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 1318e40a5..0a6f15020 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -38,24 +38,41 @@ class TagsController < ApplicationController @obj_id = params[:obj_id] @obj_flag = params[:object_flag] - @selected_tags = Array.new + @selected_tags = Array.new + @selected_tag_ids = Array.new + @selected_tag_objs = Array.new @related_tags = nil - - if params[:q] - @selected_tags << params[:q] + @related_tag_ids = Array.new + @related_tag_objs = Array.new + if params[:q] + @tag = ActsAsTaggableOn::Tag.find(params[:q]) + @selected_tags << @tag.name + @selected_tag_ids << @tag.id.to_s + @selected_tag_objs << @tag else @do_what = params[:do_what] - @tag = params[:tag] - @selected_tags = params[:current_selected_tags] - @selected_tags = @selected_tags.nil? ? Array.new : @selected_tags + @tag = ActsAsTaggableOn::Tag.find(params[:tag]) + #@selected_tags = params[:current_selected_tags] + @selected_tag_ids = params[:current_selected_tags] + @selected_tag_ids = @selected_tag_ids.nil? ? Array.new : @selected_tag_ids + @selected_tag_ids.each do |t| + ta = ActsAsTaggableOn::Tag.find(t) + @selected_tags << ta.name + @selected_tag_objs << ta + end + #@selected_tags = @selected_tags.nil? ? Array.new : @selected_tags case @do_what when '0' then - @selected_tags.delete @tag #数组中删除有多方式 可以改用shift,pop + @selected_tags.delete @tag.name #数组中删除有多方式 可以改用shift,pop + @selected_tag_ids.delete @tag.id.to_s + @selected_tag_objs.delete @tag when '1' then # 判断是否已存在该tag 主要用来处理分页的情况 - unless @selected_tags.include? @tag - @selected_tags << @tag + unless @selected_tags.include? @tag.name + @selected_tags << @tag.name + @selected_tag_ids << @tag.id.to_s + @selected_tag_objs << @tag end end end @@ -75,7 +92,7 @@ class TagsController < ApplicationController @attachments_results, @contests_results, @courses_results, - @open_source_projects_results= refresh_results(@obj_id,@obj_flag,@selected_tags) + @open_source_projects_results= refresh_results(@obj_id,@obj_flag,@selected_tags,@selected_tag_ids) # 这里是做tag推荐用的， 用来生产推荐的tags unless @obj.nil? @@ -85,6 +102,13 @@ class TagsController < ApplicationController # @tags.delete(i) # end @related_tags = @tags + @tag_objs = @obj.tags + @tag_objs.each do |t| + unless @selected_tags.include?(t.name) + @related_tag_ids << t.id.to_s + @related_tag_objs << t + end + end else return end @@ -162,8 +186,8 @@ class TagsController < ApplicationController if request.get? # 获取传过来的tag_id taggable_id 和 taggable_type,通过2者确定要删除tag的对象 - @tag_name = params[:tag_name] - @tag_id = (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).id + @tag_id = params[:tag_name] + @tag_name = (ActsAsTaggableOn::Tag.find(@tag_id)).name @taggable_id = params[:taggable_id] # 当做参数传时对象会变成字符串 @taggable_type = numbers_to_object_type(params[:taggable_type]) @@ -192,7 +216,7 @@ class TagsController < ApplicationController private # 这里用来刷新搜索结果的区域 # 函数的返回值 前2字段用来处理获取其他tag和分页 ，另外4个返回值为过滤结果 - def refresh_results(obj_id,obj_flag,selected_tags) + def refresh_results(obj_id,obj_flag,selected_tags,selected_tag_ids = nil) @users_results = nil @projects_results = nil @issues_results = nil @@ -210,36 +234,36 @@ class TagsController < ApplicationController case obj_flag when '1' then @obj = User.find_by_id(obj_id) - @obj_pages,@users_results,@results_count = for_pagination(get_users_by_tag(selected_tags)) + @obj_pages,@users_results,@results_count = for_pagination(get_users_by_tag(selected_tags,selected_tag_ids)) when '2' then @obj = Project.find_by_id(obj_id) - @obj_pages,@projects_results,@results_count = for_pagination(get_projects_by_tag(selected_tags)) + @obj_pages,@projects_results,@results_count = for_pagination(get_projects_by_tag(selected_tags,selected_tag_ids)) when '3' then @obj = Issue.find_by_id(obj_id) - @obj_pages,@issues_results,@results_count = for_pagination(get_issues_by_tag(selected_tags)) + @obj_pages,@issues_results,@results_count = for_pagination(get_issues_by_tag(selected_tags,selected_tag_ids)) when '4' then - @obj_pages,@bids_results,@results_count = for_pagination(get_bids_by_tag(selected_tags)) + @obj_pages,@bids_results,@results_count = for_pagination(get_bids_by_tag(selected_tags,selected_tag_ids)) @obj = Bid.find_by_id(obj_id) when '5' @obj = Forum.find_by_id(obj_id) - @obj_pages,@forums_results,@results_count = for_pagination(get_forums_by_tag(selected_tags)) + @obj_pages,@forums_results,@results_count = for_pagination(get_forums_by_tag(selected_tags,selected_tag_ids)) when '6' @obj = Attachment.find_by_id(obj_id) # modifed by Long Jun # this is used to find the attachments that came from the same project and tagged with the same tag. #@result = get_attachments_by_project_tag(selected_tags, @obj) - @result = get_attachments_by_tag(selected_tags) + @result = get_attachments_by_tag(selected_tags,selected_tag_ids) @obj_pages, @attachments_results, @results_count = for_pagination(@result) when '7' @obj = Contest.find_by_id(obj_id) - @obj_pages,@contests_results,@results_count = for_pagination(get_contests_by_tag(selected_tags)) + @obj_pages,@contests_results,@results_count = for_pagination(get_contests_by_tag(selected_tags,selected_tag_ids)) when '8' @obj = OpenSourceProject.find_by_id(obj_id) - @obj_pages, @open_source_projects_results, @results_count = for_pagination(get_open_source_projects_by_tag(selected_tags)) + @obj_pages, @open_source_projects_results, @results_count = for_pagination(get_open_source_projects_by_tag(selected_tags,selected_tag_ids)) when '9' then @obj = Course.find_by_id(obj_id) - @obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags)) + @obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags,selected_tag_ids)) else @obj = nil end diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 7ea49dad2..70a2e40e7 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -75,8 +75,8 @@ module AttachmentsHelper # this method is used to get all projects that tagged one tag # added by william - def get_attachments_by_tag(tag_name) - Attachment.tagged_with(tag_name).order('created_on desc') + def get_attachments_by_tag(tag_name,selected_tag_ids = nil) + Attachment.tagged_with(tag_name,{},selected_tag_ids).order('created_on desc') end # this method is used to get all attachments that from one project and tagged one tag diff --git a/app/helpers/bids_helper.rb b/app/helpers/bids_helper.rb index a5c25ecb5..118e0ccb1 100644 --- a/app/helpers/bids_helper.rb +++ b/app/helpers/bids_helper.rb @@ -35,8 +35,8 @@ module BidsHelper # this method is used to get all projects that tagged one tag # added by william - def get_bids_by_tag(tag_name) - Bid.tagged_with(tag_name).order('updated_on desc') + def get_bids_by_tag(tag_name,selected_tag_ids = nil) + Bid.tagged_with(tag_name,{},selected_tag_ids).order('updated_on desc') end #added by huang diff --git a/app/helpers/contests_helper.rb b/app/helpers/contests_helper.rb index 0bc3e5e73..983cf68bd 100644 --- a/app/helpers/contests_helper.rb +++ b/app/helpers/contests_helper.rb @@ -35,8 +35,8 @@ module ContestsHelper # this method is used to get all projects that tagged one tag # added by william - def get_contests_by_tag(tag_name) - Contest.tagged_with(tag_name).order('updated_on desc') + def get_contests_by_tag(tag_name,selected_tag_ids = nil) + Contest.tagged_with(tag_name,{},selected_tag_ids).order('updated_on desc') end #added by huang diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 1afb94220..77445532b 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -449,8 +449,8 @@ module CoursesHelper return homework_users end - def get_courses_by_tag(tag_name) - Course.tagged_with(tag_name).order('updated_at desc') + def get_courses_by_tag(tag_name,selected_tag_ids = nil) + Course.tagged_with(tag_name,{},selected_tag_ids).order('updated_at desc') end #课程实践年份下拉框 diff --git a/app/helpers/forums_helper.rb b/app/helpers/forums_helper.rb index 47a059e04..2d7b4bbb8 100644 --- a/app/helpers/forums_helper.rb +++ b/app/helpers/forums_helper.rb @@ -22,7 +22,7 @@ module ForumsHelper # this method is used to get all projects that tagged one tag # added by william - def get_forums_by_tag(tag_name) - Forum.tagged_with(tag_name).order('updated_at desc') + def get_forums_by_tag(tag_name,selected_tag_ids = nil) + Forum.tagged_with(tag_name,{},selected_tag_ids).order('updated_at desc') end end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 637c92db3..b5f49331f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -382,8 +382,8 @@ module IssuesHelper # this method is used to get all projects that tagged one tag # added by william - def get_issues_by_tag(tag_name) - Issue.tagged_with(tag_name).order('updated_on desc') + def get_issues_by_tag(tag_name,selected_tag_ids = nil) + Issue.tagged_with(tag_name,{},selected_tag_ids).order('updated_on desc') end end diff --git a/app/helpers/open_source_projects_helper.rb b/app/helpers/open_source_projects_helper.rb index dfc7cc8d0..8f7d31e05 100644 --- a/app/helpers/open_source_projects_helper.rb +++ b/app/helpers/open_source_projects_helper.rb @@ -31,8 +31,8 @@ module OpenSourceProjectsHelper s = content_tag('div', s, :class => 'user_tags') end - def get_open_source_projects_by_tag(tag_name) - OpenSourceProject.tagged_with(tag_name).order('created_at desc') + def get_open_source_projects_by_tag(tag_name,selected_tag_ids = nil) + OpenSourceProject.tagged_with(tag_name,{},selected_tag_ids).order('created_at desc') end def show_origin(url) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5df3644ad..3beed444d 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -232,8 +232,8 @@ module ProjectsHelper # this method is used to get all projects that tagged one tag # added by william - def get_projects_by_tag(tag_name) - Project.tagged_with(tag_name).order('updated_on desc') + def get_projects_by_tag(tag_name,selected_tag_ids = nil) + Project.tagged_with(tag_name,{},selected_tag_ids).order('updated_on desc') end # added by fq diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 58935dd11..ac3d5ad57 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -57,8 +57,8 @@ module UsersHelper # this method is used to get all projects that tagged one tag # added by william - def get_users_by_tag(tag_name) - User.tagged_with(tag_name).order('updated_on desc') + def get_users_by_tag(tag_name,selected_tag_ids = nil) + User.tagged_with(tag_name,{},selected_tag_ids).order('updated_on desc') end # added by fq diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb index 02bdb4f17..8e810b087 100644 --- a/app/views/projects/search.html.erb +++ b/app/views/projects/search.html.erb @@ -8,7 +8,7 @@ <% if params[:project_type] == "1" %> - +
<%= l(:label_course_practice) %><%= l(:label_course_practice) %> <%= l(:label_user_location) %> : <% if User.current.logged?%> @@ -33,7 +33,7 @@ <% else %> - + <% else %> -
<%= l(:label_project_deposit) %><%= l(:label_project_deposit) %> <%= l(:label_user_location) %> : <% if User.current.logged? %> diff --git a/app/views/tags/_related_tags.html.erb b/app/views/tags/_related_tags.html.erb index 04b356598..17e006da5 100644 --- a/app/views/tags/_related_tags.html.erb +++ b/app/views/tags/_related_tags.html.erb @@ -5,14 +5,14 @@ <% i += 1 %>
  • <%= link_to image_tag("/images/sidebar/add.png"),:action => "index", - :current_selected_tags => selected_tags,:tag => rt,:do_what => "1", + :current_selected_tags => selected_tags,:tag => rt.id,:do_what => "1", :obj_id => obj_id,:object_flag => obj_flag %> - <%= rt %> + <%= rt.name %> <% break if i >= 10 %> - <%= render :partial => 'sidebar_tags',:locals => {:show_flag => obj_flag,:sg => rt }%> + <%= render :partial => 'sidebar_tags',:locals => {:show_flag => obj_flag,:sg => rt,:selected_tag_ids => related_tag_ids }%>
    • <% end %> diff --git a/app/views/tags/_selected_tags.html.erb b/app/views/tags/_selected_tags.html.erb index 3081177bc..851770469 100644 --- a/app/views/tags/_selected_tags.html.erb +++ b/app/views/tags/_selected_tags.html.erb @@ -3,10 +3,10 @@ <% for sg in selected_tags %>
  • <%= link_to image_tag("/images/sidebar/minus.png"),:action => "index", - :current_selected_tags => selected_tags ,:tag => sg,:do_what => "0", + :current_selected_tags => selected_tags ,:tag => sg.id,:do_what => "0", :obj_id => obj_id,:object_flag => obj_flag %> - <%= sg %> - <%= render :partial => 'sidebar_tags',:locals => {:show_flag => obj_flag,:sg => sg }%> + <%= sg.name %> + <%= render :partial => 'sidebar_tags',:locals => {:show_flag => obj_flag,:sg => sg ,:selected_tag_ids => @selected_tag_ids}%>
    • <% end %> diff --git a/app/views/tags/_sidebar_tags.html.erb b/app/views/tags/_sidebar_tags.html.erb index 8db485d1f..cb1b416fc 100644 --- a/app/views/tags/_sidebar_tags.html.erb +++ b/app/views/tags/_sidebar_tags.html.erb @@ -1,14 +1,14 @@ <% case show_flag%> <% when '1' then %> -(<%= User.tagged_with("#{sg}").size %>) +(<%= User.tagged_with("#{sg.name}",{},selected_tag_ids).size %>) <%when '2' then %> -(<%= Project.tagged_with(sg).size %>) +(<%= Project.tagged_with(sg.name,{},selected_tag_ids).size %>) <% when '3' then %> -(<%= Issue.tagged_with("#{sg}").size %>) +(<%= Issue.tagged_with("#{sg.name}",{},selected_tag_ids).size %>) <% when '4' then %> -(<%= Bid.tagged_with("#{sg}").size %>) +(<%= Bid.tagged_with("#{sg.name}",{},selected_tag_ids).size %>) <% when '5' then %> -(<%= Forum.tagged_with("#{sg}").size %>) +(<%= Forum.tagged_with("#{sg.name}",{},selected_tag_ids).size %>) <% when '6' then %> -(<%= Attachment.tagged_with("#{sg}").size %>) +(<%= Attachment.tagged_with("#{sg.name}",{},selected_tag_ids).size %>) <% end %> diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index 6996e8891..698a3a868 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -8,7 +8,7 @@ // }) -<% @tags = obj.reload.tag_list %> +<% @tags = obj.reload.tags %> <% if non_list_all and (@tags.size > 0) %> diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index 47a2ba1d2..18bb2faf9 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -3,13 +3,13 @@

    <%= l(:label_tags_selected) %>

    <%= render :partial => "selected_tags",:locals => { - :selected_tags => @selected_tags,:obj_flag => @obj_flag,:obj_id => @obj_id }%> + :selected_tags => @selected_tag_objs,:obj_flag => @obj_flag,:obj_id => @obj_id }%>

    <%= l(:label_tags_related) %>

    <% end %> From 205c78454f150988d49117eb960bf8bb7013b911 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 14:28:14 +0800 Subject: [PATCH 05/13] =?UTF-8?q?#1414=E8=AE=BE=E7=BD=AE=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E8=B4=B4=E5=90=A7=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=94=B9=E4=B8=BA9=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 56 +++++++++++++++++++------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 4fc08d41f..171b2b764 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -56,7 +56,9 @@

    - <%= l(:lable_hot_projects)%> + + <%= l(:lable_hot_projects)%> +

    <% if User.current.logged? %> @@ -83,14 +85,16 @@
    <% unless project.is_public %> - <%= l(:label_private) %> + + <%= l(:label_private) %> + <% end %> <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> - (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) + (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)
    -
    +
    - <%=project.description.truncate(100, omission: '...')%> + <%=project.description.truncate(90, omission: '...')%>
    @@ -109,33 +113,37 @@
      -

      <%= l(:lable_user_active)%>

      - <%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank" %> +

      + + <%= l(:lable_user_active)%> + +

      + + <%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank" %> +
      <%activities = find_all_activities%> <% activities.each do |event| %> -
    • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
      -
      <%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank" %> <%= show_user_content event %> -

      - - <%= l(:field_updated_on) %> - <%= time_tag_welcome event.event_datetime %>前 - -       - - <%= show_event_reply event %> - -

      +

      + + <%= l(:field_updated_on) %> + <%= time_tag_welcome event.event_datetime %>前 + +       + + <%= show_event_reply event %> + +

      • <% end %> @@ -148,14 +156,18 @@

      - <%= l(:lable_bar_active)%> + + <%= l(:lable_bar_active)%> + <%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> <%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>

      - <%= link_to l(:label_more), forums_path %> + + <%= link_to l(:label_more), forums_path %> +
      - <% topics = find_new_forum_topics(7) %> + <% topics = find_new_forum_topics(6) %> <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
    • From 887a3cbe460c1b7e2b23a0d8c4f4ca2d10bc0c6a Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 28 Oct 2014 14:46:55 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index e7cf73511..e886683f0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1840,4 +1840,6 @@ en: label_my_school: My school label_all_schol: All school label_select_province: Please select the provinces - label_search_conditions_not_null: The search conditions can not be empty \ No newline at end of file + label_search_conditions_not_null: The search conditions can not be empty + lable_school_list: List of schools + button_delete_file: delete \ No newline at end of file From a594326bceb644dbdec42fc243ec2d162bfaab47 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 15:47:20 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E6=95=99?= =?UTF-8?q?=E5=B8=88=E5=8D=95=E4=BD=8D=E4=B8=BA=E5=BC=80=E8=AE=BE=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_courses.html.erb | 8 ++++---- config/locales/zh.yml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index fd21b97a0..04249b3bc 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -202,18 +202,18 @@ <% unless @course.teacher.user_extensions.nil? || @course.teacher.user_extensions.school.nil? %>
    - <%= l(:label_teacher_work_unit) %> : + <%= l(:label_course_organizers) %> : - - <%= @course.teacher.user_extensions.school %> + + <%= @course.school %>
    - <%= l(:label_teacher_work_unit) %> : + <%= l(:label_course_organizers) %> : <%= l(:field_course_un) %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 32cb7dd23..c330b8b90 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2169,3 +2169,4 @@ zh: label_no_contest_news_title: 竞赛标题不能为空 label_contest_news_title_condition: 竞赛标题超过255个汉字 label_subject_empty: 主题不能为空 + label_course_organizers: 开设单位 From 65a89bb9a541a692fa5193bd44e09c941c716ea8 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 28 Oct 2014 16:27:13 +0800 Subject: [PATCH 08/13] =?UTF-8?q?#1412=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?--=E8=AF=BE=E7=A8=8B--=E5=BD=93=E8=AF=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=A4=9A=E4=B8=AA=E8=AF=BE=E7=A8=8B=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BB=BA=E8=AE=AE=E2=80=9C=E5=85=B3=E9=97=AD=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E2=80=9D=E5=AD=97=E6=A0=B7=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_form.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index 892c2775e..6784faf89 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -15,11 +15,12 @@ <% if User.current == @user %> <% (membership.roles).each do |role| %> <% unless (role == Role.find(9) || role == Role.find(3)) %> - <%= join_in_course(membership.course, User.current) %>     + <%= join_in_course(membership.course, User.current) %> <% end %> <% end %> <% else %> <% end %> +      <%= l(:label_x_base_courses_member, :count => membership.course.members.count) %> (<%= "#{membership.course.members.count}" %>)   <%= l(:label_homework) %> From 0723643ca6fd6e142f454977bb3e14e5a12e1431 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 28 Oct 2014 16:49:05 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=20#1410=E6=96=B0=E5=BB=BA=E8=B4=B4?= =?UTF-8?q?=E5=90=A7=EF=BC=9A=E8=BE=93=E5=85=A5=E8=B4=B4=E5=90=A7=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=B8=BA=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=8D=E4=BC=9A=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/ckeditor/contents.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/javascripts/ckeditor/contents.css b/public/javascripts/ckeditor/contents.css index 81e76d564..92a1b7ba1 100644 --- a/public/javascripts/ckeditor/contents.css +++ b/public/javascripts/ckeditor/contents.css @@ -22,6 +22,7 @@ body { font-size: 13px; line-height: 1.6em; + word-wrap: break-word; } blockquote From 591aa78dcff0f1161289eeedff1bd316bd638b68 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 17:22:35 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?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/views/bids/_history.html.erb | 49 +++++++++++-------- app/views/bids/show.html.erb | 30 +++++++++--- app/views/words/_journal_reply.html.erb | 6 +-- app/views/words/_journal_reply_items.html.erb | 42 +++++++++------- app/views/words/_new_respond.html.erb | 2 +- app/views/words/create_reply.js.erb | 15 +++--- 6 files changed, 87 insertions(+), 57 deletions(-) diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index 784fb7ff8..8273c4b04 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -1,6 +1,8 @@ <% reply_allow = JournalsForMessage.create_by_user? User.current %> <% tip1 = (@bid.reward_type == 3) ? l(:label_student_response) : l(:label_user_response) %> -

    <%=tip1%>

    +

    + <%=tip1%> +

    <%= render :partial => 'new', :locals => {:bid => @bid, :sta => @state} %> @@ -22,24 +24,31 @@
      <% for journal in journals%>
    • - <%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> - - <%= link_to journal.user, user_path(journal.user)%> - <%= label %> -
      <%= textilizable journal.notes%>
      - - <%= l(:label_bids_published) %>  - <%= time_tag(journal.created_on).html_safe %>  - <%= l(:label_bids_published_ago) %> - - <% ids = 'project_respond_form_'+ journal.id.to_s%> - + + <%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> + + + + <%= link_to journal.user, user_path(journal.user)%> + + + <%= label %> + +
      + <%= textilizable journal.notes%> +
      + + <%= l(:label_bids_published) %>  + <%= time_tag(journal.created_on).html_safe %>  + <%= l(:label_bids_published_ago) %> + + <% ids = 'project_respond_form_'+ journal.id.to_s%> + <% if reply_allow %> <%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true,:method => 'post', :title => l(:button_quote))%> <%= link_to l(:label_bid_respond_quote),'', - {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} - %> + {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} %> <% end %> <% if @user==User.current|| User.current.admin? %> <%= link_to(l(:label_bid_respond_delete), @@ -47,14 +56,14 @@ :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %> <% end %> -       -
      +       +
      <% ids = 'project_respond_form_'+ journal.id.to_s%> <% if reply_allow %> -
      - <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %> -
      +
      + <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %> +
      <% end %>
      diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 31baac38d..d9e9a5ae1 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -1,16 +1,34 @@ <% reply_allow = JournalsForMessage.create_by_user? User.current %>
      - <%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%> + + <%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%> + -

      <%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= link_to(@bid.name,respond_path(@bid)) %>

      +

      + <%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>： + <%= link_to(@bid.name,respond_path(@bid)) %> +

      <% if @bid.reward_type.nil? or @bid.reward_type == 1%>

      - <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %>  <%= l(:label_RMB_sign) %><%= @bid.budget %> + + <%= l(:label_bids_reward_method) %> + + <%= l(:label_call_bonus) %> +   + <%= l(:label_RMB_sign) %> + <%= @bid.budget %> + +

      <% elsif @bid.reward_type == 2%> -

      - <%= l(:label_bids_reward_method) %><%= @bid.budget%> -

      +

      + + <%= l(:label_bids_reward_method) %> + + <%= @bid.budget%> + + +

      <% else %> <% end %>
      diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index 6f87443c4..d9b9b4587 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,7 +1,7 @@ <% id = "journal_reply_ul_" + journal.id.to_s%>
        - <% fetch_user_leaveWord_reply(journal).each do |reply|%> - <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %> - <% end %> + <% fetch_user_leaveWord_reply(journal).each do |reply|%> + <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %> + <% end %>
      diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 0c33bedd3..030a0cdcd 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -2,33 +2,39 @@ <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
    • - <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %> + <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
      - <% id = 'project_respond_form_'+ reply.id.to_s %> + <% id = 'project_respond_form_'+ reply.id.to_s %>

      - <%= link_to reply.user.name, user_path(reply.user) %>:  - <%= reply.notes %> + + <%= link_to reply.user.name, user_path(reply.user) %> + :  + + + <%= reply.notes %> +

      - <%= format_time reply.created_on %> - + + <%= format_time reply.created_on %> + +

      - <% if reply_allow %> + <% if reply_allow %> <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id} %> - <% end %> + <% end %>
      • \ No newline at end of file diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 64b83d777..5671bcfa5 100644 --- a/app/views/words/_new_respond.html.erb +++ b/app/views/words/_new_respond.html.erb @@ -1,5 +1,5 @@ -<%= form_tag({:controller => 'words', :action => 'create_reply'}, :remote => true) do %> +<%= form_tag(words_create_reply_path, :remote => true) do %> <%= text_area_tag 'user_notes', "", :class => 'noline', :style => "resize: none;", :rows => 4, :placeholder => l(:label_projects_feedback_respond_content), diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index 6af90ef02..b24f46641 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -5,15 +5,12 @@ ) %>').hide(); $('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append); pre_append.fadeIn(600); - -var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea'); -textarea.val(''); -$('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide(); - -var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea'); -textarea1.val(''); -$('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide(); - + var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea'); + textarea.val(''); + $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide(); + var textarea1 = $('#course_respond_form_<%=@jfm.m_reply_id.to_s%> textarea'); + textarea1.val(''); + $('#course_respond_form_<%=@jfm.m_reply_id.to_s%>').hide(); setMaxLengthItem(pre_append.find('textarea')[0]); <% else %> alert("<%= l(:label_feedback_fail) %>"); From fb267080075541393ba2bec294885a7a4f43dbd4 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 17:25:46 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E4=BA=BA?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_links.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index 30e60190d..d5359185e 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -33,7 +33,7 @@ <% end %> <% end %> <% if options[:author] %> - + <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>, <%= format_time(attachment.created_on) %> From 7aa2e5c55318a1f5abc8b78515685dc1eb9ea42d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 17:28:18 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B7=A6=E8=BE=B9=E8=AF=BE=E7=A8=8B=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=83=A8=E5=88=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_homework.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index ed5691314..4fb97bf24 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -126,7 +126,7 @@
    + <%= l(:lable_course_teacher) %> : From 51e22cc2a9963bdb234fc1c0879c175e4cf85600 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 28 Oct 2014 17:38:32 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=20#1383=20=E9=A1=B9=E7=9B=AE--wiki?= =?UTF-8?q?=EF=BC=9A=E7=BC=96=E8=BE=91wiki=E5=8D=B4=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=B7=B2=E7=BB=8F=E6=88=90=E5=8A=9F=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9A=84=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/wiki/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 1fdbcf92f..88c280608 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -46,7 +46,7 @@ - <%= render :partial => 'attachments/form' %> + <%= render :partial => 'attachments/form',:locals => {:container => @page} %>