From c8c57b3f76851d15c444a0e9140f0d6175e17309 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 24 Oct 2014 09:26:53 +0800 Subject: [PATCH 01/11] =?UTF-8?q?#1404=E4=BF=AE=E5=A4=8D=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=BA=E8=A1=A8=E6=A0=BC=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=AE=BE=E7=BD=AE=E5=A4=A7=E4=BA=8E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=BD=E5=BA=A6=E7=9A=84=E5=AE=BD=E5=BA=A6=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84BUG=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0js=E6=94=B9=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index e121098f4..017a9a03c 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -51,7 +51,7 @@ style="word-break: break-all;word-wrap: break-word;"> <%= label_tag l(:field_subject) %>: <%=h @memo.subject %> -
+
<%= textAreailizable(@memo,:content) %>

<% if @memo.attachments.any?%> @@ -149,8 +149,17 @@ \ No newline at end of file From 1f9c6b66ca6dff14379876b4b5d26833ec2dfe63 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 24 Oct 2014 09:32:47 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwiki=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=B6=85=E5=87=BA=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/wiki/_content.html.erb | 2 +- app/views/wiki/show.html.erb | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/views/wiki/_content.html.erb b/app/views/wiki/_content.html.erb index 96d358381..2554f5f2a 100644 --- a/app/views/wiki/_content.html.erb +++ b/app/views/wiki/_content.html.erb @@ -1,4 +1,4 @@ -

+
<%= textAreailizable content, :text, :attachments => content.page.attachments, :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %> <%#= content.text.html_safe %> diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index b81091b7e..8ade60282 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -68,3 +68,15 @@ <%= render :partial => 'sidebar' %> <% end %> <% html_title @page.pretty_title %> + + From 9723d62d16c9b593078215658cdd2f54e5a2202c Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 24 Oct 2014 09:41:31 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=9C=89=E7=BC=96=E7=A0=81=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E9=94=99=E8=AF=AF=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E8=BD=AC=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 75b87c6f0..3c815c7d8 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -56,6 +56,8 @@ class AttachmentsController < ApplicationController } format.api end + rescue Encoding::InvalidByteSequenceError => e + render :action => 'file' end def download From 49beaa4f42c3285c537eed9b98a2edebeb21f4a6 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 24 Oct 2014 10:47:20 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8E=BB=E6=8E=89ajax=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 9d6d9f2b3..fcf54de75 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -54,7 +54,7 @@ if (textStatus == 'success') { eval(xhr.responseText); } else if (textStatus == 'error') { - alert('error'); +// alert('error'); } } From 526b34d623cea2bd0850c6b6d89634757a397f7f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 24 Oct 2014 11:26:41 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/join_private_courses.js.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb index 7bbb5ee99..0cf723f6b 100644 --- a/app/views/courses/join_private_courses.js.erb +++ b/app/views/courses/join_private_courses.js.erb @@ -1,4 +1,3 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>'); showModal('ajax-modal', '510px'); -$('#ajax-modal').addClass('new-watcher'); $('#ajax-modal').css('height','330px'); \ No newline at end of file From e6d1a127a96a40b8d811e0ae3e4d8ab8f2905cb5 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 24 Oct 2014 11:37:39 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMicros=E7=89=88?= =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/school/index.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb index 15a76a3d4..97035ebc2 100644 --- a/app/views/school/index.html.erb +++ b/app/views/school/index.html.erb @@ -5,7 +5,7 @@ $("#province").html(""); $.ajax({ type :"POST", - url :'/school/get_province', + url :'http://<%= Setting.host_name %>/school/get_province', data: "send", success: function(data, textStatus){ @@ -22,7 +22,7 @@ function get_school(value){ $.ajax({ type :"POST", - url :'/school/get_schoollist/'+encodeURIComponent(value), + url :'http://<%= Setting.host_name %>/school/get_schoollist/'+encodeURIComponent(value), data :'text', success: function(data){ $("#schoollist").html(data); @@ -39,7 +39,7 @@ @@ -57,7 +57,7 @@ //alert(province); $.ajax({ type :"POST", - url :'/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province, + url :'http://<%= Setting.host_name %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province, data :'text', success: function(data){ $("#schoollist").html(data); @@ -80,7 +80,7 @@ <%= link_to l(:label_all_schol),school_index_path %>      <% if User.current.logged? %> - <%= l(:label_my_school) %> + <%= l(:label_my_school) %> <% end %>

    From 782098c6e7d8ec89ca887f963088666bff6f0d4a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 24 Oct 2014 14:22:35 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=89=88=E4=B8=AA=E4=BA=BA=E4=BF=AE=E6=94=B9=E5=AD=A6=E6=A0=A1?= =?UTF-8?q?=E3=80=81=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E8=B7=A8=E5=9F=9F?= =?UTF-8?q?=E8=AE=BF=E9=97=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/helpers/application_helper.rb | 3 - app/views/my/account.html.erb | 2 +- app/views/school/index.html.erb | 129 ++++++++++++++---------------- config/locales/zh.yml | 3 +- 4 files changed, 60 insertions(+), 77 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2ba16c742..a577529cb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1836,11 +1836,8 @@ module ApplicationHelper bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'} forum_link = link_to l(:label_project_module_forums), {:controller => "forums", :action => "index"} stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'} - - school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'} - #@nav_dispaly_project_label nav_list = Array.new nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label && @show_course == 1 diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index df7a1310b..259fa8cc4 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -16,7 +16,7 @@ function get_options(value) { $.ajax({ type: "POST", - url: 'http://<%= Setting.host_name%>/school/get_options/' + encodeURIComponent(value), + url: 'http://<%= Setting.host_user%>/school/get_options/' + encodeURIComponent(value), data: 'text', success: function (data) { $("#province").val(value); diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb index 97035ebc2..ded1fb161 100644 --- a/app/views/school/index.html.erb +++ b/app/views/school/index.html.erb @@ -1,73 +1,58 @@ <% port = ":3000" if Rails.env.development? %>
    -

    - - <%= link_to l(:label_all_schol),school_index_path %>      - <% if User.current.logged? %> - <%= l(:label_my_school) %> - <% end %> -

    -
      -
    • <%= l(:label_select_province) %>: - -
      • -
    • -
      • -
    - +

    + <%= link_to l(:label_all_schol),school_index_path %>      + <% if User.current.logged? %> + + <%= l(:label_my_school) %> + + <% end %> +

    +
      +
    • + <%= l(:label_select_province) %>: + +
      • +
    • + + +
      • +
    -
      - -
    +
      +
    <% html_title(l(:label_school_all)) -%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index cd522dd2c..e37e6a370 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2056,8 +2056,7 @@ zh: label_x_activity: zero: 个动态 one: 个动态 - other: 个动态 - label_school_all: 中国高校 + other: 个动态 label_upload_files: 上传资源 label_relation_files: 关联已有资源 label_contest_settings: 配置竞赛 From 54e8df06cdeab0abf704a74c8585a7cfca0e7cca Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 25 Oct 2014 11:57:39 +0800 Subject: [PATCH 08/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9Micros=E7=89=88?= =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E4=B8=8D=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=89=88=E3=80=81=E6=B5=8B=E8=AF=95=E5=AD=A6=E6=A0=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AE=BF=E9=97=AE=E7=89=88=E8=B7=A8=E5=9F=9F?= =?UTF-8?q?=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/my/account.html.erb | 7 ++++++- app/views/school/index.html.erb | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 259fa8cc4..641102bdd 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -14,9 +14,14 @@