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 01/41] 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| %>
<%=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 02/41] =?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 0a898342d97bc6ddd02067a6cd2aa64fc6ee8311 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 10:01:13 +0800 Subject: [PATCH 03/41] =?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 a7eff50c6114f8c253e99b2d6d64a6bf5e368e91 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 27 Aug 2015 10:32:45 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=9A=E5=9B=9E=E5=A4=8D=E4=B8=9C=E5=AE=B6?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E5=A4=8D=E4=BA=BA=E5=92=8C=E4=B8=9C=E5=AE=B6?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E4=B8=80=E4=BA=BA=E6=94=B6=E5=88=B0=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 24 +----------------------- app/models/user.rb | 1 + 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 1f5f2e1a6..6f775e7a2 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -212,33 +212,11 @@ class JournalsForMessage < ActiveRecord::Base if self.user_id != self.reply_id # 添加我回复的那个人 receivers << reply_to end - if self.user_id != self.parent.jour_id # 给东家发信息 + if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 receivers << self.parent.jour end - # if self.user_id != self.parent.user_id - # receivers << reply_to - # if self.reply_id != self.parent.user_id - # receivers << self.parent.user - # end - # else - # receivers << reply_to - # end - - # 添加留言回复人 - #reply_to = User.find(self.reply_id) - #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id # 如果回帖人不是用户自己 - # receivers << self.parent.user - # if self.reply_id != self.parent.user_id - # receivers << reply_to - # end - #else # 用户自己回复别人的，别人收到消息通知 - # if self.user_id != self.reply_id # 过滤掉自己回复自己的 - # receivers << reply_to - # end - #end end if self.jour_type == 'Principal' - receivers.each do |r| self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false) end diff --git a/app/models/user.rb b/app/models/user.rb index 61dd60eec..b08b29981 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -263,6 +263,7 @@ class User < Principal user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count messages_count = course_count + forge_count + user_feedback_count + user_memo_count end + # 查询指派给我的缺陷记录 def issue_status_update self.status_updates 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 05/41] =?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 06/41] =?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 07/41] =?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 08/41] =?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 09/41] =?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 10/41] =?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%> -
-
+
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb new file mode 100644 index 000000000..945da4c9a --- /dev/null +++ b/app/views/users/user_select_homework.js.erb @@ -0,0 +1,7 @@ +//$("#HomeWorkCon").replaceWith("<%#= escape_javascript(render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:edit_mode => true })%>"); +hideModal('#coursesChoosePopup'); +$("#homework_name").val("<%= @homework.name%>"); +$("#homework_end_time").val("<%= @homework.end_time%>"); +$("#course_id").val("<%= @homework.course_id%>"); +$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>"); +homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>"); diff --git a/config/routes.rb b/config/routes.rb index 62c23b959..634fb6d27 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -309,6 +309,7 @@ RedmineApp::Application.routes.draw do collection do match "tag_saveEx" , :via => [:get, :post] post "user_new_homework" + post 'user_select_homework' end member do match 'user_projects_index', :to => 'users#user_projects_index', :via => :get diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e4b735b73..cfb8fb867 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -859,7 +859,8 @@ a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; l a:hover.BlueCirBtn{ background:#15bccf; color:#fff;} .W440{ width:440px;} .W120{ width:110px;} -.W700{ width:700px;} +.W700{ width:700px;max-width: 700px;min-width: 700px;} +.w708{width: 708px;} a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#15bccf;} a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} @@ -919,7 +920,7 @@ img.ui-datepicker-trigger { #attachments_fields input.filename { border: 0; height: 1.8em; - max-width: 670px; + width: 630px; color: #7f7f7f; background-color: inherit; background: url(../images/pic_file.png) 0 3px no-repeat; @@ -932,6 +933,7 @@ img.ui-datepicker-trigger { .description{display: none !important;} .ispublic-label{display: none !important;} .is_public_checkbox{display: none !important;} +.is_public{display: none !important;} From 711b21070f4d32d7bc2a38f478952124599baa20 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 11:53:05 +0800 Subject: [PATCH 21/41] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index cfb8fb867..43b7ec22c 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -764,6 +764,9 @@ div.modal { .ui-widget { font-family: Verdana, sans-serif; font-size: 1.1em; + width: 200px; + height: 14px; + background: #e2e2e2; } .ui-dialog .ui-dialog-content { position: relative; @@ -934,6 +937,7 @@ img.ui-datepicker-trigger { .ispublic-label{display: none !important;} .is_public_checkbox{display: none !important;} .is_public{display: none !important;} +.ui-corner-left{background: #64bdd9;} From 43d9697195828ad22fc3c9283aa09475923e6af2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 11:55:32 +0800 Subject: [PATCH 22/41] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9D=97=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_homeworks.html.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 16f3a3472..2813f2006 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -15,10 +15,14 @@ <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> -
-
+
+
发布作业
+
+
+ +
<% homework = HomeworkCommon.new %> <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
From b6d58b1b5861706981b2e634ad79c08c0da5a43b Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 11:55:34 +0800 Subject: [PATCH 23/41] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/agreement.html.erb | 2 +- app/views/layouts/_footer.html.erb | 9 +- app/views/layouts/_logined_header.html.erb | 14 +- app/views/layouts/_unlogin_header.html.erb | 6 +- app/views/users/_course_attachment.html.erb | 4 +- app/views/users/_course_create.html.erb | 8 +- app/views/users/_course_homework.html.erb | 8 +- .../users/_course_journalsformessage.html.erb | 4 +- app/views/users/_course_message.html.erb | 8 +- app/views/users/_course_news.html.erb | 8 +- app/views/users/_course_poll.html.erb | 4 +- app/views/users/_project_attachment.html.erb | 2 +- app/views/users/_project_create.html.erb | 2 +- app/views/users/_project_document.html.erb | 2 +- app/views/users/_project_issue.html.erb | 8 +- app/views/users/_project_journal.html.erb | 2 +- app/views/users/_project_message.html.erb | 6 +- app/views/users/_project_news.html.erb | 4 +- app/views/users/show.html.erb | 2 +- app/views/users/user_resource.html.erb | 2 + db/schema.rb | 3373 +++++++++-------- public/images/homepage_icon.png | Bin 10318 -> 8565 bytes public/images/nav_icon.png | Bin 3204 -> 3432 bytes public/stylesheets/header.css | 19 +- public/stylesheets/new_user.css | 117 +- 25 files changed, 1810 insertions(+), 1804 deletions(-) diff --git a/app/views/account/agreement.html.erb b/app/views/account/agreement.html.erb index 95befbfd4..921f66350 100644 --- a/app/views/account/agreement.html.erb +++ b/app/views/account/agreement.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag 'new_user'%> -
+

Trustie服务协议

尊敬的用户，您好！
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 5aeb0031f..720ff3e8f 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,11 +1,11 @@

\ No newline at end of file diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 5ba49cd5d..b41aced7c 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -1,19 +1,19 @@
  • - <%= link_to "首页",user_activities_path(User.current.id), :class => "homepageWhite f16"%> + <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white p10 f16 db"%>
  • - 资源库
    • + 资源库
  • - <%= link_to "作业", user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%> + <%= link_to "作业", user_homeworks_user_path(User.current.id), :class => "c_white p10 f16 db"%>
    • -
  • - 帮助中心 +
  • + 帮助中心
