From 85bc9ce43d4a6a02bfef40cc317fc7adbd89c03e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 18 Dec 2015 14:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_upload_subfield_file.html.erb | 2 +- app/views/org_document_comments/edit.html.erb | 2 +- app/views/organizations/_join_course_menu.html.erb | 8 ++++---- app/views/organizations/_join_project_menu.html.erb | 8 ++++---- app/views/organizations/_org_members.html.erb | 2 +- app/views/organizations/join_course_menu.js.erb | 2 +- app/views/organizations/join_courses.js.erb | 11 ++++++----- app/views/organizations/join_project_menu.js.erb | 2 +- app/views/organizations/join_projects.js.erb | 11 ++++++----- 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb index 7137e14e7..33e4ce97c 100644 --- a/app/views/files/_upload_subfield_file.html.erb +++ b/app/views/files/_upload_subfield_file.html.erb @@ -9,7 +9,7 @@ <%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> <% if params[:in_org] %>
- 软件 |  + 软件 |  媒体 |  代码 |  其他 diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index 700211433..33244ef14 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -15,7 +15,7 @@ } } -
+
编辑文章
diff --git a/app/views/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb index 08488d6cd..c480e851c 100644 --- a/app/views/organizations/_join_course_menu.html.erb +++ b/app/views/organizations/_join_course_menu.html.erb @@ -87,10 +87,10 @@ url: "/organizations/"+orgId + "/join_courses?" + $("#join_courses_form").serialize(), type: "post", success: function (data) { - $.ajax({ - url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(), - type: "get" - }); +// $.ajax({ +// url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(), +// type: "get" +// }); } }); } diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb index 20b04ab34..3d2055ec9 100644 --- a/app/views/organizations/_join_project_menu.html.erb +++ b/app/views/organizations/_join_project_menu.html.erb @@ -83,10 +83,10 @@ url: "/organizations/"+orgId + "/join_projects?" + $("#join_projects_form").serialize(), type: "post", success: function (data) { - $.ajax({ - url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(), - type: "get" - }); +// $.ajax({ +// url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(), +// type: "get" +// }); } }); } diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb index ee15e19d7..53618fc92 100644 --- a/app/views/organizations/_org_members.html.erb +++ b/app/views/organizations/_org_members.html.erb @@ -1,5 +1,5 @@ <%= stylesheet_link_tag 'courses' %> -
+

组织成员

diff --git a/app/views/organizations/join_course_menu.js.erb b/app/views/organizations/join_course_menu.js.erb index 9812d412b..0c9d3f49e 100644 --- a/app/views/organizations/join_course_menu.js.erb +++ b/app/views/organizations/join_course_menu.js.erb @@ -4,7 +4,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_course_men showModal('ajax-modal', '320px'); $('#ajax-modal').siblings().hide(); $('#ajax-modal').before( - ""); + ""); //$('#ajax-modal').css('position','absolute') $('#ajax-modal').css("top","").css("left",""); $('#ajax-modal').parent().addClass("resourceSharePopup"); diff --git a/app/views/organizations/join_courses.js.erb b/app/views/organizations/join_courses.js.erb index dbe8b23ff..5f18d192d 100644 --- a/app/views/organizations/join_courses.js.erb +++ b/app/views/organizations/join_courses.js.erb @@ -1,6 +1,7 @@ -$("#homepageLeftMenuCourses").html(""); -$("#homepageLeftMenuCourses").append("
    "); -$("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses', +//$("#homepageLeftMenuCourses").html(""); +//$("#homepageLeftMenuCourses").append("
      "); +//$("#homepageLeftMenuCourses").append("<%#= escape_javascript(render :partial => 'layouts/org_courses', :locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>"); -$("#homepageLeftMenuCourses").append("
    "); -$("#homepageLeftMenuCourses").show(); \ No newline at end of file +//$("#homepageLeftMenuCourses").append("
"); +//$("#homepageLeftMenuCourses").show(); +location.reload(); \ No newline at end of file diff --git a/app/views/organizations/join_project_menu.js.erb b/app/views/organizations/join_project_menu.js.erb index 81bd802a4..86c8f32e1 100644 --- a/app/views/organizations/join_project_menu.js.erb +++ b/app/views/organizations/join_project_menu.js.erb @@ -4,7 +4,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_project_me showModal('ajax-modal', '320px'); $('#ajax-modal').siblings().hide(); $('#ajax-modal').before( - ""); + ""); //$('#ajax-modal').css('position','absolute'); $('#ajax-modal').css("top","").css("left",""); $('#ajax-modal').parent().addClass("resourceSharePopup"); diff --git a/app/views/organizations/join_projects.js.erb b/app/views/organizations/join_projects.js.erb index 53a9e4a02..c08a3c86e 100644 --- a/app/views/organizations/join_projects.js.erb +++ b/app/views/organizations/join_projects.js.erb @@ -1,6 +1,7 @@ -$("#homepageLeftMenuProjects").html(""); -$("#homepageLeftMenuProjects").append("
    "); -$("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects', +//$("#homepageLeftMenuProjects").html(""); +//$("#homepageLeftMenuProjects").append("
      "); +//$("#homepageLeftMenuProjects").append("<%#= escape_javascript(render :partial => 'layouts/org_projects', :locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>"); -$("#homepageLeftMenuProjects").append("
    "); -$("#homepageLeftMenuProjects").show(); \ No newline at end of file +//$("#homepageLeftMenuProjects").append("
"); +//$("#homepageLeftMenuProjects").show(); +location.reload(); \ No newline at end of file