From ed3be27687d32398fd0d9ccaecede8c804d6fb0c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 26 Aug 2015 18:07:31 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 97a159884..7e42d8332 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,5 +1,5 @@ -
+
消息
    From 631283ae79f5a15bb0da7741b97477a1a154458d Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 26 Aug 2015 20:37:43 +0800 Subject: [PATCH 02/24] remove grack --- app/controllers/repositories_controller.rb | 12 ++++++------ .../projects/settings/_new_repositories.html.erb | 15 +++++++++++++++ config/routes.rb | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 6dec9a82f..126b269bb 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -127,18 +127,19 @@ update end else # 原逻辑 ##xianbo - params[:repository_scm] = "Git" @root_path=RepositoriesHelper::ROOT_PATH @repository_name=User.current.login.to_s+"/"+params[:repository][:identifier]+".git" @project_path=@root_path+"htdocs/"+@repository_name - @repository_tag=params[:repository][:upassword] || params[:repository][:password] || '1234' + @repository_tag=params[:repository][:upassword] || params[:repository][:password] @repo_name=User.current.login.to_s+"_"+params[:repository][:identifier] logger.info "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+": "+@repository_tag logger.info "the value of create repository"+@root_path+": "+@repository_name+": "+@project_path+": "+@repo_name attrs = pickup_extra_info - params[:repository][:url]=@project_path + if((@repository_tag!="")&¶ms[:repository_scm]=="Git") + params[:repository][:url]=@project_path + end ###xianbo - @repository = Repository.factory(params[:repository_scm]||"Git") + @repository = Repository.factory(params[:repository_scm]) @repository.safe_attributes = params[:repository] if attrs[:attrs_extra].keys.any? @repository.merge_extra_info(attrs[:attrs_extra]) @@ -277,8 +278,7 @@ update @course_tag = params[:course] project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT ip = RepositoriesHelper::REPO_IP_ADDRESS - # @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+ - @repos_url = "http://#{Setting.host_name}/#{@repository.login.to_s}/#{@repository.identifier.to_s}.git" + @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 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 b626b4089..be793a409 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -62,6 +62,16 @@ <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} 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 %> +
      • + <% unless judge_main_repository(@project) %>
    • @@ -75,6 +85,11 @@ <%=l(:text_length_between,:min=>1,:max=>254)< <% end %>
      • +
    • + + <%= f.password_field :upassword, :label=> "", :no_label => true %> + <%= l(:label_upassword_info)%> +
    <%=l(:button_save)%> diff --git a/config/routes.rb b/config/routes.rb index 7ba09a83a..7c0042f6d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -29,7 +29,7 @@ RedmineApp::Application.routes.draw do mount Mobile::API => '/api' # Enable Grack support - mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] + # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] resources :homework_users resources :no_uses From 41a8f9d6a20a17b0ae9ed475182751cd98c5c676 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 09:28:13 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=8E=BB=E6=8E=89margi?= =?UTF-8?q?nBottom:10px=20=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E5=8A=A0?= =?UTF-8?q?=E5=BA=95=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/login.html.erb | 6 ++++++ public/stylesheets/header.css | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 3cd1fc25e..81b647b65 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -26,3 +26,9 @@
    <%= yield %> +
    +<%= render :partial => 'layouts/footer' %> +
    +<%= call_hook :view_layouts_base_body_bottom %> + + \ No newline at end of file diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index eda554eaf..b448e03af 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -96,7 +96,7 @@ a.topnav_login_box:hover {color:#a1ebff;} .topnav_login_list li{ } /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} +#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} .footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22e13709b..4e88ebf3f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -647,7 +647,7 @@ ul.list_watch{ .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;} /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} +#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} .footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} From 1f87c4adf5293612b04445f3b58c5ed255d12778 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 27 Aug 2015 09:46:17 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E9=87=8D=E5=A4=8DCSS=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22e13709b..c86435a4d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -380,8 +380,6 @@ a.sendButtonBlue:hover {color:#ffffff;} background-color: #64bdd9; outline:none; } -.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;} -.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;} a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;} a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;} .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;} @@ -504,7 +502,7 @@ a.coursesLineGrey:hover {color:#ffffff;} a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;} .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;} -.homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;} +.homepageRightBanner {width:720px; height:34px; margin:0px auto;} .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;} .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} From 0a898342d97bc6ddd02067a6cd2aa64fc6ee8311 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 10:01:13 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=A8enter=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 10 ++++++++-- app/views/layouts/login.html.erb | 14 +++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 816ef4a77..d2c686785 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -47,6 +47,12 @@ $("#loginInBox").css({display:"none"}); } }); + +// $('#regist_btn').bind('keyup', function(event) { +// if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) { +// register(); +// } +//}); function clearInfo(id, content) { var text = $('#' + id); if (text.val() == content) { @@ -206,7 +212,7 @@
<% end %>
- 登录 + 登录
@@ -248,7 +254,7 @@
我已阅读并接受Trustie服务协议条款
- 注册 + 注册
<% end %> diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 81b647b65..e7810d45a 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -15,7 +15,19 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - +< +
<% is_current_user = User.current.logged? && User.current == @user%> <% if User.current.logged? %> From 54c849cccb9c70d0572b7871c6d0bcfe938872df Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 11:02:20 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E9=80=89=E4=BB=BB=E4=BD=95?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=BC=B9=E5=87=BA=E6=A1=86=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 23 +++++++++++++++++-- .../users/add_exist_file_to_course.js.erb | 5 +++- .../users/add_exist_file_to_project.js.erb | 7 ++++-- app/views/users/user_resource.html.erb | 2 +- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a8243c5a5..2b6f2d28f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1066,10 +1066,14 @@ class UsersController < ApplicationController # 将资源发送到对应的课程,分为发送单个，或者批量发送 def add_exist_file_to_course + @flag = true if params[:send_id].present? send_id = params[:send_id] ori = Attachment.find_by_id(send_id) course_ids = params[:course_ids] + if course_ids.nil? + @flag = false + end unless course_ids.nil? course_ids.each do |id| next if ori.blank? @@ -1087,9 +1091,13 @@ class UsersController < ApplicationController end elsif params[:send_ids].present? send_ids = params[:send_ids].split(" ") + course_ids = params[:course_ids] + if course_ids.nil? + @flag = false + end send_ids.each do |send_id| ori = Attachment.find_by_id(send_id) - course_ids = params[:course_ids] + unless course_ids.nil? course_ids.each do |id| next if ori.blank? @@ -1106,6 +1114,8 @@ class UsersController < ApplicationController end end end + else + @flag = false end respond_to do |format| format.js @@ -1114,9 +1124,13 @@ class UsersController < ApplicationController # 添加资源到对应的项目 def add_exist_file_to_project + @flag = true if params[:send_id].present? send_id = params[:send_id] project_ids = params[:projects_ids] + if project_ids.nil? + @flag = false + end ori = Attachment.find_by_id(send_id) unless project_ids.nil? project_ids.each do |project_id| @@ -1134,8 +1148,12 @@ class UsersController < ApplicationController end elsif params[:send_ids].present? send_ids = params[:send_ids].split(" ") + project_ids = params[:projects_ids] + if project_ids.nil? + @flag = false + end send_ids.each do |send_id| - project_ids = params[:projects_ids] + ori = Attachment.find_by_id(send_id) unless project_ids.nil? project_ids.each do |project_id| @@ -1153,6 +1171,7 @@ class UsersController < ApplicationController end end else + @flag=true end respond_to do |format| diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb index c5b9f8fbe..93c572fa0 100644 --- a/app/views/users/add_exist_file_to_course.js.erb +++ b/app/views/users/add_exist_file_to_course.js.erb @@ -1,2 +1,5 @@ +<% if @flag == true%> alert('发送成功') -closeModal(); \ No newline at end of file +closeModal(); +<% else%> +<% end %> \ No newline at end of file diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb index 6ed846821..93c572fa0 100644 --- a/app/views/users/add_exist_file_to_project.js.erb +++ b/app/views/users/add_exist_file_to_project.js.erb @@ -1,2 +1,5 @@ -alert('发送成功'); -closeModal(); \ No newline at end of file +<% if @flag == true%> +alert('发送成功') +closeModal(); +<% else%> +<% end %> \ No newline at end of file diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index c36fdc293..1a45b7870 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -161,7 +161,7 @@ $(".resourcesList").mousedown(function(e) { line = line.parent(); } //将当前的元素的所有子元素的背景色改为蓝色 - line.children().css("background-color", '#00ffff'); + line.children().css("background-color", '#e1e1e1'); //将当前元素赋给 上一个对象 保存起来。 last_line = line; } From cff93331b28a216eec35e8f351929feb4672e98d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 11:06:04 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E6=A0=87=E7=82=B9=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index d2c686785..8bdace544 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -167,7 +167,7 @@
-
欢迎加入Trustie高校创新实践社区，老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。
+
欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。
From d99c1dd72a3850424aa6993a49a92040e5d372ef Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 14:11:56 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E7=9A=84base=E9=94=99=E4=BA=86=E3=80=82?= 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 1e4b01df0..58044d1d4 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -79,7 +79,7 @@ class AccountController < ApplicationController return end end - render :layout => 'static_base', :template => "account/password_recovery" + render :template => "account/password_recovery" return else if request.post? From a4e30d119d2209af8b49baafc6c2730119bf5607 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 14:27:49 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E5=88=A0=E4=B8=8D=E6=8E=89=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E6=8F=90=E7=A4=BA?= 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 1a45b7870..457390834 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -258,7 +258,7 @@ $(".resourcesList").click(function(e) { //批量删除 function batch_delete(){ var data = $("#resources_list_form").serialize(); - if(data != "" && confirm('您可能会删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) { + if(data != "" && confirm('您删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) { $.post( '<%= user_resource_delete_user_path(@user)%>', $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交 From b7daa643c806d432e73e543ef6f247f8574ad731 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 14:49:51 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=E5=A4=84=E5=8D=95=E5=87=BB=E4=B9=9F=E8=A6=81=E9=9A=90?= =?UTF-8?q?=E8=97=8F=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/users/user_resource.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 457390834..2b88fed1c 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -166,9 +166,10 @@ $(".resourcesList").mousedown(function(e) { last_line = line; } }); -$(".resourcesList").click(function(e) { +$(document.body).click(function(e) { //在列表上的任何单击事件都要恢复原来的样子 //隐藏右键菜单 + e.preventDefault() $("#contextMenu").hide(); document.oncontextmenu = function() {return true;} //如果当前行为空，那么要将当前行的拿到 From cc76c1370049bea2ab0f17b877e6d4136113f898 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 27 Aug 2015 15:07:48 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index c36fdc293..b644fc73e 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -43,7 +43,7 @@ $("#upload_form").submit(); } -
+
资源库
    @@ -102,12 +102,14 @@
+
+
+
    + <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%> +
+
-
-
    - <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%> -
-
+