- <%= form_tag add_exist_file_to_project_user_path(user),:remote=>true,:id=>'projects_list_form' %>
+ <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
<%= hidden_field_tag(:send_id, send_id) %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 85e426e92..802723936 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -174,7 +174,7 @@
<% time=project.updated_on %>
<% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
<%=(User.find project.user_id).show_name %>(组长)
-
<%=time_from_now time %>
+
<%=time_from_now time %> <%= project.commits_count %>提交
项目名称：<%=project.name %>
创建者：<%=(User.find project.user_id).show_name %>(组长)
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index 0632ebb98..5218c22ab 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,11 +1,4 @@
-
-//var popupHeight = $(".resourceSharePopup").outerHeight(true);
-//$(".resourceSharePopup").css("marginTop",-popupHeight/2);
-//
-//$("#upload_box").css('left','').css('top','');
-//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-//$("#upload_box").css('display','block');
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
showModal('ajax-modal', '452px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("
");
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2805c4379..a56ca7b48 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -40,4 +40,10 @@
+
+<% if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
+ <% homepage = BlogComment.find(@user.blog.homepage_id) %>
+ <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
+<% end %>
+
<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 3f86b4b60..fe89e64e3 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -432,6 +432,8 @@ zh:
label_file_score: 文档得分
label_file_number: 文档的数量
+
+ label_file_attachment_score: 资源得分
label_code_submit_score: 代码提交得分
label_code_submit_number: 代码提交频率
diff --git a/config/routes.rb b/config/routes.rb
index 133203a8b..7c3511895 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,6 +54,7 @@ RedmineApp::Application.routes.draw do
post 'logout'
post 'apply_subdomain'
get 'org_resources_subfield'
+ get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_org_subfield'
end
collection do
get 'check_uniq'
@@ -73,7 +74,10 @@ RedmineApp::Application.routes.draw do
end
Organization.where("domain is not null").each do |org|
- get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: {subdomain: org.domain}
+ org_domains = []
+ org_domains << org.domain
+ #get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: {subdomain: org.domain}
+ get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: lambda{ |request| org_domains.include?(request.remote_ip) }
end
get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'}
get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'}
@@ -101,6 +105,9 @@ RedmineApp::Application.routes.draw do
match "quote_resource_show_org_subfield", :via => [:get]
end
end
+ member do
+ match 'update_sub_dir', :via => [:put]
+ end
resource :boards
end
@@ -630,6 +637,7 @@ RedmineApp::Application.routes.draw do
post 'reopen'
get 'search_public_orgs_not_in_project'
match 'copy', :via => [:get, :post]
+ match 'set_public_or_private', :via => [:post]
end
collection do
diff --git a/db/migrate/20160108093752_add_status_to_org_messages.rb b/db/migrate/20160108093752_add_status_to_org_messages.rb
new file mode 100644
index 000000000..4fbe41fe1
--- /dev/null
+++ b/db/migrate/20160108093752_add_status_to_org_messages.rb
@@ -0,0 +1,5 @@
+class AddStatusToOrgMessages < ActiveRecord::Migration
+ def change
+ add_column :org_messages, :status, :integer, :default => 0
+ end
+end
diff --git a/db/migrate/20160111064927_add_issues_count_to_project.rb b/db/migrate/20160111064927_add_issues_count_to_project.rb
new file mode 100644
index 000000000..dcb90b32c
--- /dev/null
+++ b/db/migrate/20160111064927_add_issues_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddIssuesCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :issues_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160111065137_add_attachments_count_to_project.rb b/db/migrate/20160111065137_add_attachments_count_to_project.rb
new file mode 100644
index 000000000..aecacfcb6
--- /dev/null
+++ b/db/migrate/20160111065137_add_attachments_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddAttachmentsCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :attachments_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160111065215_add_boards_count_to_project.rb b/db/migrate/20160111065215_add_boards_count_to_project.rb
new file mode 100644
index 000000000..efc4b3f3c
--- /dev/null
+++ b/db/migrate/20160111065215_add_boards_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddBoardsCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :boards_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160111065530_add_news_count_to_project.rb b/db/migrate/20160111065530_add_news_count_to_project.rb
new file mode 100644
index 000000000..63278e2eb
--- /dev/null
+++ b/db/migrate/20160111065530_add_news_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddNewsCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :news_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160111071348_static_project_boards.rb b/db/migrate/20160111071348_static_project_boards.rb
new file mode 100644
index 000000000..4b82be23c
--- /dev/null
+++ b/db/migrate/20160111071348_static_project_boards.rb
@@ -0,0 +1,14 @@
+class StaticProjectBoards < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ puts project.id
+ unless project.boards.first.nil?
+ boards_count = project.boards.first.topics.count
+ project.update_attribute(:boards_count, boards_count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb
new file mode 100644
index 000000000..96c6d7acb
--- /dev/null
+++ b/db/migrate/20160111071411_static_project_issues.rb
@@ -0,0 +1,13 @@
+class StaticProjectIssues < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ unless project.issues.nil?
+ issues_count = project.issues.count
+ project.update_attribute(:issues_count, issues_count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160111071529_static_project_news.rb b/db/migrate/20160111071529_static_project_news.rb
new file mode 100644
index 000000000..f013a929d
--- /dev/null
+++ b/db/migrate/20160111071529_static_project_news.rb
@@ -0,0 +1,13 @@
+class StaticProjectNews < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ unless project.news.nil?
+ news_count = project.news.count
+ project.update_attribute(:news_count, news_count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160111071558_static_project_attachments.rb b/db/migrate/20160111071558_static_project_attachments.rb
new file mode 100644
index 000000000..692ca68eb
--- /dev/null
+++ b/db/migrate/20160111071558_static_project_attachments.rb
@@ -0,0 +1,13 @@
+class StaticProjectAttachments < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ unless project.attachments.nil?
+ attachments_count = project.attachments.count
+ project.update_attribute(:attachments_count, attachments_count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160111080833_add_acts_count_to_project.rb b/db/migrate/20160111080833_add_acts_count_to_project.rb
new file mode 100644
index 000000000..a990302bc
--- /dev/null
+++ b/db/migrate/20160111080833_add_acts_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddActsCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :acts_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb
new file mode 100644
index 000000000..3f07cbb03
--- /dev/null
+++ b/db/migrate/20160111080914_static_project_acts.rb
@@ -0,0 +1,16 @@
+class StaticProjectActs < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ acts = ForgeActivity.where("project_id = ?", project.id)
+ unless acts.blank?
+ count = acts.count
+ puts project.id
+ puts "acts_count is #{count}"
+ project.update_attribute(:acts_count, count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160112085834_create_subfield_subdomain_dirs.rb b/db/migrate/20160112085834_create_subfield_subdomain_dirs.rb
new file mode 100644
index 000000000..0ef66a94c
--- /dev/null
+++ b/db/migrate/20160112085834_create_subfield_subdomain_dirs.rb
@@ -0,0 +1,9 @@
+class CreateSubfieldSubdomainDirs < ActiveRecord::Migration
+ def change
+ create_table :subfield_subdomain_dirs do |t|
+ t.integer :org_subfield_id
+ t.string :name
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20160113023045_add_journals_count_to_project.rb b/db/migrate/20160113023045_add_journals_count_to_project.rb
new file mode 100644
index 000000000..9548f49c4
--- /dev/null
+++ b/db/migrate/20160113023045_add_journals_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddJournalsCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :journals_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160113023137_statics_issue_journal.rb b/db/migrate/20160113023137_statics_issue_journal.rb
new file mode 100644
index 000000000..ef54c04be
--- /dev/null
+++ b/db/migrate/20160113023137_statics_issue_journal.rb
@@ -0,0 +1,12 @@
+class StaticsIssueJournal < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ if !project.project_score.nil? && !project.project_score.issue_journal_num.nil?
+ project.update_attribute(:journals_count, project.project_score.issue_journal_num)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160113024927_statics_repository_commits.rb b/db/migrate/20160113024927_statics_repository_commits.rb
new file mode 100644
index 000000000..66fa896af
--- /dev/null
+++ b/db/migrate/20160113024927_statics_repository_commits.rb
@@ -0,0 +1,19 @@
+class StaticsRepositoryCommits < ActiveRecord::Migration
+ def up
+ g = Gitlab.client
+ Project.all.each do |project|
+ unless project.gpid.nil?
+ begin
+ puts project.id
+ count = g.project(project.gpid).commit_count
+ rescue
+ logger.error("The project's rep is not exit!")
+ end
+ project.update_attribute(:commits_count, count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160113063514_add_messages_count_to_project.rb b/db/migrate/20160113063514_add_messages_count_to_project.rb
new file mode 100644
index 000000000..218ac3cc4
--- /dev/null
+++ b/db/migrate/20160113063514_add_messages_count_to_project.rb
@@ -0,0 +1,5 @@
+class AddMessagesCountToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :boards_reply_count, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160113064153_statics_boards_reply.rb b/db/migrate/20160113064153_statics_boards_reply.rb
new file mode 100644
index 000000000..baf427b10
--- /dev/null
+++ b/db/migrate/20160113064153_statics_boards_reply.rb
@@ -0,0 +1,14 @@
+class StaticsBoardsReply < ActiveRecord::Migration
+ def up
+ Project.all.each do |project|
+ puts project.id
+ unless project.boards.first.nil?
+ messages_count = Message.where("board_id =? and parent_id is not ?", project.boards.first.id, nil).count
+ project.update_attribute(:boards_reply_count, messages_count)
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160113090435_update_forge_and_user_activity.rb b/db/migrate/20160113090435_update_forge_and_user_activity.rb
new file mode 100644
index 000000000..01cedded0
--- /dev/null
+++ b/db/migrate/20160113090435_update_forge_and_user_activity.rb
@@ -0,0 +1,42 @@
+class UpdateForgeAndUserActivity < ActiveRecord::Migration
+ def up
+ user_count = UserActivity.all.count / 30 + 2
+ transaction do
+ for i in 1 ... user_count do i
+ UserActivity.page(i).per(30).each do |user_act|
+ if user_act.act_type == 'Issue'
+ if user_act.act
+ if user_act.act.journals.count > 0
+ user_act.updated_at = user_act.act.journals.maximum("created_on")
+ user_act.save
+ end
+ else
+ user_act.destroy
+ end
+ end
+ end
+ end
+ end
+
+ for_count = ForgeActivity.all.count / 30 + 2
+ transaction do
+ for i in 1 ... for_count do i
+ ForgeActivity.page(i).per(30).each do |for_act|
+ if for_act.forge_act_type == 'Issue'
+ if for_act.forge_act
+ if for_act.forge_act.journals.count > 0
+ for_act.updated_at = for_act.forge_act.journals.maximum("created_on")
+ for_act.save
+ end
+ else
+ for_act.destroy
+ end
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160114022833_add_board_num_to_project_score.rb b/db/migrate/20160114022833_add_board_num_to_project_score.rb
new file mode 100644
index 000000000..4ee56a56b
--- /dev/null
+++ b/db/migrate/20160114022833_add_board_num_to_project_score.rb
@@ -0,0 +1,6 @@
+class AddBoardNumToProjectScore < ActiveRecord::Migration
+ def change
+ add_column :project_scores, :board_num, :integer, :default => false
+ add_column :project_scores, :attach_num, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160114022928_update_project_score.rb b/db/migrate/20160114022928_update_project_score.rb
new file mode 100644
index 000000000..8a632c2bc
--- /dev/null
+++ b/db/migrate/20160114022928_update_project_score.rb
@@ -0,0 +1,61 @@
+class UpdateProjectScore < ActiveRecord::Migration
+ def up
+ project_count = Project.all.count / 30 + 2
+ transaction do
+ for i in 1 ... project_count do i
+ Project.page(i).per(30).each do |project|
+ puts project.id
+ if ProjectScore.where("project_id=?", project.id).first.nil?
+ puts "create project ==>#{project.id}"
+ ProjectScore.create(:project_id => project.id, :score => false)
+ end
+ unless project.project_score.nil?
+ # update boards
+ unless project.boards.first.nil?
+ boards_count = project.boards.first.topics.count
+ project.project_score.update_attribute(:board_num, boards_count)
+ end
+ # update boards reply
+ unless project.boards.first.nil?
+ messages_count = Message.where("board_id =? and parent_id is not ?", project.boards.first.id, nil).count
+ project.project_score.update_attribute(:board_message_num, messages_count)
+ end
+ # update issues
+ unless project.issues.nil?
+ issues_count = project.issues.count
+ project.project_score.update_attribute(:issue_num, issues_count)
+ end
+ # update issue's journal
+ # if !project.project_score.nil? && !project.project_score.issue_journal_num.nil?
+ # project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num)
+ # end
+ # update news
+ unless project.news.nil?
+ news_count = project.news.count
+ project.project_score.update_attribute(:news_num, news_count)
+ end
+ # update attach
+ unless project.attachments.nil?
+ attachments_count = project.attachments.count
+ project.project_score.update_attribute(:attach_num, attachments_count)
+ end
+ # update commits
+ unless project.gpid.nil?
+ g = Gitlab.client
+ begin
+ puts project.id
+ count = g.project(project.gpid).commit_count
+ rescue
+ logger.error("The project's rep is not exit!")
+ end
+ project.project_score.update_attribute(:changeset_num, count)
+ end
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7f6fe7351..105a28280 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20160108024752) do
+ActiveRecord::Schema.define(:version => 20160112085834) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -1226,8 +1226,9 @@ ActiveRecord::Schema.define(:version => 20160108024752) do
t.integer "message_id"
t.integer "viewed"
t.string "content"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.integer "status", :default => 0
end
create_table "org_projects", :force => true do |t|
@@ -1365,6 +1366,8 @@ ActiveRecord::Schema.define(:version => 20160108024752) do
t.integer "documents_num", :default => 0
t.integer "changeset_num", :default => 0
t.integer "board_message_num", :default => 0
+ t.integer "board_num", :default => 0
+ t.integer "attach_num", :default => 0
end
create_table "project_statuses", :force => true do |t|
@@ -1656,6 +1659,13 @@ ActiveRecord::Schema.define(:version => 20160108024752) do
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 "subfield_subdomain_dirs", :force => true do |t|
+ t.integer "org_subfield_id"
+ t.string "name"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "system_messages", :force => true do |t|
t.integer "user_id"
t.string "content"
@@ -1693,6 +1703,10 @@ ActiveRecord::Schema.define(:version => 20160108024752) do
t.string "extra"
end
+ create_table "temp", :id => false, :force => true do |t|
+ t.integer "id", :default => 0, :null => false
+ end
+
create_table "time_entries", :force => true do |t|
t.integer "project_id", :null => false
t.integer "user_id", :null => false
diff --git a/lib/trustie/gitlab/manage_member.rb b/lib/trustie/gitlab/manage_member.rb
index 433b101f5..5c75d9d6e 100644
--- a/lib/trustie/gitlab/manage_member.rb
+++ b/lib/trustie/gitlab/manage_member.rb
@@ -5,6 +5,8 @@ module Trustie
module Gitlab
module ManageMember
+ attr :g
+ include Helper
def self.included(base)
base.class_eval {
before_create :add_gitlab_member
diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js
index 651f33464..72aeacb39 100644
--- a/public/assets/kindeditor/at/config.js
+++ b/public/assets/kindeditor/at/config.js
@@ -23,7 +23,7 @@ var enableAt = function(_editor) {
}
if('undefined' != (typeof id)){
- names = '/at/' + id + '?type='+type;
+ names = '/at/' + id + '.json?type='+type;
}
//var names = ["Jacob","Isabella","Ethan","Emma","Michael","Olivia","Alexander","Sophia","William","Ava","Joshua","Emily","Daniel","Madison","Jayden","Abigail","Noah","Chloe","你好","你你你", "가"];
diff --git a/public/javascripts/org.js b/public/javascripts/org.js
index 1e1951006..636b84baa 100644
--- a/public/javascripts/org.js
+++ b/public/javascripts/org.js
@@ -50,4 +50,28 @@ function show_more_org_course(url){
{page: $("#org_course_page_num").val()},
function (data){}
);
+}
+
+function search_tag_attachment(url,tag_name,q,course_id,sort)
+{
+ //alert("111");
+ //clearTimeout(clickFunction);
+ clickFunction = setTimeout(function() {
+ search_func()
+ }, 500);
+ function search_func(){
+ if(isdb!= false ) return;
+ $.get(
+ url,
+ {
+ tag_name: tag_name,
+ q: q,
+ org_subfield_id:course_id
+ },
+ function (data) {
+
+ }
+ );
+ }
+
}
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index eb3724bf1..ac9b50d0f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -581,7 +581,7 @@ a.homepageImageNumber:hover {color:#269ac9;}
.homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;}
.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
.homepageLeftMenuCoursesLine:hover {background-color:#269ac9;}
-a.coursesLineGrey {padding-left:25px; color:#808080; display:block;}
+a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
a.coursesLineGrey:hover {color:#ffffff;}
.homepageLeftMenuMore {height:18px;}
.homepageLeftMenuMore:hover {background-color:#269ac9;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 2279f0fe5..2ebdcf654 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -18,11 +18,11 @@
.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
a.saveBtn:hover {background-color:#297fb8;}
-.orgMemberList {width:410px; float:left;}
+.orgMemberList {width:460px; float:left;}
.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
-.orgListUser {width:119px; float:left;}
+.orgListUser {width:85px; float:left;}
.orgListRole {width:180px; float:left;}
-.orgMemContainer {width:278px;}
+.orgMemContainer {width:228px;}
.orgMemberAdd {float:right; width:240px;}
.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
.undis {display:none;}
@@ -73,6 +73,7 @@ a.linkGrey8:hover {color:#585858;}
.org_login_list a {color:#269ac9;}
.orgListStatus {width:55px; float:left;}
+.personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;}
.reCon{ margin:5px; width:710px;}
.retop{width:710px; height:40px; background:#eaeaea; padding:5px;}
.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
@@ -107,4 +108,10 @@ div.flash {margin-top :0px !important}
.w80{ width:80px;}
.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
-.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
\ No newline at end of file
+.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
+.researchBox { width:240px; height:24px; border:1px solid #dddddd; color:#666666; outline:none;}
+.blueBtn{ width:60px; height:26px; color:#FFF; border:none; background-color:#269ac9; cursor:pointer; padding-left:0px; text-align:center;}
+.blueBtn:hover {background-color:#298fbd;}
+/*文本描述展开高度*/
+.maxh360 {max-height: 810px;}
+.lh18 { line-height: 18px;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index b90758914..4918ee74f 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -519,7 +519,7 @@ a.homepageImageNumber:hover {color:#15bccf;}
.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
-a.coursesLineGrey {padding-left:25px; color:#15bccf; display:block;}
+a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
a.coursesLineGrey:hover {color:#ffffff;}
.homepageLeftMenuMore {height:18px;}
.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
@@ -1003,4 +1003,4 @@ a:hover.userCancel{border:1px solid #888888; }
.userCard font {display:block; border-width:8px; position:absolute; bottom:-16px; left:110px; border-style:solid dashed dashed dashed; border-color:#FFF transparent transparent transparent; font-size:0; line-height:0;}
.userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;}
.userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;}
-.resourceCopy {padding:0px; margin:0px; width:12px; height:12px; display:inline-block;}
\ No newline at end of file
+.resourceCopy {padding:0px; margin:0px; width:12px; height:12px; display:inline-block;}
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 054b0bf99..b8b624154 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -52,6 +52,7 @@ table.filecontent th.line-num {
-ms-user-select: none;
-webkit-user-select: none;
font-weight:normal;
+ white-space: nowrap;
}
table.filecontent th.line-num a {
text-decoration: none;
diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css
index ea45a8b41..8a4b38b65 100644
--- a/public/stylesheets/share.css
+++ b/public/stylesheets/share.css
@@ -18,6 +18,20 @@ a:hover.userCancel{border:1px solid #888888; }
.userCard {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px; top:-176px; left:-95px; position:absolute; z-index:999; display:none;}
.userCard font {display:block; border-width:8px; position:absolute; bottom:-16px; left:110px; border-style:solid dashed dashed dashed; border-color:#FFF transparent transparent transparent; font-size:0; line-height:0;}
.userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;}
+.userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;}
+.praviteC {background:url(../images/hwork_icon.png) -79px -255px no-repeat;}
+.praviteCP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; left:25px;}
+.publicC {background:url(../images/hwork_icon.png) -79px -125px no-repeat;}
+.publicCP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; left:25px;}
+.shild {background:url(../images/hwork_icon.png) -6px -354px no-repeat;}
+.shildP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; right:0px;}
+ul.shild:hover li ul {display:block;}
+.subNavArrow {background:url(../images/hwork_icon.png) -82px -399px no-repeat; display:inline-block; width:20px; height:20px; position:absolute; top:10px; right:0px;}
+ul.subNavArrow:hover li ul {display:block;}
+.subNavMenu {line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:20px; top:-10px; padding:5px 0px; display:none; z-index:999;}
+.subNavRow {padding:0px 15px; width:70px;}
+.w48 {width:48px;}
+
a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;}
a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;}
.mesType {background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 15px; left:-50px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999; white-space:nowrap;}
@@ -27,4 +41,13 @@ a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; backg
.upload_box{ width:430px; margin:15px auto;}
a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;}
a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 8px; text-align:center;cursor: pointer;}
-.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
\ No newline at end of file
+.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:21px; float:left;}
+
+a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
+
+.mediaIcon {background:url(../images/hwork_icon.png) -5px -160px no-repeat; padding-left:23px;}
+.codeIcon {background:url(../images/hwork_icon.png) -78px -160px no-repeat; padding-left:23px;}
+.othersIcon {background:url(../images/hwork_icon.png) -3px -210px no-repeat; padding-left:23px;}
+.thesisIcon {background:url(../images/hwork_icon.png) -78px -212px no-repeat; padding-left:23px;}
+.softwareIcon {background:url(../images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
\ No newline at end of file
diff --git a/spec/controllers/subfield_subdomain_dirs_controller_spec.rb b/spec/controllers/subfield_subdomain_dirs_controller_spec.rb
new file mode 100644
index 000000000..70160c0f0
--- /dev/null
+++ b/spec/controllers/subfield_subdomain_dirs_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubfieldSubdomainDirsController, :type => :controller do
+
+end
diff --git a/spec/factories/subfield_subdomain_dirs.rb b/spec/factories/subfield_subdomain_dirs.rb
new file mode 100644
index 000000000..3a9878a82
--- /dev/null
+++ b/spec/factories/subfield_subdomain_dirs.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+ factory :subfield_subdomain_dir do
+
+ end
+
+end
diff --git a/spec/models/subfield_subdomain_dir_spec.rb b/spec/models/subfield_subdomain_dir_spec.rb
new file mode 100644
index 000000000..330a35c54
--- /dev/null
+++ b/spec/models/subfield_subdomain_dir_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubfieldSubdomainDir, :type => :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
+ <% end %>
+
+<%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
+
+ <% end %>
+