@@ -36,7 +36,7 @@ <% name = name%> <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %> - " class="navHomepageSearchInput" /> + " class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" /> <% end %> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index e7201b391..d11fdbfb2 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -1,10 +1,10 @@
@@ -36,7 +36,7 @@ <% name = name%> <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %> - " class="navHomepageSearchInput"/> + " class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" /> <% end %> diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index d58ef5655..ec68b2332 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %> diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 4d26b523a..19a5d89d2 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -1,9 +1,9 @@ -
-
-
+
+
+
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 9fc312c96..0cb3aa25e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -1,10 +1,10 @@ -
-
+
+
<%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index 6b53d44eb..a72eac345 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -1,5 +1,5 @@ -
-
+
+
用户头像
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 2d5e372ea..e84e6a316 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -1,10 +1,10 @@ -
-
+
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -13,7 +13,7 @@ TO <%= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
-
+
<% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 28eb5bc0f..ce85e0cad 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -1,10 +1,10 @@ -
-
+
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index b55280262..0c93e7627 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -1,7 +1,7 @@ <%# has_commit = has_commit_poll?(activity.id ,User.current)%> <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> -
-
+
+
<%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %> diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 742d9acd4..54a7b3c17 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -1,4 +1,4 @@ -
+
用户头像
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index 795c8f2a8..1d6943be1 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -1,4 +1,4 @@ -
+
用户头像
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index 082963d36..6e58552de 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -1,4 +1,4 @@ -
+
用户头像
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index d43925ba6..c097f6c41 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -1,10 +1,10 @@ -
-
+
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.project.name.to_s+"(项目名称)", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%= link_to activity.subject.to_s+"(缺陷标题)", issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> <%=activity.status.name %>
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index f16b09c66..7833d8675 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -1,4 +1,4 @@ -
+
用户头像
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index ef7f9eada..57b021467 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -1,10 +1,10 @@ -
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -14,7 +14,7 @@ <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
-
+
<% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb index 8bc1b5422..ea39cbae5 100644 --- a/app/views/users/_project_news.html.erb +++ b/app/views/users/_project_news.html.erb @@ -1,5 +1,5 @@ -
-
+
+
用户头像
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 78995ab76..dc56b2fcb 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -46,7 +46,7 @@
    • 更多
      • -
    • <%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAssignment postTypeGrey"%> +
    • <%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
    • diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 35baf4a77..fe87f7f35 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -65,6 +65,8 @@
    +
    +
    上传资源
    diff --git a/db/schema.rb b/db/schema.rb index 6aa6da41d..5b09c8f3d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,1686 +1,1687 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20150826061843) do - - create_table "activities", :force => true do |t| - t.integer "act_id", :null => false - t.string "act_type", :null => false - t.integer "user_id", :null => false - t.integer "activity_container_id" - t.string "activity_container_type", :default => "" - t.datetime "created_at" - end - - add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" - add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" - add_index "activities", ["user_id"], :name => "index_activities_on_user_id" - - create_table "activity_notifies", :force => true do |t| - t.integer "activity_container_id" - t.string "activity_container_type" - t.integer "activity_id" - t.string "activity_type" - t.integer "notify_to" - t.datetime "created_on" - t.integer "is_read" - end - - add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id" - add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" - add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" - - create_table "api_keys", :force => true do |t| - t.string "access_token" - t.datetime "expires_at" - t.integer "user_id" - t.boolean "active", :default => true - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" - add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" - - create_table "applied_projects", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - end - - create_table "apply_project_masters", :force => true do |t| - t.integer "user_id" - t.string "apply_type" - t.integer "apply_id" - t.integer "status" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "attachments", :force => true do |t| - t.integer "container_id" - t.string "container_type", :limit => 30 - t.string "filename", :default => "", :null => false - t.string "disk_filename", :default => "", :null => false - t.integer "filesize", :default => 0, :null => false - t.string "content_type", :default => "" - t.string "digest", :limit => 40, :default => "", :null => false - t.integer "downloads", :default => 0, :null => false - t.integer "author_id", :default => 0, :null => false - t.datetime "created_on" - t.string "description" - t.string "disk_directory" - t.integer "attachtype", :default => 1 - t.integer "is_public", :default => 1 - t.integer "copy_from" - t.integer "quotes" - end - - add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" - add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" - add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" - - create_table "attachmentstypes", :force => true do |t| - t.integer "typeId", :null => false - t.string "typeName", :limit => 50 - end - - create_table "auth_sources", :force => true do |t| - t.string "type", :limit => 30, :default => "", :null => false - t.string "name", :limit => 60, :default => "", :null => false - t.string "host", :limit => 60 - t.integer "port" - t.string "account" - t.string "account_password", :default => "" - t.string "base_dn" - t.string "attr_login", :limit => 30 - t.string "attr_firstname", :limit => 30 - t.string "attr_lastname", :limit => 30 - t.string "attr_mail", :limit => 30 - t.boolean "onthefly_register", :default => false, :null => false - t.boolean "tls", :default => false, :null => false - t.string "filter" - t.integer "timeout" - end - - add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type" - - create_table "biding_projects", :force => true do |t| - t.integer "project_id" - t.integer "bid_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "bids", :force => true do |t| - t.string "name" - t.string "budget", :null => false - t.integer "author_id" - t.date "deadline" - t.text "description" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.integer "commit" - t.integer "reward_type" - t.integer "homework_type" - t.integer "parent_id" - t.string "password" - t.integer "is_evaluation" - t.integer "proportion", :default => 60 - t.integer "comment_status", :default => 0 - t.integer "evaluation_num", :default => 3 - t.integer "open_anonymous_evaluation", :default => 1 - end - - create_table "boards", :force => true do |t| - t.integer "project_id", :null => false - t.string "name", :default => "", :null => false - t.string "description" - t.integer "position", :default => 1 - t.integer "topics_count", :default => 0, :null => false - t.integer "messages_count", :default => 0, :null => false - t.integer "last_message_id" - t.integer "parent_id" - t.integer "course_id" - end - - add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" - add_index "boards", ["project_id"], :name => "boards_project_id" - - create_table "bug_to_osps", :force => true do |t| - t.integer "osp_id" - t.integer "relative_memo_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "changes", :force => true do |t| - t.integer "changeset_id", :null => false - t.string "action", :limit => 1, :default => "", :null => false - t.text "path", :null => false - t.text "from_path" - t.string "from_revision" - t.string "revision" - t.string "branch" - end - - add_index "changes", ["changeset_id"], :name => "changesets_changeset_id" - - create_table "changeset_parents", :id => false, :force => true do |t| - t.integer "changeset_id", :null => false - t.integer "parent_id", :null => false - end - - add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids" - add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" - - create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false - t.string "committer" - t.datetime "committed_on", :null => false - t.text "comments" - t.date "commit_date" - t.string "scmid" - t.integer "user_id" - end - - add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" - add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true - add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid" - add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id" - add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id" - - create_table "changesets_issues", :id => false, :force => true do |t| - t.integer "changeset_id", :null => false - t.integer "issue_id", :null => false - end - - add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true - - create_table "code_review_assignments", :force => true do |t| - t.integer "issue_id" - t.integer "change_id" - t.integer "attachment_id" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.string "action_type" - t.integer "changeset_id" - end - - create_table "code_review_project_settings", :force => true do |t| - t.integer "project_id" - t.integer "tracker_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "updated_by" - t.boolean "hide_code_review_tab", :default => false - t.integer "auto_relation", :default => 1 - t.integer "assignment_tracker_id" - t.text "auto_assign" - t.integer "lock_version", :default => 0, :null => false - t.boolean "tracker_in_review_dialog", :default => false - end - - create_table "code_review_user_settings", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "mail_notification", :default => 0, :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "code_reviews", :force => true do |t| - t.integer "project_id" - t.integer "change_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "line" - t.integer "updated_by_id" - t.integer "lock_version", :default => 0, :null => false - t.integer "status_changed_from" - t.integer "status_changed_to" - t.integer "issue_id" - t.string "action_type" - t.string "file_path" - t.string "rev" - t.string "rev_to" - t.integer "attachment_id" - t.integer "file_count", :default => 0, :null => false - t.boolean "diff_all" - end - - create_table "comments", :force => true do |t| - t.string "commented_type", :limit => 30, :default => "", :null => false - t.integer "commented_id", :default => 0, :null => false - t.integer "author_id", :default => 0, :null => false - t.text "comments" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - add_index "comments", ["author_id"], :name => "index_comments_on_author_id" - add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type" - - create_table "contest_notifications", :force => true do |t| - t.text "title" - t.text "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "contesting_projects", :force => true do |t| - t.integer "project_id" - t.string "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contesting_softapplications", :force => true do |t| - t.integer "softapplication_id" - t.integer "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contestnotifications", :force => true do |t| - t.integer "contest_id" - t.string "title" - t.string "summary" - t.text "description" - t.integer "author_id" - t.integer "notificationcomments_count" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "contests", :force => true do |t| - t.string "name" - t.string "budget", :default => "" - t.integer "author_id" - t.date "deadline" - t.string "description" - t.integer "commit" - t.string "password" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - create_table "course_activities", :force => true do |t| - t.integer "user_id" - t.integer "course_id" - t.integer "course_act_id" - t.string "course_act_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_attachments", :force => true do |t| - t.string "filename" - t.string "disk_filename" - t.integer "filesize" - t.string "content_type" - t.string "digest" - t.integer "downloads" - t.string "author_id" - t.string "integer" - t.string "description" - t.string "disk_directory" - t.integer "attachtype" - t.integer "is_public" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "container_id", :default => 0 - end - - create_table "course_groups", :force => true do |t| - t.string "name" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_infos", :force => true do |t| - t.integer "course_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "course_messages", :force => true do |t| - t.integer "user_id" - t.integer "course_id" - t.integer "course_message_id" - t.string "course_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "content" - t.integer "status" - end - - create_table "course_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "course_id" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "courses", :force => true do |t| - t.integer "tea_id" - t.string "name" - t.integer "state" - t.string "code" - t.integer "time" - t.string "extra" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "location" - t.string "term" - t.string "string" - t.string "password" - t.string "setup_time" - t.string "endup_time" - t.string "class_period" - t.integer "school_id" - t.text "description" - t.integer "status", :default => 1 - t.integer "attachmenttype", :default => 2 - t.integer "lft" - t.integer "rgt" - t.integer "is_public", :limit => 1, :default => 1 - t.integer "inherit_members", :limit => 1, :default => 1 - t.integer "open_student", :default => 0 - end - - create_table "custom_fields", :force => true do |t| - t.string "type", :limit => 30, :default => "", :null => false - t.string "name", :limit => 30, :default => "", :null => false - t.string "field_format", :limit => 30, :default => "", :null => false - t.text "possible_values" - t.string "regexp", :default => "" - t.integer "min_length", :default => 0, :null => false - t.integer "max_length", :default => 0, :null => false - t.boolean "is_required", :default => false, :null => false - t.boolean "is_for_all", :default => false, :null => false - t.boolean "is_filter", :default => false, :null => false - t.integer "position", :default => 1 - t.boolean "searchable", :default => false - t.text "default_value" - t.boolean "editable", :default => true - t.boolean "visible", :default => true, :null => false - t.boolean "multiple", :default => false - end - - add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type" - - create_table "custom_fields_projects", :id => false, :force => true do |t| - t.integer "custom_field_id", :default => 0, :null => false - t.integer "project_id", :default => 0, :null => false - end - - add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true - - create_table "custom_fields_trackers", :id => false, :force => true do |t| - t.integer "custom_field_id", :default => 0, :null => false - t.integer "tracker_id", :default => 0, :null => false - end - - add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true - - create_table "custom_values", :force => true do |t| - t.string "customized_type", :limit => 30, :default => "", :null => false - t.integer "customized_id", :default => 0, :null => false - t.integer "custom_field_id", :default => 0, :null => false - t.text "value" - end - - add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" - add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - - create_table "delayed_jobs", :force => true do |t| - t.integer "priority", :default => 0, :null => false - t.integer "attempts", :default => 0, :null => false - t.text "handler", :null => false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - - create_table "discuss_demos", :force => true do |t| - t.string "title" - t.text "body" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "documents", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.integer "category_id", :default => 0, :null => false - t.string "title", :limit => 60, :default => "", :null => false - t.text "description" - t.datetime "created_on" - t.integer "user_id", :default => 0 - t.integer "is_public", :default => 1 - end - - add_index "documents", ["category_id"], :name => "index_documents_on_category_id" - add_index "documents", ["created_on"], :name => "index_documents_on_created_on" - add_index "documents", ["project_id"], :name => "documents_project_id" - - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - 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", :null => false - t.datetime "updated_at", :null => false - end - - create_table "enabled_modules", :force => true do |t| - t.integer "project_id" - t.string "name", :null => false - t.integer "course_id" - end - - add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id" - - create_table "enumerations", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "is_default", :default => false, :null => false - t.string "type" - t.boolean "active", :default => true, :null => false - t.integer "project_id" - t.integer "parent_id" - t.string "position_name", :limit => 30 - end - - add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" - add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - - create_table "first_pages", :force => true do |t| - t.string "web_title" - t.string "title" - t.text "description" - t.string "page_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "sort_type" - t.integer "image_width", :default => 107 - t.integer "image_height", :default => 63 - t.integer "show_course", :default => 1 - t.integer "show_contest", :default => 1 - end - - create_table "forge_activities", :force => true do |t| - t.integer "user_id" - t.integer "project_id" - t.integer "forge_act_id" - t.string "forge_act_type" - t.integer "org_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" - - create_table "forge_messages", :force => true do |t| - t.integer "user_id" - t.integer "project_id" - t.integer "forge_message_id" - t.string "forge_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "forums", :force => true do |t| - t.string "name", :null => false - t.text "description" - t.integer "topic_count", :default => 0 - t.integer "memo_count", :default => 0 - t.integer "last_memo_id", :default => 0 - t.integer "creator_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "sticky" - t.integer "locked" - end - - create_table "groups_users", :id => false, :force => true do |t| - t.integer "group_id", :null => false - t.integer "user_id", :null => false - end - - add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - - create_table "homework_attaches", :force => true do |t| - t.integer "bid_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - t.string "name" - t.text "description" - t.integer "state" - t.integer "project_id", :default => 0 - t.float "score", :default => 0.0 - t.integer "is_teacher_score", :default => 0 - end - - add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" - - create_table "homework_commons", :force => true do |t| - t.string "name" - t.integer "user_id" - t.text "description" - t.date "publish_time" - t.date "end_time" - t.integer "homework_type", :default => 1 - t.string "late_penalty" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_detail_manuals", :force => true do |t| - t.float "ta_proportion" - t.integer "comment_status" - t.date "evaluation_start" - t.date "evaluation_end" - t.integer "evaluation_num" - t.integer "absence_penalty", :default => 1 - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_detail_programings", :force => true do |t| - t.string "language" - t.text "standard_code", :limit => 2147483647 - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.float "ta_proportion", :default => 0.1 - t.integer "question_id" - end - - create_table "homework_evaluations", :force => true do |t| - t.string "user_id" - t.string "homework_attach_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "homework_for_courses", :force => true do |t| - t.integer "course_id" - t.integer "bid_id" - end - - add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" - add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" - - create_table "homework_tests", :force => true do |t| - t.text "input" - t.text "output" - t.integer "homework_common_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "result" - t.text "error_msg" - end - - create_table "homework_users", :force => true do |t| - t.string "homework_attach_id" - t.string "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "invite_lists", :force => true do |t| - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "issue_categories", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "name", :limit => 30, :default => "", :null => false - t.integer "assigned_to_id" - end - - add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id" - add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id" - - create_table "issue_relations", :force => true do |t| - t.integer "issue_from_id", :null => false - t.integer "issue_to_id", :null => false - t.string "relation_type", :default => "", :null => false - t.integer "delay" - end - - add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true - add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id" - add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id" - - create_table "issue_statuses", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.boolean "is_closed", :default => false, :null => false - t.boolean "is_default", :default => false, :null => false - t.integer "position", :default => 1 - t.integer "default_done_ratio" - end - - add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed" - add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default" - add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position" - - create_table "issues", :force => true do |t| - t.integer "tracker_id", :null => false - t.integer "project_id", :null => false - t.string "subject", :default => "", :null => false - t.text "description" - t.date "due_date" - t.integer "category_id" - t.integer "status_id", :null => false - t.integer "assigned_to_id" - t.integer "priority_id", :null => false - t.integer "fixed_version_id" - t.integer "author_id", :null => false - t.integer "lock_version", :default => 0, :null => false - t.datetime "created_on" - t.datetime "updated_on" - t.date "start_date" - t.integer "done_ratio", :default => 0, :null => false - t.float "estimated_hours" - t.integer "parent_id" - t.integer "root_id" - t.integer "lft" - t.integer "rgt" - t.boolean "is_private", :default => false, :null => false - t.datetime "closed_on" - t.integer "project_issues_index" - end - - add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id" - add_index "issues", ["author_id"], :name => "index_issues_on_author_id" - add_index "issues", ["category_id"], :name => "index_issues_on_category_id" - add_index "issues", ["created_on"], :name => "index_issues_on_created_on" - add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id" - add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id" - add_index "issues", ["project_id"], :name => "issues_project_id" - add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt" - add_index "issues", ["status_id"], :name => "index_issues_on_status_id" - add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id" - - create_table "join_in_competitions", :force => true do |t| - t.integer "user_id" - t.integer "competition_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "join_in_contests", :force => true do |t| - t.integer "user_id" - t.integer "bid_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "journal_details", :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", ["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" - t.integer "reply_id" - end - - add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id" - add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id" - add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id" - - create_table "journals", :force => true do |t| - t.integer "journalized_id", :default => 0, :null => false - t.string "journalized_type", :limit => 30, :default => "", :null => false - t.integer "user_id", :default => 0, :null => false - t.text "notes" - t.datetime "created_on", :null => false - t.boolean "private_notes", :default => false, :null => false - end - - add_index "journals", ["created_on"], :name => "index_journals_on_created_on" - add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id" - add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id" - add_index "journals", ["user_id"], :name => "index_journals_on_user_id" - - create_table "journals_for_messages", :force => true do |t| - t.integer "jour_id" - t.string "jour_type" - t.integer "user_id" - t.text "notes" - t.integer "status" - t.integer "reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.string "m_parent_id" - t.boolean "is_readed" - t.integer "m_reply_count" - t.integer "m_reply_id" - t.integer "is_comprehensive_evaluation" - end - - create_table "kindeditor_assets", :force => true do |t| - t.string "asset" - t.integer "file_size" - t.string "file_type" - t.integer "owner_id" - t.string "asset_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "owner_type", :default => 0 - end - - create_table "member_roles", :force => true do |t| - t.integer "member_id", :null => false - t.integer "role_id", :null => false - t.integer "inherited_from" - end - - add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id" - add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id" - - create_table "members", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.integer "project_id", :default => 0 - t.datetime "created_on" - t.boolean "mail_notification", :default => false, :null => false - t.integer "course_id", :default => -1 - t.integer "course_group_id", :default => 0 - end - - add_index "members", ["project_id"], :name => "index_members_on_project_id" - add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true - add_index "members", ["user_id"], :name => "index_members_on_user_id" - - create_table "memo_messages", :force => true do |t| - t.integer "user_id" - t.integer "forum_id" - t.integer "memo_id" - t.string "memo_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "memos", :force => true do |t| - t.integer "forum_id", :null => false - t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :null => false - t.integer "author_id", :null => false - t.integer "replies_count", :default => 0 - t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count", :default => 0 - end - - create_table "message_alls", :force => true do |t| - t.integer "user_id" - t.integer "message_id" - t.string "message_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "messages", :force => true do |t| - t.integer "board_id", :null => false - t.integer "parent_id" - t.string "subject", :default => "", :null => false - t.text "content" - t.integer "author_id" - t.integer "replies_count", :default => 0, :null => false - t.integer "last_reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - t.boolean "locked", :default => false - t.integer "sticky", :default => 0 - end - - add_index "messages", ["author_id"], :name => "index_messages_on_author_id" - add_index "messages", ["board_id"], :name => "messages_board_id" - add_index "messages", ["created_on"], :name => "index_messages_on_created_on" - add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" - add_index "messages", ["parent_id"], :name => "messages_parent_id" - - create_table "news", :force => true do |t| - t.integer "project_id" - t.string "title", :limit => 60, :default => "", :null => false - t.string "summary", :default => "" - t.text "description" - t.integer "author_id", :default => 0, :null => false - t.datetime "created_on" - t.integer "comments_count", :default => 0, :null => false - t.integer "course_id" - end - - add_index "news", ["author_id"], :name => "index_news_on_author_id" - add_index "news", ["created_on"], :name => "index_news_on_created_on" - add_index "news", ["project_id"], :name => "news_project_id" - - create_table "no_uses", :force => true do |t| - t.integer "user_id", :null => false - t.string "no_use_type" - t.integer "no_use_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "notificationcomments", :force => true do |t| - t.string "notificationcommented_type" - t.integer "notificationcommented_id" - t.integer "author_id" - t.text "notificationcomments" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "open_id_authentication_associations", :force => true do |t| - t.integer "issued" - t.integer "lifetime" - t.string "handle" - t.string "assoc_type" - t.binary "server_url" - t.binary "secret" - end - - create_table "open_id_authentication_nonces", :force => true do |t| - t.integer "timestamp", :null => false - t.string "server_url" - t.string "salt", :null => false - end - - create_table "open_source_projects", :force => true do |t| - t.string "name" - t.text "description" - t.integer "commit_count", :default => 0 - t.integer "code_line", :default => 0 - t.integer "users_count", :default => 0 - t.date "last_commit_time" - t.string "url" - t.date "date_collected" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "option_numbers", :force => true do |t| - t.integer "user_id" - t.integer "memo" - t.integer "messages_for_issues" - t.integer "issues_status" - t.integer "replay_for_message" - t.integer "replay_for_memo" - t.integer "follow" - t.integer "tread" - t.integer "praise_by_one" - t.integer "praise_by_two" - t.integer "praise_by_three" - t.integer "tread_by_one" - t.integer "tread_by_two" - t.integer "tread_by_three" - t.integer "changeset" - t.integer "document" - t.integer "attachment" - t.integer "issue_done_ratio" - t.integer "post_issue" - t.integer "score_type" - t.integer "total_score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "project_id" - end - - create_table "organizations", :force => true do |t| - t.string "name" - t.string "logo_link" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "phone_app_versions", :force => true do |t| - t.string "version" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_answers", :force => true do |t| - t.integer "poll_question_id" - t.text "answer_text" - t.integer "answer_position" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_questions", :force => true do |t| - t.string "question_title" - t.integer "question_type" - t.integer "is_necessary" - t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "question_number" - end - - create_table "poll_users", :force => true do |t| - t.integer "user_id" - t.integer "poll_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "poll_votes", :force => true do |t| - t.integer "user_id" - t.integer "poll_question_id" - t.integer "poll_answer_id" - t.text "vote_text" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "polls", :force => true do |t| - t.string "polls_name" - t.string "polls_type" - t.integer "polls_group_id" - t.integer "polls_status" - t.integer "user_id" - t.datetime "published_at" - t.datetime "closed_at" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "polls_description" - t.integer "show_result", :default => 1 - end - - create_table "praise_tread_caches", :force => true do |t| - t.integer "object_id", :null => false - t.string "object_type" - t.integer "praise_num" - t.integer "tread_num" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "praise_treads", :force => true do |t| - t.integer "user_id", :null => false - t.integer "praise_tread_object_id" - t.string "praise_tread_object_type" - t.integer "praise_or_tread" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "project_infos", :force => true do |t| - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "project_scores", :force => true do |t| - t.string "project_id" - t.integer "score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "issue_num", :default => 0 - t.integer "issue_journal_num", :default => 0 - t.integer "news_num", :default => 0 - t.integer "documents_num", :default => 0 - t.integer "changeset_num", :default => 0 - t.integer "board_message_num", :default => 0 - end - - create_table "project_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "project_id" - t.integer "project_type" - t.float "grade", :default => 0.0 - t.integer "course_ac_para", :default => 0 - end - - add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" - - create_table "projecting_softapplictions", :force => true do |t| - t.integer "user_id" - t.integer "softapplication_id" - t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "projects", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "description" - t.string "homepage", :default => "" - t.boolean "is_public", :default => true, :null => false - t.integer "parent_id" - t.datetime "created_on" - t.datetime "updated_on" - t.string "identifier" - t.integer "status", :default => 1, :null => false - t.integer "lft" - t.integer "rgt" - t.boolean "inherit_members", :default => false, :null => false - t.integer "project_type" - t.boolean "hidden_repo", :default => false, :null => false - t.integer "attachmenttype", :default => 1 - t.integer "user_id" - t.integer "dts_test", :default => 0 - t.string "enterprise_name" - t.integer "organization_id" - t.integer "project_new_type" - end - - add_index "projects", ["lft"], :name => "index_projects_on_lft" - add_index "projects", ["rgt"], :name => "index_projects_on_rgt" - - create_table "projects_trackers", :id => false, :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.integer "tracker_id", :default => 0, :null => false - end - - add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true - add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - - create_table "queries", :force => true do |t| - t.integer "project_id" - t.string "name", :default => "", :null => false - t.text "filters" - t.integer "user_id", :default => 0, :null => false - t.boolean "is_public", :default => false, :null => false - t.text "column_names" - t.text "sort_criteria" - t.string "group_by" - t.string "type" - end - - add_index "queries", ["project_id"], :name => "index_queries_on_project_id" - add_index "queries", ["user_id"], :name => "index_queries_on_user_id" - - create_table "relative_memo_to_open_source_projects", :force => true do |t| - t.integer "osp_id" - t.integer "relative_memo_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "relative_memos", :force => true do |t| - t.integer "osp_id" - t.integer "parent_id" - t.string "subject", :null => false - t.text "content", :limit => 16777215, :null => false - t.integer "author_id" - t.integer "replies_count", :default => 0 - t.integer "last_reply_id" - t.boolean "lock", :default => false - t.boolean "sticky", :default => false - t.boolean "is_quote", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "viewed_count_crawl", :default => 0 - t.integer "viewed_count_local", :default => 0 - t.string "url" - t.string "username" - t.string "userhomeurl" - t.date "date_collected" - t.string "topic_resource" - end - - create_table "repositories", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "url", :default => "", :null => false - t.string "login", :limit => 60, :default => "" - t.string "password", :default => "" - t.string "root_url", :default => "" - t.string "type" - t.string "path_encoding", :limit => 64 - t.string "log_encoding", :limit => 64 - t.text "extra_info" - t.string "identifier" - t.boolean "is_default", :default => false - t.boolean "hidden", :default => false - end - - add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" - - create_table "rich_rich_files", :force => true do |t| - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "rich_file_file_name" - t.string "rich_file_content_type" - t.integer "rich_file_file_size" - t.datetime "rich_file_updated_at" - t.string "owner_type" - t.integer "owner_id" - t.text "uri_cache" - t.string "simplified_type", :default => "file" - end - - create_table "roles", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "assignable", :default => true - t.integer "builtin", :default => 0, :null => false - t.text "permissions" - t.string "issues_visibility", :limit => 30, :default => "default", :null => false - end - - create_table "schools", :force => true do |t| - t.string "name" - t.string "province" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "logo_link" - end - - create_table "seems_rateable_cached_ratings", :force => true do |t| - t.integer "cacheable_id", :limit => 8 - t.string "cacheable_type" - t.float "avg", :null => false - t.integer "cnt", :null => false - t.string "dimension" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "seems_rateable_rates", :force => true do |t| - t.integer "rater_id", :limit => 8 - t.integer "rateable_id" - t.string "rateable_type" - t.float "stars", :null => false - t.string "dimension" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "is_teacher_score", :default => 0 - end - - create_table "settings", :force => true do |t| - t.string "name", :default => "", :null => false - t.text "value" - t.datetime "updated_on" - end - - add_index "settings", ["name"], :name => "index_settings_on_name" - - create_table "shares", :force => true do |t| - t.date "created_on" - t.string "url" - t.string "title" - t.integer "share_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "project_id" - t.integer "user_id" - t.string "description" - end - - create_table "softapplications", :force => true do |t| - t.string "name" - t.text "description" - t.integer "app_type_id" - t.string "app_type_name" - t.string "android_min_version_available" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "contest_id" - t.integer "softapplication_id" - t.integer "is_public" - t.string "application_developers" - t.string "deposit_project_url" - t.string "deposit_project" - t.integer "project_id" - end - - create_table "student_work_tests", :force => true do |t| - t.integer "student_work_id" - t.integer "homework_test_id" - t.integer "result" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "error_msg" - end - - create_table "student_works", :force => true do |t| - t.string "name" - t.text "description", :limit => 2147483647 - t.integer "homework_common_id" - t.integer "user_id" - t.float "final_score" - t.float "teacher_score" - t.float "student_score" - t.float "teaching_asistant_score" - t.integer "project_id", :default => 0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "late_penalty", :default => 0 - t.integer "absence_penalty", :default => 0 - t.integer "system_score" - end - - create_table "student_works_evaluation_distributions", :force => true do |t| - t.integer "student_work_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "student_works_scores", :force => true do |t| - t.integer "student_work_id" - t.integer "user_id" - t.integer "score" - t.text "comment" - t.integer "reviewer_role" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "students_for_courses", :force => true do |t| - t.integer "student_id" - t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" - add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" - - create_table "taggings", :force => true do |t| - t.integer "tag_id" - t.integer "taggable_id" - t.string "taggable_type" - t.integer "tagger_id" - t.string "tagger_type" - t.string "context", :limit => 128 - t.datetime "created_at" - end - - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" - add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" - add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type" - - create_table "tags", :force => true do |t| - t.string "name" - end - - create_table "teachers", :force => true do |t| - t.string "tea_name" - t.string "location" - t.integer "couurse_time" - t.integer "course_code" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "extra" - end - - create_table "time_entries", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - t.integer "issue_id" - t.float "hours", :null => false - t.string "comments" - t.integer "activity_id", :null => false - t.date "spent_on", :null => false - t.integer "tyear", :null => false - t.integer "tmonth", :null => false - t.integer "tweek", :null => false - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false - end - - add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id" - add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on" - add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id" - add_index "time_entries", ["project_id"], :name => "time_entries_project_id" - add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - - create_table "tokens", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.string "action", :limit => 30, :default => "", :null => false - t.string "value", :limit => 40, :default => "", :null => false - t.datetime "created_on", :null => false - end - - add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id" - add_index "tokens", ["value"], :name => "tokens_value", :unique => true - - create_table "trackers", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.boolean "is_in_chlog", :default => false, :null => false - t.integer "position", :default => 1 - t.boolean "is_in_roadmap", :default => true, :null => false - t.integer "fields_bits", :default => 0 - end - - create_table "user_activities", :force => true do |t| - t.string "act_type" - t.integer "act_id" - t.string "container_type" - t.integer "container_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_extensions", :force => true do |t| - t.integer "user_id", :null => false - t.date "birthday" - t.string "brief_introduction" - t.integer "gender" - t.string "location" - t.string "occupation" - t.integer "work_experience" - t.integer "zip_code" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "technical_title" - t.integer "identity" - t.string "student_id" - t.string "teacher_realname" - t.string "student_realname" - t.string "location_city" - t.integer "school_id" - t.string "description", :default => "" - end - - create_table "user_feedback_messages", :force => true do |t| - t.integer "user_id" - t.integer "journals_for_message_id" - t.string "journals_for_message_type" - t.integer "viewed" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_grades", :force => true do |t| - t.integer "user_id", :null => false - t.integer "project_id", :null => false - t.float "grade", :default => 0.0 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade" - add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id" - add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" - - create_table "user_levels", :force => true do |t| - t.integer "user_id" - t.integer "level" - end - - create_table "user_preferences", :force => true do |t| - t.integer "user_id", :default => 0, :null => false - t.text "others" - t.boolean "hide_mail", :default => false - t.string "time_zone" - end - - add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id" - - create_table "user_score_details", :force => true do |t| - t.integer "current_user_id" - t.integer "target_user_id" - t.string "score_type" - t.string "score_action" - t.integer "user_id" - t.integer "old_score" - t.integer "new_score" - t.integer "current_user_level" - t.integer "target_user_level" - t.integer "score_changeable_obj_id" - t.string "score_changeable_obj_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_scores", :force => true do |t| - t.integer "user_id", :null => false - t.integer "collaboration" - t.integer "influence" - t.integer "skill" - t.integer "active" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "user_statuses", :force => true do |t| - t.integer "changesets_count" - t.integer "watchers_count" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.float "grade", :default => 0.0 - end - - add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count" - add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" - add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" - - create_table "users", :force => true do |t| - t.string "login", :default => "", :null => false - t.string "hashed_password", :limit => 40, :default => "", :null => false - t.string "firstname", :limit => 30, :default => "", :null => false - t.string "lastname", :default => "", :null => false - t.string "mail", :limit => 60, :default => "", :null => false - t.boolean "admin", :default => false, :null => false - t.integer "status", :default => 1, :null => false - t.datetime "last_login_on" - t.string "language", :limit => 5, :default => "" - t.integer "auth_source_id" - t.datetime "created_on" - t.datetime "updated_on" - t.string "type" - t.string "identity_url" - t.string "mail_notification", :default => "", :null => false - t.string "salt", :limit => 64 - end - - add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" - add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" - add_index "users", ["type"], :name => "index_users_on_type" - - create_table "versions", :force => true do |t| - t.integer "project_id", :default => 0, :null => false - t.string "name", :default => "", :null => false - t.string "description", :default => "" - t.date "effective_date" - t.datetime "created_on" - t.datetime "updated_on" - t.string "wiki_page_title" - t.string "status", :default => "open" - t.string "sharing", :default => "none", :null => false - end - - add_index "versions", ["project_id"], :name => "versions_project_id" - add_index "versions", ["sharing"], :name => "index_versions_on_sharing" - - create_table "visitors", :force => true do |t| - t.integer "user_id" - t.integer "master_id" - t.datetime "updated_on" - t.datetime "created_on" - end - - add_index "visitors", ["master_id"], :name => "index_visitors_master_id" - add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" - add_index "visitors", ["user_id"], :name => "index_visitors_user_id" - - create_table "watchers", :force => true do |t| - t.string "watchable_type", :default => "", :null => false - t.integer "watchable_id", :default => 0, :null => false - t.integer "user_id" - end - - add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type" - add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id" - add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type" - - create_table "web_footer_companies", :force => true do |t| - t.string "name" - t.string "logo_size" - t.string "url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "web_footer_oranizers", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "wiki_content_versions", :force => true do |t| - t.integer "wiki_content_id", :null => false - t.integer "page_id", :null => false - t.integer "author_id" - t.binary "data", :limit => 2147483647 - t.string "compression", :limit => 6, :default => "" - t.string "comments", :default => "" - t.datetime "updated_on", :null => false - t.integer "version", :null => false - end - - add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on" - add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid" - - create_table "wiki_contents", :force => true do |t| - t.integer "page_id", :null => false - t.integer "author_id" - t.text "text", :limit => 2147483647 - t.string "comments", :default => "" - t.datetime "updated_on", :null => false - t.integer "version", :null => false - end - - add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id" - add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id" - - create_table "wiki_pages", :force => true do |t| - t.integer "wiki_id", :null => false - t.string "title", :null => false - t.datetime "created_on", :null => false - t.boolean "protected", :default => false, :null => false - t.integer "parent_id" - end - - add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id" - add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title" - add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id" - - create_table "wiki_redirects", :force => true do |t| - t.integer "wiki_id", :null => false - t.string "title" - t.string "redirects_to" - t.datetime "created_on", :null => false - end - - add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title" - add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id" - - create_table "wikis", :force => true do |t| - t.integer "project_id", :null => false - t.string "start_page", :null => false - t.integer "status", :default => 1, :null => false - end - - add_index "wikis", ["project_id"], :name => "wikis_project_id" - - create_table "workflows", :force => true do |t| - t.integer "tracker_id", :default => 0, :null => false - t.integer "old_status_id", :default => 0, :null => false - t.integer "new_status_id", :default => 0, :null => false - t.integer "role_id", :default => 0, :null => false - t.boolean "assignee", :default => false, :null => false - t.boolean "author", :default => false, :null => false - t.string "type", :limit => 30 - t.string "field_name", :limit => 30 - t.string "rule", :limit => 30 - end - - add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id" - add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id" - add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" - add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" - - create_table "works_categories", :force => true do |t| - t.string "category" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "zip_packs", :force => true do |t| - t.integer "user_id" - t.integer "homework_id" - t.string "file_digest" - t.string "file_path" - t.integer "pack_times", :default => 1 - t.integer "pack_size", :default => 0 - t.text "file_digests" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20150826061843) do + + create_table "activities", :force => true do |t| + t.integer "act_id", :null => false + t.string "act_type", :null => false + t.integer "user_id", :null => false + t.integer "activity_container_id" + t.string "activity_container_type", :default => "" + t.datetime "created_at" + end + + add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type" + add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type" + add_index "activities", ["user_id"], :name => "index_activities_on_user_id" + + create_table "activity_notifies", :force => true do |t| + t.integer "activity_container_id" + t.string "activity_container_type" + t.integer "activity_id" + t.string "activity_type" + t.integer "notify_to" + t.datetime "created_on" + t.integer "is_read" + end + + add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id" + add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" + add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" + + create_table "api_keys", :force => true do |t| + t.string "access_token" + t.datetime "expires_at" + t.integer "user_id" + t.boolean "active", :default => true + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" + add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" + + create_table "applied_projects", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + end + + create_table "apply_project_masters", :force => true do |t| + t.integer "user_id" + t.string "apply_type" + t.integer "apply_id" + t.integer "status" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "attachments", :force => true do |t| + t.integer "container_id" + t.string "container_type", :limit => 30 + t.string "filename", :default => "", :null => false + t.string "disk_filename", :default => "", :null => false + t.integer "filesize", :default => 0, :null => false + t.string "content_type", :default => "" + t.string "digest", :limit => 40, :default => "", :null => false + t.integer "downloads", :default => 0, :null => false + t.integer "author_id", :default => 0, :null => false + t.datetime "created_on" + t.string "description" + t.string "disk_directory" + t.integer "attachtype", :default => 1 + t.integer "is_public", :default => 1 + t.integer "copy_from" + t.integer "quotes" + end + + add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" + add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type" + add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on" + + create_table "attachmentstypes", :force => true do |t| + t.integer "typeId", :null => false + t.string "typeName", :limit => 50 + end + + create_table "auth_sources", :force => true do |t| + t.string "type", :limit => 30, :default => "", :null => false + t.string "name", :limit => 60, :default => "", :null => false + t.string "host", :limit => 60 + t.integer "port" + t.string "account" + t.string "account_password", :default => "" + t.string "base_dn" + t.string "attr_login", :limit => 30 + t.string "attr_firstname", :limit => 30 + t.string "attr_lastname", :limit => 30 + t.string "attr_mail", :limit => 30 + t.boolean "onthefly_register", :default => false, :null => false + t.boolean "tls", :default => false, :null => false + t.string "filter" + t.integer "timeout" + end + + add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type" + + create_table "biding_projects", :force => true do |t| + t.integer "project_id" + t.integer "bid_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "bids", :force => true do |t| + t.string "name" + t.string "budget", :null => false + t.integer "author_id" + t.date "deadline" + t.text "description" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.integer "commit" + t.integer "reward_type" + t.integer "homework_type" + t.integer "parent_id" + t.string "password" + t.integer "is_evaluation" + t.integer "proportion", :default => 60 + t.integer "comment_status", :default => 0 + t.integer "evaluation_num", :default => 3 + t.integer "open_anonymous_evaluation", :default => 1 + end + + create_table "boards", :force => true do |t| + t.integer "project_id", :null => false + t.string "name", :default => "", :null => false + t.string "description" + t.integer "position", :default => 1 + t.integer "topics_count", :default => 0, :null => false + t.integer "messages_count", :default => 0, :null => false + t.integer "last_message_id" + t.integer "parent_id" + t.integer "course_id" + end + + add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" + add_index "boards", ["project_id"], :name => "boards_project_id" + + create_table "bug_to_osps", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "changes", :force => true do |t| + t.integer "changeset_id", :null => false + t.string "action", :limit => 1, :default => "", :null => false + t.text "path", :null => false + t.text "from_path" + t.string "from_revision" + t.string "revision" + t.string "branch" + end + + add_index "changes", ["changeset_id"], :name => "changesets_changeset_id" + + create_table "changeset_parents", :id => false, :force => true do |t| + t.integer "changeset_id", :null => false + t.integer "parent_id", :null => false + end + + add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids" + add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" + + create_table "changesets", :force => true do |t| + t.integer "repository_id", :null => false + t.string "revision", :null => false + t.string "committer" + t.datetime "committed_on", :null => false + t.text "comments" + t.date "commit_date" + t.string "scmid" + t.integer "user_id" + end + + add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" + add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true + add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid" + add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id" + add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id" + + create_table "changesets_issues", :id => false, :force => true do |t| + t.integer "changeset_id", :null => false + t.integer "issue_id", :null => false + end + + add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true + + create_table "code_review_assignments", :force => true do |t| + t.integer "issue_id" + t.integer "change_id" + t.integer "attachment_id" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.string "action_type" + t.integer "changeset_id" + end + + create_table "code_review_project_settings", :force => true do |t| + t.integer "project_id" + t.integer "tracker_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "updated_by" + t.boolean "hide_code_review_tab", :default => false + t.integer "auto_relation", :default => 1 + t.integer "assignment_tracker_id" + t.text "auto_assign" + t.integer "lock_version", :default => 0, :null => false + t.boolean "tracker_in_review_dialog", :default => false + end + + create_table "code_review_user_settings", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "mail_notification", :default => 0, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "code_reviews", :force => true do |t| + t.integer "project_id" + t.integer "change_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "line" + t.integer "updated_by_id" + t.integer "lock_version", :default => 0, :null => false + t.integer "status_changed_from" + t.integer "status_changed_to" + t.integer "issue_id" + t.string "action_type" + t.string "file_path" + t.string "rev" + t.string "rev_to" + t.integer "attachment_id" + t.integer "file_count", :default => 0, :null => false + t.boolean "diff_all" + end + + create_table "comments", :force => true do |t| + t.string "commented_type", :limit => 30, :default => "", :null => false + t.integer "commented_id", :default => 0, :null => false + t.integer "author_id", :default => 0, :null => false + t.text "comments" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + add_index "comments", ["author_id"], :name => "index_comments_on_author_id" + add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type" + + create_table "contest_notifications", :force => true do |t| + t.text "title" + t.text "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "contesting_projects", :force => true do |t| + t.integer "project_id" + t.string "contest_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "contesting_softapplications", :force => true do |t| + t.integer "softapplication_id" + t.integer "contest_id" + t.integer "user_id" + t.string "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + end + + create_table "contestnotifications", :force => true do |t| + t.integer "contest_id" + t.string "title" + t.string "summary" + t.text "description" + t.integer "author_id" + t.integer "notificationcomments_count" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "contests", :force => true do |t| + t.string "name" + t.string "budget", :default => "" + t.integer "author_id" + t.date "deadline" + t.string "description" + t.integer "commit" + t.string "password" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + create_table "course_activities", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "course_act_id" + t.string "course_act_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_attachments", :force => true do |t| + t.string "filename" + t.string "disk_filename" + t.integer "filesize" + t.string "content_type" + t.string "digest" + t.integer "downloads" + t.string "author_id" + t.string "integer" + t.string "description" + t.string "disk_directory" + t.integer "attachtype" + t.integer "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "container_id", :default => 0 + end + + create_table "course_groups", :force => true do |t| + t.string "name" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_infos", :force => true do |t| + t.integer "course_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "course_messages", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "course_message_id" + t.string "course_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "content" + t.integer "status" + end + + create_table "course_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "course_id" + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "courses", :force => true do |t| + t.integer "tea_id" + t.string "name" + t.integer "state" + t.string "code" + t.integer "time" + t.string "extra" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "location" + t.string "term" + t.string "string" + t.string "password" + t.string "setup_time" + t.string "endup_time" + t.string "class_period" + t.integer "school_id" + t.text "description" + t.integer "status", :default => 1 + t.integer "attachmenttype", :default => 2 + t.integer "lft" + t.integer "rgt" + t.integer "is_public", :limit => 1, :default => 1 + t.integer "inherit_members", :limit => 1, :default => 1 + t.integer "open_student", :default => 0 + end + + create_table "custom_fields", :force => true do |t| + t.string "type", :limit => 30, :default => "", :null => false + t.string "name", :limit => 30, :default => "", :null => false + t.string "field_format", :limit => 30, :default => "", :null => false + t.text "possible_values" + t.string "regexp", :default => "" + t.integer "min_length", :default => 0, :null => false + t.integer "max_length", :default => 0, :null => false + t.boolean "is_required", :default => false, :null => false + t.boolean "is_for_all", :default => false, :null => false + t.boolean "is_filter", :default => false, :null => false + t.integer "position", :default => 1 + t.boolean "searchable", :default => false + t.text "default_value" + t.boolean "editable", :default => true + t.boolean "visible", :default => true, :null => false + t.boolean "multiple", :default => false + end + + add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type" + + create_table "custom_fields_projects", :id => false, :force => true do |t| + t.integer "custom_field_id", :default => 0, :null => false + t.integer "project_id", :default => 0, :null => false + end + + add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true + + create_table "custom_fields_trackers", :id => false, :force => true do |t| + t.integer "custom_field_id", :default => 0, :null => false + t.integer "tracker_id", :default => 0, :null => false + end + + add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true + + create_table "custom_values", :force => true do |t| + t.string "customized_type", :limit => 30, :default => "", :null => false + t.integer "customized_id", :default => 0, :null => false + t.integer "custom_field_id", :default => 0, :null => false + t.text "value" + end + + add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" + add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" + + create_table "delayed_jobs", :force => true do |t| + t.integer "priority", :default => 0, :null => false + t.integer "attempts", :default => 0, :null => false + t.text "handler", :null => false + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + + create_table "discuss_demos", :force => true do |t| + t.string "title" + t.text "body" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "documents", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.integer "category_id", :default => 0, :null => false + t.string "title", :limit => 60, :default => "", :null => false + t.text "description" + t.datetime "created_on" + t.integer "user_id", :default => 0 + t.integer "is_public", :default => 1 + end + + add_index "documents", ["category_id"], :name => "index_documents_on_category_id" + add_index "documents", ["created_on"], :name => "index_documents_on_created_on" + add_index "documents", ["project_id"], :name => "documents_project_id" + + create_table "dts", :force => true do |t| + t.string "IPLineCode" + t.string "Description" + 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", :null => false + t.datetime "updated_at", :null => false + end + + create_table "enabled_modules", :force => true do |t| + t.integer "project_id" + t.string "name", :null => false + t.integer "course_id" + end + + add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id" + + create_table "enumerations", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "is_default", :default => false, :null => false + t.string "type" + t.boolean "active", :default => true, :null => false + t.integer "project_id" + t.integer "parent_id" + t.string "position_name", :limit => 30 + end + + add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" + add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + + create_table "first_pages", :force => true do |t| + t.string "web_title" + t.string "title" + t.text "description" + t.string "page_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sort_type" + t.integer "image_width", :default => 107 + t.integer "image_height", :default => 63 + t.integer "show_course", :default => 1 + t.integer "show_contest", :default => 1 + end + + create_table "forge_activities", :force => true do |t| + t.integer "user_id" + t.integer "project_id" + t.integer "forge_act_id" + t.string "forge_act_type" + t.integer "org_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" + + create_table "forge_messages", :force => true do |t| + t.integer "user_id" + t.integer "project_id" + t.integer "forge_message_id" + t.string "forge_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "forums", :force => true do |t| + t.string "name", :null => false + t.text "description" + t.integer "topic_count", :default => 0 + t.integer "memo_count", :default => 0 + t.integer "last_memo_id", :default => 0 + t.integer "creator_id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sticky" + t.integer "locked" + end + + create_table "groups_users", :id => false, :force => true do |t| + t.integer "group_id", :null => false + t.integer "user_id", :null => false + end + + add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true + + create_table "homework_attaches", :force => true do |t| + t.integer "bid_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "reward" + t.string "name" + t.text "description" + t.integer "state" + t.integer "project_id", :default => 0 + t.float "score", :default => 0.0 + t.integer "is_teacher_score", :default => 0 + end + + add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" + + create_table "homework_commons", :force => true do |t| + t.string "name" + t.integer "user_id" + t.text "description" + t.date "publish_time" + t.date "end_time" + t.integer "homework_type", :default => 1 + t.string "late_penalty" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_detail_manuals", :force => true do |t| + t.float "ta_proportion" + t.integer "comment_status" + t.date "evaluation_start" + t.date "evaluation_end" + t.integer "evaluation_num" + t.integer "absence_penalty", :default => 1 + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_detail_programings", :force => true do |t| + t.string "language" + t.text "standard_code", :limit => 2147483647 + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.float "ta_proportion", :default => 0.1 + t.integer "question_id" + end + + create_table "homework_evaluations", :force => true do |t| + t.string "user_id" + t.string "homework_attach_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "homework_for_courses", :force => true do |t| + t.integer "course_id" + t.integer "bid_id" + end + + add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" + add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" + + create_table "homework_tests", :force => true do |t| + t.text "input" + t.text "output" + t.integer "homework_common_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "result" + t.text "error_msg" + end + + create_table "homework_users", :force => true do |t| + t.string "homework_attach_id" + t.string "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "invite_lists", :force => true do |t| + t.integer "project_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "issue_categories", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "name", :limit => 30, :default => "", :null => false + t.integer "assigned_to_id" + end + + add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id" + add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id" + + create_table "issue_relations", :force => true do |t| + t.integer "issue_from_id", :null => false + t.integer "issue_to_id", :null => false + t.string "relation_type", :default => "", :null => false + t.integer "delay" + end + + add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true + add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id" + add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id" + + create_table "issue_statuses", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.boolean "is_closed", :default => false, :null => false + t.boolean "is_default", :default => false, :null => false + t.integer "position", :default => 1 + t.integer "default_done_ratio" + end + + add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed" + add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default" + add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position" + + create_table "issues", :force => true do |t| + t.integer "tracker_id", :null => false + t.integer "project_id", :null => false + t.string "subject", :default => "", :null => false + t.text "description" + t.date "due_date" + t.integer "category_id" + t.integer "status_id", :null => false + t.integer "assigned_to_id" + t.integer "priority_id", :null => false + t.integer "fixed_version_id" + t.integer "author_id", :null => false + t.integer "lock_version", :default => 0, :null => false + t.datetime "created_on" + t.datetime "updated_on" + t.date "start_date" + t.integer "done_ratio", :default => 0, :null => false + t.float "estimated_hours" + t.integer "parent_id" + t.integer "root_id" + t.integer "lft" + t.integer "rgt" + t.boolean "is_private", :default => false, :null => false + t.datetime "closed_on" + t.integer "project_issues_index" + end + + add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id" + add_index "issues", ["author_id"], :name => "index_issues_on_author_id" + add_index "issues", ["category_id"], :name => "index_issues_on_category_id" + add_index "issues", ["created_on"], :name => "index_issues_on_created_on" + add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id" + add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id" + add_index "issues", ["project_id"], :name => "issues_project_id" + add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt" + add_index "issues", ["status_id"], :name => "index_issues_on_status_id" + add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id" + + create_table "join_in_competitions", :force => true do |t| + t.integer "user_id" + t.integer "competition_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "join_in_contests", :force => true do |t| + t.integer "user_id" + t.integer "bid_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "journal_details", :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", ["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" + t.integer "reply_id" + end + + add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id" + add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id" + add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id" + + create_table "journals", :force => true do |t| + t.integer "journalized_id", :default => 0, :null => false + t.string "journalized_type", :limit => 30, :default => "", :null => false + t.integer "user_id", :default => 0, :null => false + t.text "notes" + t.datetime "created_on", :null => false + t.boolean "private_notes", :default => false, :null => false + end + + add_index "journals", ["created_on"], :name => "index_journals_on_created_on" + add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id" + add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id" + add_index "journals", ["user_id"], :name => "index_journals_on_user_id" + + create_table "journals_for_messages", :force => true do |t| + t.integer "jour_id" + t.string "jour_type" + t.integer "user_id" + t.text "notes" + t.integer "status" + t.integer "reply_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.string "m_parent_id" + t.boolean "is_readed" + t.integer "m_reply_count" + t.integer "m_reply_id" + t.integer "is_comprehensive_evaluation" + end + + create_table "kindeditor_assets", :force => true do |t| + t.string "asset" + t.integer "file_size" + t.string "file_type" + t.integer "owner_id" + t.string "asset_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "owner_type", :default => 0 + end + + create_table "member_roles", :force => true do |t| + t.integer "member_id", :null => false + t.integer "role_id", :null => false + t.integer "inherited_from" + end + + add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id" + add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id" + + create_table "members", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.integer "project_id", :default => 0 + t.datetime "created_on" + t.boolean "mail_notification", :default => false, :null => false + t.integer "course_id", :default => -1 + t.integer "course_group_id", :default => 0 + end + + add_index "members", ["project_id"], :name => "index_members_on_project_id" + add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true + add_index "members", ["user_id"], :name => "index_members_on_user_id" + + create_table "memo_messages", :force => true do |t| + t.integer "user_id" + t.integer "forum_id" + t.integer "memo_id" + t.string "memo_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "memos", :force => true do |t| + t.integer "forum_id", :null => false + t.integer "parent_id" + t.string "subject", :null => false + t.text "content", :null => false + t.integer "author_id", :null => false + t.integer "replies_count", :default => 0 + t.integer "last_reply_id" + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count", :default => 0 + end + + create_table "message_alls", :force => true do |t| + t.integer "user_id" + t.integer "message_id" + t.string "message_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "messages", :force => true do |t| + t.integer "board_id", :null => false + t.integer "parent_id" + t.string "subject", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "replies_count", :default => 0, :null => false + t.integer "last_reply_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + end + + add_index "messages", ["author_id"], :name => "index_messages_on_author_id" + add_index "messages", ["board_id"], :name => "messages_board_id" + add_index "messages", ["created_on"], :name => "index_messages_on_created_on" + add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" + add_index "messages", ["parent_id"], :name => "messages_parent_id" + + create_table "news", :force => true do |t| + t.integer "project_id" + t.string "title", :limit => 60, :default => "", :null => false + t.string "summary", :default => "" + t.text "description" + t.integer "author_id", :default => 0, :null => false + t.datetime "created_on" + t.integer "comments_count", :default => 0, :null => false + t.integer "course_id" + t.datetime "updated_on" + end + + add_index "news", ["author_id"], :name => "index_news_on_author_id" + add_index "news", ["created_on"], :name => "index_news_on_created_on" + add_index "news", ["project_id"], :name => "news_project_id" + + create_table "no_uses", :force => true do |t| + t.integer "user_id", :null => false + t.string "no_use_type" + t.integer "no_use_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "notificationcomments", :force => true do |t| + t.string "notificationcommented_type" + t.integer "notificationcommented_id" + t.integer "author_id" + t.text "notificationcomments" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "open_id_authentication_associations", :force => true do |t| + t.integer "issued" + t.integer "lifetime" + t.string "handle" + t.string "assoc_type" + t.binary "server_url" + t.binary "secret" + end + + create_table "open_id_authentication_nonces", :force => true do |t| + t.integer "timestamp", :null => false + t.string "server_url" + t.string "salt", :null => false + end + + create_table "open_source_projects", :force => true do |t| + t.string "name" + t.text "description" + t.integer "commit_count", :default => 0 + t.integer "code_line", :default => 0 + t.integer "users_count", :default => 0 + t.date "last_commit_time" + t.string "url" + t.date "date_collected" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "option_numbers", :force => true do |t| + t.integer "user_id" + t.integer "memo" + t.integer "messages_for_issues" + t.integer "issues_status" + t.integer "replay_for_message" + t.integer "replay_for_memo" + t.integer "follow" + t.integer "tread" + t.integer "praise_by_one" + t.integer "praise_by_two" + t.integer "praise_by_three" + t.integer "tread_by_one" + t.integer "tread_by_two" + t.integer "tread_by_three" + t.integer "changeset" + t.integer "document" + t.integer "attachment" + t.integer "issue_done_ratio" + t.integer "post_issue" + t.integer "score_type" + t.integer "total_score" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "project_id" + end + + create_table "organizations", :force => true do |t| + t.string "name" + t.string "logo_link" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "phone_app_versions", :force => true do |t| + t.string "version" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_answers", :force => true do |t| + t.integer "poll_question_id" + t.text "answer_text" + t.integer "answer_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "is_necessary" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "question_number" + end + + create_table "poll_users", :force => true do |t| + t.integer "user_id" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_votes", :force => true do |t| + t.integer "user_id" + t.integer "poll_question_id" + t.integer "poll_answer_id" + t.text "vote_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "polls", :force => true do |t| + t.string "polls_name" + t.string "polls_type" + t.integer "polls_group_id" + t.integer "polls_status" + t.integer "user_id" + t.datetime "published_at" + t.datetime "closed_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "polls_description" + t.integer "show_result", :default => 1 + end + + create_table "praise_tread_caches", :force => true do |t| + t.integer "object_id", :null => false + t.string "object_type" + t.integer "praise_num" + t.integer "tread_num" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "praise_treads", :force => true do |t| + t.integer "user_id", :null => false + t.integer "praise_tread_object_id" + t.string "praise_tread_object_type" + t.integer "praise_or_tread" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "project_infos", :force => true do |t| + t.integer "project_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "project_scores", :force => true do |t| + t.string "project_id" + t.integer "score" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "issue_num", :default => 0 + t.integer "issue_journal_num", :default => 0 + t.integer "news_num", :default => 0 + t.integer "documents_num", :default => 0 + t.integer "changeset_num", :default => 0 + t.integer "board_message_num", :default => 0 + end + + create_table "project_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "project_id" + t.integer "project_type" + t.float "grade", :default => 0.0 + t.integer "course_ac_para", :default => 0 + end + + add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade" + + create_table "projecting_softapplictions", :force => true do |t| + t.integer "user_id" + t.integer "softapplication_id" + t.integer "project_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "projects", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.string "homepage", :default => "" + t.boolean "is_public", :default => true, :null => false + t.integer "parent_id" + t.datetime "created_on" + t.datetime "updated_on" + t.string "identifier" + t.integer "status", :default => 1, :null => false + t.integer "lft" + t.integer "rgt" + t.boolean "inherit_members", :default => false, :null => false + t.integer "project_type" + t.boolean "hidden_repo", :default => false, :null => false + t.integer "attachmenttype", :default => 1 + t.integer "user_id" + t.integer "dts_test", :default => 0 + t.string "enterprise_name" + t.integer "organization_id" + t.integer "project_new_type" + end + + add_index "projects", ["lft"], :name => "index_projects_on_lft" + add_index "projects", ["rgt"], :name => "index_projects_on_rgt" + + create_table "projects_trackers", :id => false, :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.integer "tracker_id", :default => 0, :null => false + end + + add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true + add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" + + create_table "queries", :force => true do |t| + t.integer "project_id" + t.string "name", :default => "", :null => false + t.text "filters" + t.integer "user_id", :default => 0, :null => false + t.boolean "is_public", :default => false, :null => false + t.text "column_names" + t.text "sort_criteria" + t.string "group_by" + t.string "type" + end + + add_index "queries", ["project_id"], :name => "index_queries_on_project_id" + add_index "queries", ["user_id"], :name => "index_queries_on_user_id" + + create_table "relative_memo_to_open_source_projects", :force => true do |t| + t.integer "osp_id" + t.integer "relative_memo_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "relative_memos", :force => true do |t| + t.integer "osp_id" + t.integer "parent_id" + t.string "subject", :null => false + t.text "content", :limit => 16777215, :null => false + t.integer "author_id" + t.integer "replies_count", :default => 0 + t.integer "last_reply_id" + t.boolean "lock", :default => false + t.boolean "sticky", :default => false + t.boolean "is_quote", :default => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "viewed_count_crawl", :default => 0 + t.integer "viewed_count_local", :default => 0 + t.string "url" + t.string "username" + t.string "userhomeurl" + t.date "date_collected" + t.string "topic_resource" + end + + create_table "repositories", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "url", :default => "", :null => false + t.string "login", :limit => 60, :default => "" + t.string "password", :default => "" + t.string "root_url", :default => "" + t.string "type" + t.string "path_encoding", :limit => 64 + t.string "log_encoding", :limit => 64 + t.text "extra_info" + t.string "identifier" + t.boolean "is_default", :default => false + t.boolean "hidden", :default => false + end + + add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id" + + create_table "rich_rich_files", :force => true do |t| + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "rich_file_file_name" + t.string "rich_file_content_type" + t.integer "rich_file_file_size" + t.datetime "rich_file_updated_at" + t.string "owner_type" + t.integer "owner_id" + t.text "uri_cache" + t.string "simplified_type", :default => "file" + end + + create_table "roles", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "assignable", :default => true + t.integer "builtin", :default => 0, :null => false + t.text "permissions" + t.string "issues_visibility", :limit => 30, :default => "default", :null => false + end + + create_table "schools", :force => true do |t| + t.string "name" + t.string "province" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "logo_link" + end + + create_table "seems_rateable_cached_ratings", :force => true do |t| + t.integer "cacheable_id", :limit => 8 + t.string "cacheable_type" + t.float "avg", :null => false + t.integer "cnt", :null => false + t.string "dimension" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "seems_rateable_rates", :force => true do |t| + t.integer "rater_id", :limit => 8 + t.integer "rateable_id" + t.string "rateable_type" + t.float "stars", :null => false + t.string "dimension" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "is_teacher_score", :default => 0 + end + + create_table "settings", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "value" + t.datetime "updated_on" + end + + add_index "settings", ["name"], :name => "index_settings_on_name" + + create_table "shares", :force => true do |t| + t.date "created_on" + t.string "url" + t.string "title" + t.integer "share_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "project_id" + t.integer "user_id" + t.string "description" + end + + create_table "softapplications", :force => true do |t| + t.string "name" + t.text "description" + t.integer "app_type_id" + t.string "app_type_name" + t.string "android_min_version_available" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "contest_id" + t.integer "softapplication_id" + t.integer "is_public" + t.string "application_developers" + t.string "deposit_project_url" + t.string "deposit_project" + t.integer "project_id" + end + + create_table "student_work_tests", :force => true do |t| + t.integer "student_work_id" + t.integer "homework_test_id" + t.integer "result" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "error_msg" + end + + create_table "student_works", :force => true do |t| + t.string "name" + t.text "description", :limit => 2147483647 + t.integer "homework_common_id" + t.integer "user_id" + t.float "final_score" + t.float "teacher_score" + t.float "student_score" + t.float "teaching_asistant_score" + t.integer "project_id", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "late_penalty", :default => 0 + t.integer "absence_penalty", :default => 0 + t.integer "system_score" + end + + create_table "student_works_evaluation_distributions", :force => true do |t| + t.integer "student_work_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "student_works_scores", :force => true do |t| + t.integer "student_work_id" + t.integer "user_id" + t.integer "score" + t.text "comment" + t.integer "reviewer_role" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "students_for_courses", :force => true do |t| + t.integer "student_id" + t.integer "course_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" + add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" + + create_table "taggings", :force => true do |t| + t.integer "tag_id" + t.integer "taggable_id" + t.string "taggable_type" + t.integer "tagger_id" + t.string "tagger_type" + t.string "context", :limit => 128 + t.datetime "created_at" + end + + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" + add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" + add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type" + + create_table "tags", :force => true do |t| + t.string "name" + end + + create_table "teachers", :force => true do |t| + t.string "tea_name" + t.string "location" + t.integer "couurse_time" + t.integer "course_code" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "extra" + end + + create_table "time_entries", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + t.integer "issue_id" + t.float "hours", :null => false + t.string "comments" + t.integer "activity_id", :null => false + t.date "spent_on", :null => false + t.integer "tyear", :null => false + t.integer "tmonth", :null => false + t.integer "tweek", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + end + + add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id" + add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on" + add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id" + add_index "time_entries", ["project_id"], :name => "time_entries_project_id" + add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" + + create_table "tokens", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.string "action", :limit => 30, :default => "", :null => false + t.string "value", :limit => 40, :default => "", :null => false + t.datetime "created_on", :null => false + end + + add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id" + add_index "tokens", ["value"], :name => "tokens_value", :unique => true + + create_table "trackers", :force => true do |t| + t.string "name", :limit => 30, :default => "", :null => false + t.boolean "is_in_chlog", :default => false, :null => false + t.integer "position", :default => 1 + t.boolean "is_in_roadmap", :default => true, :null => false + t.integer "fields_bits", :default => 0 + end + + create_table "user_activities", :force => true do |t| + t.string "act_type" + t.integer "act_id" + t.string "container_type" + t.integer "container_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_extensions", :force => true do |t| + t.integer "user_id", :null => false + t.date "birthday" + t.string "brief_introduction" + t.integer "gender" + t.string "location" + t.string "occupation" + t.integer "work_experience" + t.integer "zip_code" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "technical_title" + t.integer "identity" + t.string "student_id" + t.string "teacher_realname" + t.string "student_realname" + t.string "location_city" + t.integer "school_id" + t.string "description", :default => "" + end + + create_table "user_feedback_messages", :force => true do |t| + t.integer "user_id" + t.integer "journals_for_message_id" + t.string "journals_for_message_type" + t.integer "viewed" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_grades", :force => true do |t| + t.integer "user_id", :null => false + t.integer "project_id", :null => false + t.float "grade", :default => 0.0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade" + add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id" + add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id" + + create_table "user_levels", :force => true do |t| + t.integer "user_id" + t.integer "level" + end + + create_table "user_preferences", :force => true do |t| + t.integer "user_id", :default => 0, :null => false + t.text "others" + t.boolean "hide_mail", :default => false + t.string "time_zone" + end + + add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id" + + create_table "user_score_details", :force => true do |t| + t.integer "current_user_id" + t.integer "target_user_id" + t.string "score_type" + t.string "score_action" + t.integer "user_id" + t.integer "old_score" + t.integer "new_score" + t.integer "current_user_level" + t.integer "target_user_level" + t.integer "score_changeable_obj_id" + t.string "score_changeable_obj_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_scores", :force => true do |t| + t.integer "user_id", :null => false + t.integer "collaboration" + t.integer "influence" + t.integer "skill" + t.integer "active" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "user_statuses", :force => true do |t| + t.integer "changesets_count" + t.integer "watchers_count" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.float "grade", :default => 0.0 + end + + add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count" + add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" + add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" + + create_table "users", :force => true do |t| + t.string "login", :default => "", :null => false + t.string "hashed_password", :limit => 40, :default => "", :null => false + t.string "firstname", :limit => 30, :default => "", :null => false + t.string "lastname", :default => "", :null => false + t.string "mail", :limit => 60, :default => "", :null => false + t.boolean "admin", :default => false, :null => false + t.integer "status", :default => 1, :null => false + t.datetime "last_login_on" + t.string "language", :limit => 5, :default => "" + t.integer "auth_source_id" + t.datetime "created_on" + t.datetime "updated_on" + t.string "type" + t.string "identity_url" + t.string "mail_notification", :default => "", :null => false + t.string "salt", :limit => 64 + end + + add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" + add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" + add_index "users", ["type"], :name => "index_users_on_type" + + create_table "versions", :force => true do |t| + t.integer "project_id", :default => 0, :null => false + t.string "name", :default => "", :null => false + t.string "description", :default => "" + t.date "effective_date" + t.datetime "created_on" + t.datetime "updated_on" + t.string "wiki_page_title" + t.string "status", :default => "open" + t.string "sharing", :default => "none", :null => false + end + + add_index "versions", ["project_id"], :name => "versions_project_id" + add_index "versions", ["sharing"], :name => "index_versions_on_sharing" + + create_table "visitors", :force => true do |t| + t.integer "user_id" + t.integer "master_id" + t.datetime "updated_on" + t.datetime "created_on" + end + + add_index "visitors", ["master_id"], :name => "index_visitors_master_id" + add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on" + add_index "visitors", ["user_id"], :name => "index_visitors_user_id" + + create_table "watchers", :force => true do |t| + t.string "watchable_type", :default => "", :null => false + t.integer "watchable_id", :default => 0, :null => false + t.integer "user_id" + end + + add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type" + add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id" + add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type" + + create_table "web_footer_companies", :force => true do |t| + t.string "name" + t.string "logo_size" + t.string "url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "web_footer_oranizers", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "wiki_content_versions", :force => true do |t| + t.integer "wiki_content_id", :null => false + t.integer "page_id", :null => false + t.integer "author_id" + t.binary "data", :limit => 2147483647 + t.string "compression", :limit => 6, :default => "" + t.string "comments", :default => "" + t.datetime "updated_on", :null => false + t.integer "version", :null => false + end + + add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on" + add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid" + + create_table "wiki_contents", :force => true do |t| + t.integer "page_id", :null => false + t.integer "author_id" + t.text "text", :limit => 2147483647 + t.string "comments", :default => "" + t.datetime "updated_on", :null => false + t.integer "version", :null => false + end + + add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id" + add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id" + + create_table "wiki_pages", :force => true do |t| + t.integer "wiki_id", :null => false + t.string "title", :null => false + t.datetime "created_on", :null => false + t.boolean "protected", :default => false, :null => false + t.integer "parent_id" + end + + add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id" + add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title" + add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id" + + create_table "wiki_redirects", :force => true do |t| + t.integer "wiki_id", :null => false + t.string "title" + t.string "redirects_to" + t.datetime "created_on", :null => false + end + + add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title" + add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id" + + create_table "wikis", :force => true do |t| + t.integer "project_id", :null => false + t.string "start_page", :null => false + t.integer "status", :default => 1, :null => false + end + + add_index "wikis", ["project_id"], :name => "wikis_project_id" + + create_table "workflows", :force => true do |t| + t.integer "tracker_id", :default => 0, :null => false + t.integer "old_status_id", :default => 0, :null => false + t.integer "new_status_id", :default => 0, :null => false + t.integer "role_id", :default => 0, :null => false + t.boolean "assignee", :default => false, :null => false + t.boolean "author", :default => false, :null => false + t.string "type", :limit => 30 + t.string "field_name", :limit => 30 + t.string "rule", :limit => 30 + end + + add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id" + add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id" + add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" + add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" + + create_table "works_categories", :force => true do |t| + t.string "category" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "zip_packs", :force => true do |t| + t.integer "user_id" + t.integer "homework_id" + t.string "file_digest" + t.string "file_path" + t.integer "pack_times", :default => 1 + t.integer "pack_size", :default => 0 + t.text "file_digests" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png index 1e0d2335789914b5536894c8ada1b7ac386d7084..3df72965e861062e8982e5ba67a80c88604d1886 100644 GIT binary patch literal 8565 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 literal 10318 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 diff --git a/public/images/nav_icon.png b/public/images/nav_icon.png index 2c824efaf9e15fff386cc3d72acacdfbd14491a7..1b4e61aecd889a092918fb73596cb84999c9b070 100644 GIT binary patch delta 2774 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 W07(&S(0I3)5dNfnhLp z9d!*&$Z4>;y1I#mwi*~>1Tg_?!qiTifOTN0<7c%gDtnCxJk=g4JUo1B2-sPh8v`?B z$7>?ClF=yS-w)lw=I7Y$K`VJH$HVv*j)wmsTrRG*Z~4`Ur{WskuvdTvSpGueRl5F~ zE9BGOgYmI)mWQ7=A@^Bbpp?e|PvnZeI0Guno8HE8tu3@lGuSg7Ds!tq!%Uyxl|eAr zv!f#$gj5tJ@P5eSXPd#HvQq2|JnZuFa_;3iw|GiN)^I`hQR_lR;B-&l2#ftti#pWA zpcVSWIfjNbEZZY{rb%8s?>(ekXrKRfmk(7N58bAK*vlKd+%)ARh)yYu8IlI26(0gR zA=kz<&GUV+lLGxs+DLpVvEFnWCF+aApJigB2$%f;PVYsfR9iGnljr7(&VwekbZY${ ziT5?Ry+?dNk2XDRUYd;gJf1UEQLJ|W2x{A^G7q!FphFsjZK%ipDO-dUJR7Av5g5wk zhjxj&0RsHxon&N3Xc8jrvAFP(8`KryO-<7p`84lwZ_hgzFRzTZenI{AxFNfK>113J zA>5y`{6|5hr9~0hWRyQ=dD+IEGKbTh^>)D*UrOf1pz9kymd~0PB*9*)2c5w`V1n_o zw+1s&3lkv`DEn#O=^l~#q_>)l#$%do(dwI&RF%AHQ2bi%8Pz1$;U;_r?qme=CCOVg zm+0HrToXUxPX`^D?~Ue+*MN)`imwqATwFzXC<;>Sn>fl|X0qTHE9%rDF<~Kg#Fi@? zz(h+XxYVjd^8gLw(iai6s>JNJ2Cl;wt5_2;uVqr{a#<&IE?D&xE*p5~nUAn6--3)uK^a7Q9yxKClvr9kn z4bqIQ3+xUY&>%i0gt`_my_Sz|CoxsnJ?`<@k(CNNP3V@D4J@n^Rp2A0t@}LJ5yZld zEn{Mcg}@}7;@P3vafM>Bc>N`!7=e8@S$lJR6DT%4nknCZ$(#8`bMFICzd{yp-HNpT z_F99cx|y$;I)TRewN7(Ef96Uq^7O&f^$ z2ks1%xrc3bV8@lDgzv6=wdm{8_xC@#CiSIc`#Pxe&1l$fObA$U!;jyhQ0F3@}N_9 z;+mYzjdbWL8N~nb@n3?cipY8+biL;THi^5<@vk3qj0H#05Hp#%n*IlIx}n1c zrw?p!@84eXdzuaZ`PPIyy z$+U5rd~7AhqFlBi04Ow?lRGFFECeCythq$mq~2b-c0cH&nZXJ&SD&IhT5c~B)Bj$YHGQ0>eS5YH1v7*Mm}(fGQRP#QIEv&>7E1tnoAr&Irdrx zuLPvx679>q#bWBTOY#_SK-mmq#gTIQh+gj7+U#dZ+hXTQS0~Sjljh1RkSeg6-tblM z#q#HE-Tsxvi+5Nc1el5POLog-x#6DB;%~YN+?3(!^nKfvY zU&p_y%ZyFHZL)X=q9RAP5;&|nyMpER z-1Hu+BM@m_1#u{gAk?Q|db>zl2n%aVOJDyw=&# zjB2|Q)ONJEdFUM$!gGkL77VjdctswFrJW6xUyOan#ZQKebIK+jL)!Z-LOcNTVqM|yoU62regwi!`v1c8F0&K9 z0V7(urIEv4QBmD2U^hynI~KItrqY)she*wwI1}7+NbuaG19bJNm>HDO6vMV-%dQPu z5^g<<^RX@C@Yp@lsSkxRfD<41{*9i$I0N6&+m-mgnDoDHknp3}fB&pq&7B#w%f#Kr zc77WE(~fU@e|kl`XYEcpsbgOb*lkcwa{HhfkKU%|>67F=!8|(;!o&hrWOVuVpSEAi Aq5uE@ diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index b448e03af..19b87224e 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -3,9 +3,9 @@ .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;} .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;} .navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;} -.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;} -.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;} -/*.navHomepageMenu:hover {background-color:#0ea6b7;}*/ +.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;} +.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;} +.navHomepageMenu:hover {background-color:#0ea6b7;} .navHomepageSearchBoxcontainer {margin-top:11px; } .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;} .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;} @@ -13,8 +13,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;} .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} #navSearchAlert {display:none;} -.navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;} -.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:29px; display:block;} +.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;} +.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;} .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;} .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;} @@ -91,19 +91,20 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;} a.topnav_login_box:hover {color:#a1ebff;} .navRow1 {margin:0; padding:0;} .navRow2 {margin:0; padding:0;} -.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -7px;} +.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;} .topnav_login_list a{color:#15bccf;} .topnav_login_list li{ } /*底部*/ #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; } +.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px;} .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;} .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;} -a.f_grey {color:#666666;} -a.f_grey:hover {color:#000000;} +a.f_grey {color:#666666 !important;} +a.f_grey:hover {color:#000000 !important;} +.mr30 {margin-right: 30px;} /*注册登陆页面*/ diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4040971fd..fd7f8b4d8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -82,18 +82,20 @@ h4{ font-size:14px; color:#3b3b3b;} .mr10{ margin-right:10px;} .mr15 {margin-right:15px;} .mr20{ margin-right:20px;} -.mr30{ margin-right:30px;} -.mr40{ margin-right:40px;} +.mr30{ margin-right:30px !important;} +.mr40{ margin-right:40px !important;} .mw20{ margin: 0 20px;} +.mt-4 {margin-top: -4px;} .mt3{ margin-top:3px;} .mt5{ margin-top:5px;} -.mt8{ margin-top:8px;} +.mt8{ margin-top:8px !important;} .mt10{ margin-top:10px !important;} .mt15 {margin-top:15px;} .mb4{ margin-bottom:4px;} .mb5{ margin-bottom:5px;} -.mb8 {margin-bottom:8px;} +.mb8 {margin-bottom:8px !important;} .mb10{ margin-bottom:10px !important;} +.mb12 {margin-bottom:12px !important;} .mb20{ margin-bottom:20px;} .pl15{ padding-left:15px;} .w20{ width:20px;} @@ -124,7 +126,7 @@ a.c_orange{color:#ff5722;} a:hover.c_orange{color: #d33503;} a.c_lorange{color:#ff9900;} a:hover.c_lorange{color:#fff;} -a.c_blue{ color:#15bccf;} +a.c_blue{ color:#269ac9;} a.c_dblue{ color:#09658c;} a:hover.c_dblue{ color:#15bccf;} a.c_white{ color:#fff;} @@ -230,7 +232,7 @@ a:hover.bgreen_n_btn{background:#08a384;} #Container{ width:1000px; margin:0 auto; } /*头部导航*/ -#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; position: relative;} +#Header{ margin:10px 0; background:#269ac9; height:40px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; position: relative;} .logo{ margin:5px 10px; } #TopNav{} #TopNav ul li{ margin-top:8px;} @@ -272,8 +274,8 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;} a.topnav_login_box:hover {color:#a1ebff;} .navRow1 {margin:0; padding:0;} .navRow2 {margin:0; padding:0;} -.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;} -.topnav_login_list a{color:#15bccf;} +.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;} +.topnav_login_list a{color:#269ac9;} .topnav_login_list li{ } /*主类容*/ @@ -305,11 +307,11 @@ a:hover.search_btn{ background: #0fa9bb;} /*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/ /*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/ a.resourcesGrey {font-size:12px; color:#888888;} -a.resourcesGrey:hover {font-size:12px; color:#15bccf;} +a.resourcesGrey:hover {font-size:12px; color:#269ac9;} .resourcesBanner ul li:hover ul.resourcesType {display:block;} ul li:hover ul {display:block;} -.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;} -.resourcesUploadBox:hover {background-color:#0781b4;} +.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#269ac9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;} +.resourcesUploadBox:hover {background-color:#297fb8;} .uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;} a.uploadText {color:#ffffff; font-size:14px;} .resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;} @@ -339,10 +341,10 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;} .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;} .resourcesSelectSend {float:right;} /*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/ -.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;} -a.sendButtonBlue {color:#15bccf;} +.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;} +a.sendButtonBlue {color:#269ac9;} a.sendButtonBlue:hover {color:#ffffff;} -.resourcesSelectSendButton:hover {background-color:#15bccf;} +.resourcesSelectSendButton:hover {background-color:#297fb8;} .db {display:block !important;} .dropdown-menu { @@ -380,8 +382,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;} @@ -395,10 +395,10 @@ a.replyGrey {color:#888888; display:inline-block;} a.replyGrey:hover {color:#4b4b4b;} /*上传资源弹窗*/ -.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} -.uploadDialogText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;} +.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} +.uploadDialogText {font-size:16px; color:#.uploadDialogText; line-height:16px; padding-top:20px; width:140px; display:inline-block;} .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative} -.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;} +.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;} a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;} a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;} .chooseFile {color:#ffffff; display:block; margin-left:32px;} @@ -411,7 +411,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; /*发送资源弹窗*/ /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/ /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/ -.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} +.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} .sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} @@ -423,22 +423,23 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;} .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;} .sendCourseName {font-size:12px; color:#5f6060;} -.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;cursor: pointer;} -/*.courseSendSubmit:hover {background-color:#0182bb;}*/ +.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#269ac9; margin-right:25px; float:left;cursor: pointer;} +.courseSendSubmit:hover {background-color:#297fb8;} .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left} a.sendSourceText {font-size:14px; color:#ffffff;} -input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;cursor: pointer;} +input.sendSourceText {font-size:14px;color:#ffffff;background-color:#269ac9;cursor: pointer;} +input.sendSourceText:hover {background-color:#297fb8;} /*input.sendSourceText:hover {font-size:14px; color:#ffffff;}*/ .resourcesSendTo {float:left; height:20px; margin-top:15px;} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px; overflow:scroll; overflow-x:hidden;} /*上传资源弹窗*/ -.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} +.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} .uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;} .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;} -.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;} -.uploadBox:hover {background-color:#0182bb;} +.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;} +.uploadBox:hover {background-color:#297fb8;} a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px; display:block;} .chooseFile {color:#ffffff; display:block; margin-left:32px;} .uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;} @@ -449,22 +450,22 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; /*新个人主页框架css*/ -.navContainer {width:100%; margin:0 auto; background-color:#15bccf;} +.navContainer {width:100%; margin:0 auto; background-color:#269ac9;} .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;} .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;} -.navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;} -.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;} -.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;} +.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;} +.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;} +.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;} +.navHomepageMenu:hover {background-color:#297fb8;} /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/ .navHomepageSearchBoxcontainer {margin-top:11px; } .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;} .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;} .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;} a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;} -.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} #navSearchAlert {display:none;} -.navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;} -.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:29px; display:block;} +.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;} +.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;} .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;} .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;} @@ -475,19 +476,19 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;} .homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;} .homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;} -.homepagePortraitImage:hover {border:1px solid #15bccf;} +.homepagePortraitImage:hover {border:1px solid #269ac9;} .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;} .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;} -.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:21px; float:left;} -.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} +.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:25px; float:left;} +.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;} .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;} .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;} .homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;} -.homepageImageNumber {font-size:12px; color:#484848;} -a.homepageImageNumber:hover {color:#15bccf;} +a.homepageImageNumber {font-size:12px; color:#484848; font-weight: bold;} +a.homepageImageNumber:hover {color:#269ac9;} .homepageImageText {font-size:12px; color:#888888;} .homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;} .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;} @@ -504,8 +505,8 @@ 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;} -.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;} +.homepageRightBanner {width:720px; height:30px; margin:0px auto;} +.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; 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;} .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;} @@ -522,11 +523,11 @@ a.replyGrey {color:#888888; display:inline-block;} a.replyGrey:hover {color:#4b4b4b;} a.replyGrey1 {color:#888888;} a.replyGrey1:hover {color:#4b4b4b;} -a.newsBlue {color:#15bccf;} -a.newsBlue:hover {color:#0781b4;} +a.newsBlue {color:#269ac9;} +a.newsBlue:hover {color:#297fb8;} a.menuGrey {color:#808080;} a.menuGrey:hover {color:#fe7d68;} -.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} +.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} #navSearchAlert {display:none;} /*个人主页右部分*/ @@ -538,19 +539,20 @@ a.homepagePostTypeNotice {background:url(../images/homepage_icon.png) -87px -280 a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310px no-repeat; padding-left:23px;} a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;} a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;} +a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -10px -360px no-repeat; padding-left:23px;} a.postTypeGrey {color:#888888;} a.postTypeGrey:hover {color:#15bccf;} -.homepagePostBrief {width:710px; margin:20px auto 0px auto; position:relative;} +.homepagePostBrief {width:710px; margin:10px auto 0px auto; position:relative;} .homepagePostPortrait {float:left; width:90px;} .homepagePostDes {float:left; width:600px; margin-left:20px;} -.homepagePostTo {font-size:14px; color:#484848; margin-bottom:15px;} -.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px; font-weight:bold;} -.homepagePostSubmitContainer {height:30px; margin-bottom:15px;} +.homepagePostTo {font-size:14px; color:#484848; margin-bottom:10px;} +.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:10px; font-weight:bold;} +.homepagePostSubmitContainer {height:30px; margin-bottom:10px;} .homepagePostSubmit {font-size:14px; color:#888888; width:90px; height:30px; text-align:center; vertical-align:middle; line-height:30px; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px;} .homepagePostSubmit:hover {background-color:#d8d8d8;} .homepagePostIntro {font-size:14px; color:#484848;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; height:30px; line-height:30px; vertical-align:middle;} -.homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:15px;} +.homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;} @@ -597,9 +599,9 @@ a:hover.gz_btn{ color:#ff5722;} #signUpBox {display:none; margin-top:79px;} #loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;} #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;} -#loginSignButton:hover {background-color:#0ea6b7;} -#loginInButton:hover {background-color:#0ea6b7;} -.loginContentContainer {width:100%; background-color:#15bccf; margin-top:1px; height:580px;} +#loginSignButton:hover {background-color:#297fb8;} +#loginInButton:hover {background-color:#297fb8;} +.loginContentContainer {width:100%; background-color:#269ac9; margin-top:1px; height:580px;} .loginContent {width:1000px; margin:0px auto;} .loginLeft {width:595px; float:left;} .loginLogo {padding-left:208px; padding-top:155px;} @@ -607,17 +609,18 @@ a:hover.gz_btn{ color:#ff5722;} .loginRight {width:405px; float:left;} .loginChooseBox {width:405px; height:54px; background-color:#ffffff; padding-top:18px;} .loginChooseList {width:350px; height:30px; font-size:14px; margin:0px auto;} -.loginChoose {width:55px; height:30px; border-bottom:1px solid #8ad2da; text-align:center;} +.loginChoose {width:55px; height:30px; border-bottom:1px solid #269ac9; text-align:center;} a.loginChooseTab {color:#484848; height:30px; display:block;} -.loginInButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:20px;} -.loginUpButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;} +.loginInButton {width:315px; height:40px; background-color:#269ac9; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:20px;} +.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} .loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;} -.loginChoose:hover {border-bottom:1px solid #8ad2da;} .loginSign {width:405px; background-color:#ffffff;} .loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;} .loginSignOption {margin-left:46px; margin-top:15px;} .loginIn {width:405px; background-color:#ffffff; padding-bottom:30px;} -.loginSignAlert {font-size:12px; margin-left:60px;} +.loginSignAlert {font-size:12px; margin-left:53px;} .loginSignRow {height:60px; min-height:60px;} /*关注列表*/ @@ -644,7 +647,7 @@ ul.list_watch{ .LoginButton:hover {background-color:#297fb8;} /*20150826协议 LB*/ .AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;} -.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;} +.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ From 02120c778f77c6be947a435113ccc68a9c6ed169 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 12:09:31 +0800 Subject: [PATCH 24/41] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 8 ++++---- app/views/users/user_resource.html.erb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index b41aced7c..e48864305 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -5,15 +5,15 @@
    diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index a58ecbe52..c69062b91 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -39,7 +39,7 @@ $("#upload_form").submit(); } -
    +
    资源库
      @@ -62,7 +62,7 @@
    -
    +
    上传资源
    From fb91958a3f54383b30465c3bf8faf948c49f81fb Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 14:30:02 +0800 Subject: [PATCH 25/41] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/header.css | 13 ++++++------- public/stylesheets/new_user.css | 7 ++++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 19b87224e..33c92809b 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -1,17 +1,16 @@ /*新个人主页框架css*/ -.navContainer {width:100%; background-color:#15bccf;} +.navContainer {width:100%; background-color:#269ac9;} .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;} .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;} -.navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;} +.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;} .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;} .navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;} -.navHomepageMenu:hover {background-color:#0ea6b7;} +.navHomepageMenu:hover {background-color:#297fb8;} .navHomepageSearchBoxcontainer {margin-top:11px; } .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;} .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;} .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;} a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;} -.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} #navSearchAlert {display:none;} .navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;} .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} @@ -76,7 +75,7 @@ a.newsBlue {color:#15bccf;} a.newsBlue:hover {color:#0781b4;} a.menuGrey {color:#808080;} a.menuGrey:hover {color:#fe7d68;} -.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} +.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} #navSearchAlert {display:none;} /*myctrip*/ @@ -110,5 +109,5 @@ a.f_grey:hover {color:#000000 !important;} /*注册登陆页面*/ #loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;} #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;} -#loginSignButton:hover {background-color:#0ea6b7;} -#loginInButton:hover {background-color:#0ea6b7;} +#loginSignButton:hover {background-color:#297fb8;} +#loginInButton:hover {background-color:#297fb8;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 535e8eb59..3f11329b0 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -411,7 +411,7 @@ a.replyGrey:hover {color:#4b4b4b;} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} -.uploadDialogText {font-size:16px; color:#.uploadDialogText; line-height:16px; padding-top:20px; width:140px; display:inline-block;} +.uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;} .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative} .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;} a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;} @@ -427,7 +427,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/ /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/ .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} -.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;} +.sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;} @@ -441,8 +441,9 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#269ac9; margin-right:25px; float:left;cursor: pointer;} .courseSendSubmit:hover {background-color:#297fb8;} .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left} +.courseSendCancel:hover {background-color: #717171;} a.sendSourceText {font-size:14px; color:#ffffff;} -input.sendSourceText {font-size:14px;color:#ffffff;background-color:#269ac9;cursor: pointer;} +input.sendSourceText {font-size:14px;color:#ffffff;background-color:#269ac9;cursor: pointer; outline: none; border: none; width: 50px; height: 25px;} input.sendSourceText:hover {background-color:#297fb8;} /*input.sendSourceText:hover {font-size:14px; color:#ffffff;}*/ .resourcesSendTo {float:left; height:20px; margin-top:15px;} From d9df8aae28be219e6afd7c90a4f7d2ccbe6c71c2 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 28 Aug 2015 14:38:46 +0800 Subject: [PATCH 26/41] =?UTF-8?q?1=E3=80=82=E7=BC=BA=E9=99=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E5=9C=A8=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=202=E3=80=81=E7=BC=BA=E9=99=B7=E6=8C=87=E6=B4=BE=E4=B8=8E?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=8F=91=E5=B8=83=E8=80=85=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=203=E3=80=81=E7=95=99?= =?UTF-8?q?=E8=A8=80=E5=86=85=E5=AE=B9=E7=9A=84=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/issues_helper.rb | 16 ++++++++++++++++ app/helpers/users_helper.rb | 7 +++++-- app/models/journal.rb | 2 +- .../mailer/send_for_user_activities.html.erb | 1 + app/views/users/user_messages.html.erb | 4 ++-- public/stylesheets/new_user.css | 4 +++- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index a26d2661a..412c3f889 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -380,6 +380,22 @@ module IssuesHelper value = content_tag("i", h(value)) if value end end + # 缺陷更新结果在消息中显示样式 + if no_html == "message" + label = content_tag(:span, label, :class => "issue_update_message") + old_value = content_tag("span", h(old_value)) if detail.old_value + old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank? + if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) + # Link to the attachment if it has not been removed + if options[:token].nil? + value = atta.filename + else + value = atta.filename + end + else + value = content_tag(:span, h(value), :class => "issue_update_message_value") if value + end + end if detail.property == 'attr' && detail.prop_key == 'description' s = l(:text_journal_changed_no_detail, :label => label) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 2f74b1f7d..e7ab001da 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -427,8 +427,11 @@ module UsersHelper # journal.details 记录每个动作的新旧值 def get_issue_des_update(journal) - arr = details_to_strings(journal.details,true) - arr << journal.notes + no_html = "message" + arr = details_to_strings(journal.details, no_html) + unless journal.notes.empty? + arr << "留言内容：" + journal.notes + end str = '' arr.each { |item| str = str+item } return str diff --git a/app/models/journal.rb b/app/models/journal.rb index 3a9f5a89d..0d86d12ff 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -174,7 +174,7 @@ class Journal < ActiveRecord::Base if self.user_id != self.issue.author_id self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false) end - if self.user_id != self.issue.assigned_to_id # 指派人不是自己的话，则给指派人发送 + if self.user_id != self.issue.assigned_to_id && self.issue.assigned_to_id != self.issue.author_id # 指派人不是自己的话，则给指派人发送 self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false) end end diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 7bd1b0bc2..0233f7a42 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -327,6 +327,7 @@ <% end %>
    + <% @project_news_comments.each do |project_news_comment|%>
  • diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 549355c29..2f88b1d85 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -153,9 +153,9 @@
  • "> 更新了问题状态
  • - <%= link_to get_issue_des_update(ma.forge_message), + <%= link_to get_issue_des_update(ma.forge_message).html_safe, issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :title => "#{get_issue_des_update(ma.forge_message)}" %> + :title => "#{get_issue_des_update(ma.forge_message).html_safe}" %>
  • <%= time_tag(ma.forge_message.created_on).html_safe %>
    • diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22e13709b..86dc0a440 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -875,7 +875,9 @@ img.ui-datepicker-trigger { .homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;} .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;} .calendar_div{border: 1px solid #d9d9d9;} - +/*缺陷更新动态在消息中显示样式*/ +.issue_update_message{padding-left: 2px; margin-right: 3px;} +.issue_update_message_value{margin-right: 8px;} #attachments_fields input.filename { border: 0; height: 1.8em; From a19692a0c6367871726f1dfa23686a9967fcf753 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 14:50:48 +0800 Subject: [PATCH 27/41] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index bafeb8d5e..434e8847f 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -62,7 +62,7 @@ <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>

    - +
    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 3f11329b0..b24e19b02 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -690,7 +690,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} /*底部*/ #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; } +.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px;} .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;} .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;} From 4392ecdcd7494cb7837152060ede3c25f02ada0d Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 15:41:50 +0800 Subject: [PATCH 28/41] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 20 ++++++++------------ public/stylesheets/new_user.css | 7 ++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index f4c68b12a..73c1d2a72 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,5 +1,4 @@ - -
    +
    消息
      @@ -29,6 +28,8 @@
    +
    +
    <% if @new_message_count >0 %> <%# 课程消息 %> @@ -38,8 +39,7 @@ <% if ma.course_message_type == "News" %>
    • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %>
      • -
    • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %>
      • -
    • ">发布了通知
      • +
    • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了通知
    • <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", @@ -50,8 +50,7 @@ <% if ma.course_message_type == "Comment" %>
      • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
        • -
      • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %>
        • -
      • ">评论了通知
        • +
      • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">评论了通知
      • <%= link_to ma.course_message.comments.html_safe, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", @@ -62,8 +61,7 @@ <% if ma.course_message_type == "HomeworkCommon" %>
        • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
          • -
        • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
          • -
        • ">发布了作业
          • +
        • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了作业
        • <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %>
        • <%= time_tag(ma.course_message.created_at).html_safe %>
          • @@ -72,8 +70,7 @@ <% if ma.course_message_type == "Poll" %>
          • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
            • -
          • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
            • -
          • ">发布了问卷
            • +
          • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">发布了问卷
          • <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id), :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", @@ -117,8 +114,7 @@ <% if ma.course_message_type == "JournalsForMessage" %>
            • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
              • -
            • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
              • -
            • ">回复了作品评论
              • +
            • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">回复了作品评论
            • <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %>
            • <%= time_tag(ma.course_message.created_on).html_safe %>
              • diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2e560468f..b9b24dcd8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -11,7 +11,7 @@ a:hover,a:active{color:#000;} /*常用*/ /*#RSide{ background:#fff;}*/ -#users_setting{clear:both;width:730px;background: #fff;padding: 10px;/*滑动门的宽度*/} +#users_setting{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/} /*上传图片处理*/ .upload_img img{max-width: 100%;} blockquote img{max-width: 100%;} @@ -527,8 +527,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .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;} .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;} .homepageNewsPortrait {width:40px; display:block; margin-top:7px;} -.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } -.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;} +.homepageNewsPublisher {width:80px; max-width:80px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } +.homepageNewsType {width:90px; padding-left: 5px; font-size:12px; color:#888888; display:block;} +.homepageNewsPubType {width:175px; font-size:12px; color:#888888; display: block;} .homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} From 18e2d05f4152fb537817f09f1b433d4d2c9294fa Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 28 Aug 2015 15:49:02 +0800 Subject: [PATCH 29/41] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 2 +- config/locales/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index f532f5cbc..2071529f0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -51,7 +51,7 @@ en: error_session_expired: "Your session has expired. Please login again." warning_attachments_not_saved: "%{count} file(s) could not be saved." - mail_subject_lost_password: "Your %{value} password" + mail_subject_lost_password: "%{value} Your password" mail_body_lost_password: 'To change your password, click on the following link:' mail_subject_register: "Your %{value} account activation" mail_body_register: 'To activate your account, click on the following link:' diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f3d6df6cc..48502f014 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -85,7 +85,7 @@ zh: error_unable_to_connect: "无法连接 (%{value})" warning_attachments_not_saved: "%{count} 个文件保存失败" - mail_subject_lost_password: "您的 %{value} 密码" + mail_subject_lost_password: "%{value} 您的密码" mail_body_lost_password: '请点击以下链接来修改您的密码：' mail_subject_register: "%{value}帐号激活" mail_body_register: '请点击以下链接来激活您的帐号：' From 5384e7eee883af82dc3e5a237e9d23a69c07f587 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 28 Aug 2015 15:51:42 +0800 Subject: [PATCH 30/41] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=AF=8F=E7=A7=8D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/users/user_messages.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 055955e04..66edf761f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -116,7 +116,7 @@ class UsersController < ApplicationController user_querys.update_all(:viewed => true) forum_querys.update_all(:viewed => true) end - @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count + # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count case params[:type] when nil @message_alls = [] diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index f4c68b12a..33eeafa20 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -30,7 +30,7 @@
    - <% if @new_message_count >0 %> + <% if @message_alls.count >0 %> <%# 课程消息 %> <% unless @message_alls.nil? %> <% @message_alls.each do |ma| %> From 48419573ac7c6d5ca82dde81aadc12e9dcb1c7a6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:02:00 +0800 Subject: [PATCH 31/41] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E6=9C=892=E6=9D=A1=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 535e8eb59..de471ea5a 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -689,7 +689,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} /*底部*/ #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; } +.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;} .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;} From 02f7538200ed44d5aab1152b1878a8c10c2b37b0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:10:05 +0800 Subject: [PATCH 32/41] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=B8=BA=E8=8B=B1=E6=96=87=E6=97=B6=E4=B8=8D=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index bafeb8d5e..edc869a91 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -57,7 +57,7 @@
    -
    +

    <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>

    From 76ec0d5d4828516ccd18187c8b4a8cde502d019b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:47:43 +0800 Subject: [PATCH 33/41] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=B5=84=E6=BA=90=E5=88=B0=E4=BD=9C=E4=B8=9A=E9=9D=99?= =?UTF-8?q?=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 ++++++++- app/views/users/_show_user_resource.html.erb | 26 +++++++++++++++++++ .../users/_user_homework_attachment.html.erb | 2 +- app/views/users/user_import_homeworks.js.erb | 2 +- app/views/users/user_import_resource.js.erb | 7 +++++ config/routes.rb | 1 + 6 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 app/views/users/_show_user_resource.html.erb create mode 100644 app/views/users/user_import_resource.js.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 544ed7bf5..e98220d26 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -46,7 +46,7 @@ class UsersController < ApplicationController :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index, :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource, :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, - :user_import_homeworks,:user_search_homeworks] + :user_import_homeworks,:user_search_homeworks,:user_import_resource] before_filter :auth_user_extension, only: :show #before_filter :rest_user_score, only: :show #before_filter :select_entry, only: :user_projects @@ -378,6 +378,16 @@ class UsersController < ApplicationController end end + #用户从资源库导入资源到作业 + def user_import_resource + user_course_ids = User.current.courses.map { |c| c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ + "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") + respond_to do |format| + format.js + end + end + include CoursesHelper def user_courses diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb new file mode 100644 index 000000000..a27a51d65 --- /dev/null +++ b/app/views/users/_show_user_resource.html.erb @@ -0,0 +1,26 @@ +
    +
    +
    资源库
    +
    + +
    +
    + + +
    +
    + <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %> +
    + <%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%> +
    +
    +
    + 确定 +
    +
    + 取消 +
    +
    + <% end%> +
    +
    \ No newline at end of file diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb index e184d4132..4f47cd7f2 100644 --- a/app/views/users/_user_homework_attachment.html.erb +++ b/app/views/users/_user_homework_attachment.html.erb @@ -47,7 +47,7 @@
    上传附件 - + <%= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
    <% content_for :header_tags do %> diff --git a/app/views/users/user_import_homeworks.js.erb b/app/views/users/user_import_homeworks.js.erb index 7f9bfa0df..d00886b1c 100644 --- a/app/views/users/user_import_homeworks.js.erb +++ b/app/views/users/user_import_homeworks.js.erb @@ -4,4 +4,4 @@ $('#ajax-modal').css('height','300px').css("width","580px"); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); -$('#ajax-modal').parent().css("top","20%").css("left","25%"); +$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed"); diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb new file mode 100644 index 000000000..ce70d68ad --- /dev/null +++ b/app/views/users/user_import_resource.js.erb @@ -0,0 +1,7 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>'); +showModal('ajax-modal', '580px'); +$('#ajax-modal').css('height','300px').css("width","580px"); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + +""); +$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed"); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 634fb6d27..7237787bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -329,6 +329,7 @@ RedmineApp::Application.routes.draw do match 'user_homeworks', :to => 'users#user_homeworks', :via => :get get 'user_import_homeworks' get 'user_search_homeworks' + get 'user_import_resource' match 'watch_projects', :to => 'users#watch_projects', :via => :get # # added by bai From bbb8e5a0627b485ff0c34d416488d06c020550de Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:56:09 +0800 Subject: [PATCH 34/41] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 2 +- app/views/users/user_homeworks.html.erb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 2d4c7eb49..3c4358b95 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -38,7 +38,7 @@
    发送 或 - 取消 + 取消
    \ No newline at end of file diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 2813f2006..4151334dc 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -11,6 +11,14 @@ } }; $(window).scroll(scrollHandler); + + function reset_homework(){ + $("#homework_name").val(""); + $("#homework_end_time").val(""); + $("#course_id").val(""); + $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>"); + homework_description_editor.html(""); + } <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> From 148a4e247934eac519275aaf1d30f015959e4ec2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:59:40 +0800 Subject: [PATCH 35/41] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?= =?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_homework_form.html.erb | 2 +- app/views/users/user_homeworks.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 3c4358b95..e6cd1483d 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -1,6 +1,6 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
    -
    +

    diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 4151334dc..e232579f9 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -30,7 +30,7 @@
    -
    +
    <% homework = HomeworkCommon.new %> <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
    From e193cb0f2df6f1699d8162827224114a122eba6c Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 28 Aug 2015 17:05:27 +0800 Subject: [PATCH 36/41] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=96=B0=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 | 465 ++++++++++++------------- public/stylesheets/new_user.css | 9 +- 2 files changed, 231 insertions(+), 243 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 6a57a938e..9b0534482 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,251 +1,240 @@ -
    -
    -
    消息
    - +
    +
    +
    +
    +<% if @message_alls.count >0 %> + <%# 课程消息 %> + <% unless @message_alls.nil? %> + <% @message_alls.each do |ma| %> + <% if ma.class == CourseMessage %> + <% if ma.course_message_type == "News" %> + <% end %> - - <% if ma.class == ForgeMessage %> - <% if ma.forge_message_type == "Issue" %> - - <% end %> - <% if ma.forge_message_type == "Journal" %> - - <% end %> - <% if ma.forge_message_type == "Message" %> - <% end %> - - <% if ma.class == MemoMessage %> - <% if ma.memo_type == "Memo" %> -
    -
    + + +<% else %> +
    您目前还没有相关消息！
    +<% end %> +
    +
    +
    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index b9b24dcd8..83b17281d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -527,10 +527,10 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .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;} .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;} .homepageNewsPortrait {width:40px; display:block; margin-top:7px;} -.homepageNewsPublisher {width:80px; max-width:80px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } -.homepageNewsType {width:90px; padding-left: 5px; font-size:12px; color:#888888; display:block;} -.homepageNewsPubType {width:175px; font-size:12px; color:#888888; display: block;} -.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } +.homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; } +.homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;} +.homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;} +.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} a.homepageWhite:hover {color:#a1ebff} @@ -917,7 +917,6 @@ img.ui-datepicker-trigger { margin: 7px; } /*消息*/ -.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;} .homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;} .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;} .calendar_div{border: 1px solid #d9d9d9;} From d536c81a8a8db9b201118258b4c0dc24f382ba4e Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 17:11:33 +0800 Subject: [PATCH 37/41] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index c0492c85b..07bfcfdef 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -866,14 +866,14 @@ a:hover.BlueCirBtn{ background:#15bccf; color:#fff;} .W120{ width:110px;} .W700{ width:700px;max-width: 700px;min-width: 700px;} .w708{width: 708px;} -a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} -a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#15bccf;} -a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} -a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#15bccf;} +a.AnnexBtn{ background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} +a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#15bccf;} +a.FilesBtn{ background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} +a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#15bccf;} a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #15bccf; color:#15bccf; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMini{ background:#15bccf; color:#fff;} -a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat; width:85px; height:20px; display:block; color:#888888; font-size:14px;} -a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-repeat;} +a.DropBtn{background: url(../images/homepage_icon2.png) -125px -339px no-repeat; width:85px; height:20px; display:block; color:#888888; font-size:14px;} +a:hover.DropBtn{background: url(../images/homepage_icon2.png) -125px -370px no-repeat;} .DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;} /*20150820编程作业 LB*/ .W320{ width:320px;} @@ -894,8 +894,8 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;} .W200{ width:200px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} -.SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; } -.SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; } +.SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } +.SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; } 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;} a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;} From 49972ca476de22aed0c16cb8ad6774192e68392e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 17:11:34 +0800 Subject: [PATCH 38/41] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E8=B5=84=E6=BA=90=E5=BA=93=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_attachment.html.erb | 2 +- app/views/users/_user_homework_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb index 4f47cd7f2..1613b144e 100644 --- a/app/views/users/_user_homework_attachment.html.erb +++ b/app/views/users/_user_homework_attachment.html.erb @@ -47,7 +47,7 @@
    上传附件 - <%= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%> + <%#= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
    <% content_for :header_tags do %> diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index e6cd1483d..8340306e0 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -27,7 +27,7 @@
    - <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox w708 SearchIcon"} %> + <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox w708"} %>
    From e448d2c05f51a45c56579dd6f9856e058ac762cc Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 28 Aug 2015 17:25:42 +0800 Subject: [PATCH 39/41] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 ++ app/helpers/poll_helper.rb | 10 -- app/views/users/_course_homework.html.erb | 21 ++-- app/views/users/_course_message.html.erb | 112 ++++++++++++--------- app/views/users/_course_news.html.erb | 104 ++++++++++--------- app/views/users/_course_poll.html.erb | 20 ++-- app/views/users/_project_issue.html.erb | 92 +++++++++-------- app/views/users/_project_message.html.erb | 115 +++++++++++++--------- app/views/users/_user_activities.html.erb | 59 +++++++++++ 9 files changed, 336 insertions(+), 207 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 709426d41..7f93345b4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2493,4 +2493,14 @@ int main(int argc, char** argv){ return 0; }".html_safe end + + #判断用户是否已经提交了问卷 + def has_commit_poll?(poll_id,user_id) + pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) + if pu.nil? + false + else + true + end + end end diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb index 22ee21936..170e1b92c 100644 --- a/app/helpers/poll_helper.rb +++ b/app/helpers/poll_helper.rb @@ -37,16 +37,6 @@ module PollHelper pv.vote_text end end - - #判断用户是否已经提交了问卷 - def has_commit_poll?(poll_id,user_id) - pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) - if pu.nil? - false - else - true - end - end #统计答题百分比，统计结果保留两位小数 def statistics_result_percentage(e, t) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 0cb3aa25e..88a00e8ab 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -4,16 +4,16 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> - <% end %> TO - <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <% end %> TO + <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    -
    - <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %> +
    + <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
    @@ -21,7 +21,16 @@
    截止时间：<%= format_date(activity.end_time) %>
    -
    （作业描述）<%= activity.description.html_safe %>
    +
    + 作业描述：<%= activity.description.html_safe %> +
    +
    - <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
    -
    时间：<%= format_date(activity.created_on) %>
    +
    发帖时间：<%= format_date(activity.created_on) %>
    -
    （描述） + + +
    帖子描述： <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> @@ -44,20 +47,26 @@
    -
    -
    + + <% activity= activity.parent_id.nil? ? activity:activity.parent%> + <% replies_all_i = 0 %> + <% unless activity.children.empty? %> +
    +
      + <% activity.children.reorder("created_on desc").each do |reply|%> + <% replies_all_i=replies_all_i+1 %> +
    • +
      + <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %> +
      +
      +
      + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> + <%= link_to( + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => 'replyGrey fr ml10' + ) if reply.course_destroyable_by?(User.current) %> + +
      +
      <%= reply.content.html_safe %>
      +
      +
      +
      • + <% end %> +
    -
    <%#= reply.content.html_safe %>
    -
    -
    -
    - <%# end %> - <%# end %> -
    --> + <% end %> +
    diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index ce85e0cad..aaa8fa672 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -1,5 +1,5 @@
    -
    +
    <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    @@ -9,17 +9,18 @@ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% end %> TO - <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <% end %> TO + <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
    -
    - <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %> +
    + <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
    发布时间：<%= format_date(activity.created_on) %>
    -
    （通知描述）<%= activity.description.html_safe %>
    - -
    <%#= render :partial => 'course_news_reply',:locals => { :contest => @contest, :journals => @jour, :state => false}%> -
    - <%#= form_tag({:controller => 'comments', :action => 'create', :id => activity}, :id => "add_reply_form") do %> - -
    - 取消 + + <% replies_all_i = 0 %> + <% unless activity.comments.empty? %> +
    +
      + <% activity.comments.reorder("created_on desc").each do |comment| %> + <% replies_all_i=replies_all_i+1 %> +
    • +
      + <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> +
      +
      +
      + <% if comment.try(:author).try(:realname) == ' ' %> + <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(comment.created_on) %> + <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> + +
      +
      <%= comment.comments.html_safe %>
      +
      +
      +
      • + <% end %> +
    -
    - 发送 -
    -
    - <%# end %> + <% end %>
    - <%# activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%> -
    -
    - <%#= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> -
    -
    -
    - <%# if comment.try(:author).try(:realname) == ' ' %> - <%#= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#=format_date(comment.created_on)%> - <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> - <!–删除–> -
    -
    <%#= comment.comments.html_safe %>
    -
    -
    -
    - <%# end %> - <%# end %> -
    -->
    \ No newline at end of file diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 0c93e7627..bc0fee3a8 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -1,4 +1,4 @@ -<%# has_commit = has_commit_poll?(activity.id ,User.current)%> +<% has_commit = has_commit_poll?(activity.id ,User.current)%> <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
    @@ -14,21 +14,21 @@ <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to Course.find(activity.polls_group_id).name.to_s+"(课程名称)", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    - <%#= link_to activity.polls_name.to_s+"(问卷名称)", %> - <%# if has_commit %> - <%#= link_to poll_name, poll_result_poll_path(activity.id), :class => "polls_title polls_title_w fl c_dblue"%> - <%# else %> - <%= link_to poll_name+"(问卷名称)", poll_path(activity.id), :class => "postGrey"%> - <%# end %> + <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> + <% if has_commit %> + <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> + <% else %> + <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%> + <% end %>
    -
    时间：<%= format_date(activity.created_at) %>
    +
    发布时间：<%= format_date(activity.published_at) %>
    -
    （问卷描述）<%=activity.polls_description.to_s%>
    +
    问卷描述：<%=activity.polls_description.to_s%>
    - <%= link_to activity.subject.to_s+"(缺陷标题)", issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> - <%=activity.status.name %> + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> + <%= get_issue_priority(activity.priority_id)[1] %>
    指派给   @@ -28,7 +28,7 @@
    时间：<%=format_date(activity.created_on) %>
    -
    （缺陷描述）<%=activity.description.html_safe %>
    +
    缺陷描述：<%= activity.description.html_safe %>
    <% if activity.attachments.any? %> <% activity.attachments.each do |attachment| %> @@ -70,15 +70,21 @@
    -
    -
    + + <% replies_all_i = 0 %> + <% unless activity.journals.empty? %> +
    +
      + <% activity.journals.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %> +
    • +
      + <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> +
      +
      +
      + <% if reply.try(:user).try(:realname) == ' ' %> + <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <%# else %> + <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> - <%# activity.journals.reorder("created_on desc").each do |reply| unless activity.journals.nil?%> -
      -
      - <%#= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> -
      -
      -
      - <%# if reply.try(:user).try(:realname) == ' ' %> - <%#= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#= format_date(reply.created_on) %> - - #<!–删除–> -
      - <%# if reply.details.any? %> - <%# details_to_strings(reply.details).each do |string| %> -
      <%#=string %>
      - <%# end %> - <%# else %> -
      <%#=reply.notes.html_safe %>
      - <%# end %> -
      -
      -
      - <%# end %> - <%# end %> -
      --> + +
      + <% if reply.details.any? %> + <% details_to_strings(reply.details).each do |string| %> +
      <%= string %>
      + <% end %> + <% else %> +
      <%= reply.notes.html_safe %>
      + <% end %> +
    +
    + + <% end %> + +
    + <% end %> +
    \ No newline at end of file diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 57b021467..d46823211 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -11,20 +11,26 @@ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
    <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
    时间：<%= format_date(activity.created_on) %>
    -
    （描述）<%= activity.content.html_safe %>
    +
    帖子描述： + <% if activity.parent_id.nil? %> + <%= activity.content.to_s.html_safe%> + <% else %> + <%= activity.parent.content.to_s.html_safe%> + <% end %> +
    -
    -
    + + <% activity= activity.parent_id.nil? ? activity : activity.parent %> + <% replies_all_i = 0 %> + <% unless activity.children.empty? %> +
    +
      + <% activity.children.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %> +
    • +
      + <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %> +
      +
      +
      + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> + <%= link_to( + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => 'replyGrey fr ml10' + ) if reply.course_destroyable_by?(User.current) %> + +
      +
      <%= reply.content.html_safe %>
      +
      +
      +
      • + <% end %> +
    -
    -
    - <%# if reply.try(:author).try(:realname) == ' ' %> - <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#= format_date(reply.created_on) %> - <%#= link_to( - l(:button_delete), - {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete), - :class => 'replyGrey fr ml10' - ) if reply.course_destroyable_by?(User.current) %> - # <!–删除–> -
    -
    <%#= reply.content.html_safe %>
    -
    -
    -
    - <%# end %> - <%# end %> -
    --> -
    + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 97f7b4c6f..1cfeb7ed8 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -1,5 +1,64 @@ <% user_activities.each do |user_activity| unless user_activities.nil? %> + <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %> <% case user_activity.container_type.to_s %> <% when 'Course' %> From 3f61a908d12a2aa0adc4a6cc1823311c2367bb16 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 17:27:51 +0800 Subject: [PATCH 40/41] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- app/views/my/account.html.erb | 2 +- app/views/users/user_fanslist.html.erb | 2 +- app/views/users/user_newfeedback.html.erb | 16 ++++++++++------ public/javascripts/new_user.js | 4 ++-- public/stylesheets/new_user.css | 1 + public/stylesheets/users.css | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 9c4bde60d..9ab29ba8b 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -137,7 +137,7 @@
    -
    +
    <%= yield %>
    diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index c25363323..688d7e2ac 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -1,5 +1,5 @@
    -
    +
    • 基本资料
      • diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index 350875f8b..63b03e5dd 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -7,7 +7,7 @@ } -
      +
      <% if @action == 'fans' %>

      粉丝

      diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index b8c5b106d..556069a1f 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -24,11 +24,15 @@ -
      -
      -
      留言
      -
      -
      +
      +
      +
      +
      留言
      +
      +
      +
      + +
      <%= form_for('new_form',:url => leave_user_message_path(@user.id),:method => "post") do |f|%> @@ -40,7 +44,7 @@
      -
      +
      <%if @jour%> <% @jour.each do |jour|%> <%= render :partial => 'user_jours_new', :locals => {:jour => jour} %> diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js index 42c8a9ddf..100dcb46a 100644 --- a/public/javascripts/new_user.js +++ b/public/javascripts/new_user.js @@ -1,7 +1,7 @@ $(function(){ //右侧最小高度 = 左侧高度 - 15px 保证两边高度基本一样，页面美观 - $("#RSide").css("min-height",$("#LSide").height()-15); - $("#users_setting").css("min-height",$("#LSide").height()-35); + $("#RSide").css("min-height",$("#LSide").height()-35); + $("#users_setting").css("min-height",$("#LSide").height()-100); //头像相关 $("#homepage_portrait_image").live("mouseover",function(){ diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 07bfcfdef..5e5c9517b 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -12,6 +12,7 @@ a:hover,a:active{color:#000;} /*常用*/ /*#RSide{ background:#fff;}*/ #users_setting{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/} +#RSide{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/} /*上传图片处理*/ .upload_img img{max-width: 100%;} blockquote img{max-width: 100%;} diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css index eb9309eab..48d73f86a 100644 --- a/public/stylesheets/users.css +++ b/public/stylesheets/users.css @@ -24,7 +24,7 @@ a.icon_face{background:url(../images/public_icon.png) 0px -671px no-repeat; dis a:hover.icon_face{background:url(../images/public_icon.png) -79px -671px no-repeat; } .inputUsers_message{ border:1px solid #d2d2d2; width:718px; height:48px; color:#666; padding:5px; margin-bottom:5px;} .inputUsers_message02{ border:1px solid #d2d2d2; width:618px; height:26px; color:#666; padding:5px; margin-bottom:5px; } -.message_list_box{ background:#f5f5f5; padding:10px;margin-top: 10px;} +.message_list_box{ background:#f5f5f5; margin-top: 10px;} .users_pic{ width:46px; height:46px; border:1px solid #e3e3e3;} .users_pic:hover{ border:1px solid #a5a5a5;} .users_pic_sub{width:32px; height:32px; border:1px solid #e3e3e3;} From 46ac491b5bcf5c329d308774ed42a809ac3e48a2 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Fri, 28 Aug 2015 17:29:22 +0800 Subject: [PATCH 41/41] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/homepage_icon2.png | Bin 0 -> 10889 bytes public/images/resource_icon_list.png | Bin 0 -> 2654 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/images/homepage_icon2.png create mode 100644 public/images/resource_icon_list.png diff --git a/public/images/homepage_icon2.png b/public/images/homepage_icon2.png new file mode 100644 index 0000000000000000000000000000000000000000..6cbde8f6235a780dc9116f7507f433dcf4f6cec8 GIT binary patch literal 10889 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