+ <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
+
+ <% elsif works.nil? %>
+
+ <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+
+ <% end %>
+<% end %>
+
+ <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 2, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+
+<% end %>
+<% if activity.homework_type == 2 && is_teacher%>
+
+ <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+
+ <% if activity.homework_detail_manual.comment_status != 0 %>
+
+ <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework: activity.id, course_id: activity.course.id), class: 'c_blue test-program-btn',:remote => true %>
+
+ <% end %>
+<% end %>
+<% if activity.homework_type == 2%>
+
+ 分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_homework_post_reply.html.erb b/app/views/users/_homework_post_reply.html.erb
new file mode 100644
index 000000000..0037e35ac
--- /dev/null
+++ b/app/views/users/_homework_post_reply.html.erb
@@ -0,0 +1,34 @@
+<% count=activity.journals_for_messages.count %>
+
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :hw_status => hw_status} %>
+
+ <% comments = activity.journals_for_messages.reorder("created_on desc").limit(3) %>
+ <% if count > 0 %>
+
+ <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :hw_status => hw_status, :is_teacher => is_teacher, :user_activity_id => user_activity_id, :activity_id => activity.id} %>
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
+
+ <% if User.current.logged? %>
+
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
+ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+ <%= hidden_field_tag 'hw_status',params[:hw_status],:value =>hw_status %>
+
+
+
发送
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
+
+
+
+
+
- <% if activity.class.to_s == 'HomeworkCommon' && is_in_course == -1 %>
-
- 展开更多
-
- <% elsif activity.class.to_s == 'HomeworkCommon' %>
-
+ <% if activity.class.to_s == 'HomeworkCommon' %>
+
展开更多
<% elsif activity.class.to_s == 'Message' %>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 8752de30b..b6689851b 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -5,9 +5,8 @@
<% if @type == 'HomeworkCommon' %>
<%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
-
>
+
>
>
-
>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 5c6f07bb1..4770bf408 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -51,7 +51,7 @@
<% hidden_courses = Setting.find_by_name("hidden_courses") %>
<% unvisiable = hidden_courses && hidden_courses.value == "1"%>
<% if !unvisiable %>
- <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %>
+ <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:hw_status => 1} %>
<% end %>
<%# end %>
<% when 'News' %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 6f1fb7843..3351ae3f2 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -50,7 +50,7 @@
<% work = cur_user_works_for_homework homework_common %>
<% if !is_teacher && !work.nil? && homework_common.end_time < Date.today && work.user == User.current %>
- <%=link_to "追加附件", student_work_index_url_in_org(homework_common.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+ <%=link_to "追加附件", student_work_index_url_in_org(homework_common.id, 2, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
<% end %>
<% if homework_common.homework_type == 2 && is_teacher%>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index f7669047c..5f37f54ac 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -26,15 +26,10 @@
}
}
- <%= render :partial => 'users/user_homework_detail', :locals => {:homework_common => homework_common,:is_in_course => is_in_course} %>
+ <%= render :partial => 'users/course_homework', :locals => {:activity => homework_common, :user_activity_id =>homework_common.id, :hw_status => 3} %>
<% end%>
<% if homework_commons.count == 10%>
- <% if is_in_course == 1%>
-
- <%#= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
- <% else%>
-
- <%= link_to "点击展开更多",student_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
- <% end%>
+
+ <%#= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
<% end%>
diff --git a/app/views/users/_user_homeworks_old.html.erb b/app/views/users/_user_homeworks_old.html.erb
deleted file mode 100644
index 59ec24ad3..000000000
--- a/app/views/users/_user_homeworks_old.html.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-<% if @is_teacher%>
-
-
- <% homework = HomeworkCommon.new %>
- <% homework.homework_detail_manual = HomeworkDetailManual.new%>
- <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
-
- <%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
-
- <% end%>
-
-<% end%>
-
-<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0,:is_in_course => 0} %>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index 5f60c754c..7060a7b1c 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -1,5 +1,5 @@
<% if params[:type] == 'HomeworkCommon' %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :type => @type, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id, :activity_id => params[:id].to_i}) %>');
+$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :type => @type, :hw_status =>@hw_status, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id, :activity_id => params[:id].to_i}) %>');
<% elsif params[:type] == 'JournalsForMessage' %>
$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id =>params[:id].to_i}) %>');
<% elsif params[:type] == 'Message' %>
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index 00be899cc..ab41b1ae6 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -31,12 +31,11 @@
<% elsif @user && @jours_count%>
$('#jour_count').html("<%= @jours_count %>");
<% elsif @homework%>
- <% if @user_activity_id == -1 %>
- $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
- sd_create_editor_from_data(<%= @homework.id%>,"","100%");
+ $("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework, :user_activity_id => @user_activity_id, :hw_status => @hw_status, :is_teacher => @is_teacher}) %>");
+ <% if @user_activity_id != @homework.id %>
+ sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
<% else %>
- $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
- sd_create_editor_from_data(<%= @user_activity_id%>,"","100%");
+ sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
<% end %>
<% end %>
var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
diff --git a/app/views/words/leave_homework_message.js.erb b/app/views/words/leave_homework_message.js.erb
index acb16be50..f6a89323f 100644
--- a/app/views/words/leave_homework_message.js.erb
+++ b/app/views/words/leave_homework_message.js.erb
@@ -1,7 +1,6 @@
-<% if @user_activity_id %>
- $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
- sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
-<% elsif @homework_common_id && @is_in_course %>
- $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
- sd_create_editor_from_data(<%= @homework_common_id%>,"","100%", "HomeworkCommon");
-<% end %>
+$("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework_common, :user_activity_id => @user_activity_id, :hw_status => @hw_status, :is_teacher => @is_teacher}) %>");
+<% if @user_activity_id != @homework_common.id %>
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
+<% else %>
+sd_create_editor_from_data(<%= @homework_common.id%>,"","100%", "<%=@homework_common.class.to_s%>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/words/reply_to_homework.js.erb b/app/views/words/reply_to_homework.js.erb
index 7da72fa54..f6a89323f 100644
--- a/app/views/words/reply_to_homework.js.erb
+++ b/app/views/words/reply_to_homework.js.erb
@@ -1,7 +1,6 @@
-<% if @user_activity_id != -1 %>
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+$("#homework_post_reply_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/homework_post_reply', :locals => {:activity => @homework_common, :user_activity_id => @user_activity_id, :hw_status => @hw_status, :is_teacher => @is_teacher}) %>");
+<% if @user_activity_id != @homework_common.id %>
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
<% else %>
-$("#homework_common_<%= @homework_common.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
-sd_create_editor_from_data(<%= @homework_common.id%>,"","100%", "HomeworkCommon");
+sd_create_editor_from_data(<%= @homework_common.id%>,"","100%", "<%=@homework_common.class.to_s%>");
<% end %>
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 792ff35fd..4040edcc8 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -369,7 +369,7 @@ zh:
label_input_email: 请输入邮箱地址
label_invite_trustie_user: "邀请Trustie注册用户"
- label_invite_trustie_user_tips: "支持姓名、邮箱、登录名搜索！"
+ label_invite_trustie_user_tips: "支持姓名、邮箱、登录名搜索"
label_user_role_null: 用户和角色不能留空！
label_invite_project: 邀请您加入项目
label_mail_invite_success: 您已成功加入项目！
diff --git a/config/routes.rb b/config/routes.rb
index afe30d4de..d3700bb73 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1140,6 +1140,7 @@ RedmineApp::Application.routes.draw do
post 'update_base_info'
get 'delete_syllabus'
get 'delete_des'
+ get 'members'
end
collection do
@@ -1147,6 +1148,16 @@ RedmineApp::Application.routes.draw do
end
end
+ resources :syllabus_member do
+ member do
+ post 'update_rank'
+ end
+
+ collection do
+ get 'syl_member_autocomplete'
+ end
+ end
+
# add by nwb
# 课程路由设置
resources :courses do
diff --git a/db/migrate/20160921062340_create_syllabus_members.rb b/db/migrate/20160921062340_create_syllabus_members.rb
new file mode 100644
index 000000000..c2e76ee3f
--- /dev/null
+++ b/db/migrate/20160921062340_create_syllabus_members.rb
@@ -0,0 +1,23 @@
+class CreateSyllabusMembers < ActiveRecord::Migration
+ def change
+ create_table :syllabus_members do |t|
+ t.integer :rank
+ t.references :syllabus
+ t.references :user
+
+ t.timestamps
+ end
+ add_index :syllabus_members, :syllabus_id
+ add_index :syllabus_members, :user_id
+ add_index :syllabus_members, :rank
+
+ count = Syllabus.all.count / 30 + 2
+ transaction do
+ for i in 1 ... count do i
+ Syllabus.page(i).per(30).each do |syllabus|
+ SyllabusMember.create(:user_id => syllabus.user_id, :syllabus_id => syllabus.id, :rank => 1)
+ end
+ end
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 443e8c426..d8a60c93f 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 => 20160907080621) do
+ActiveRecord::Schema.define(:version => 20160921062340) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -56,10 +56,10 @@ ActiveRecord::Schema.define(:version => 20160907080621) do
t.integer "user_id"
t.integer "applied_id"
t.string "applied_type"
- t.integer "viewed"
- t.integer "status"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.integer "viewed", :default => 0
+ t.integer "status", :default => 0
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "name"
t.integer "applied_user_id"
t.integer "role"
@@ -157,13 +157,13 @@ ActiveRecord::Schema.define(:version => 20160907080621) do
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 "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.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"
@@ -173,7 +173,6 @@ ActiveRecord::Schema.define(:version => 20160907080621) do
t.integer "quotes"
t.integer "is_publish", :default => 1
t.date "publish_time"
- t.boolean "init_file", :default => false
end
add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
@@ -311,16 +310,14 @@ ActiveRecord::Schema.define(:version => 20160907080621) do
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.integer "repository_id", :null => false
+ t.string "revision", :null => false
t.string "committer"
- t.datetime "committed_on", :null => false
+ t.datetime "committed_on", :null => false
t.text "comments"
t.date "commit_date"
t.string "scmid"
t.integer "user_id"
- t.integer "project_id"
- t.integer "type", :default => 0
end
add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -1881,6 +1878,9 @@ ActiveRecord::Schema.define(:version => 20160907080621) do
t.datetime "updated_at", :null => false
end
+ add_index "student_works_scores", ["student_work_id"], :name => "student_work_id"
+ add_index "student_works_scores", ["user_id"], :name => "user_id"
+
create_table "students_for_courses", :force => true do |t|
t.integer "student_id"
t.integer "course_id"
@@ -1923,6 +1923,18 @@ ActiveRecord::Schema.define(:version => 20160907080621) do
t.datetime "updated_at", :null => false
end
+ create_table "syllabus_members", :force => true do |t|
+ t.integer "rank"
+ t.integer "syllabus_id"
+ t.integer "user_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ add_index "syllabus_members", ["rank"], :name => "index_syllabus_members_on_rank"
+ add_index "syllabus_members", ["syllabus_id"], :name => "index_syllabus_members_on_syllabus_id"
+ add_index "syllabus_members", ["user_id"], :name => "index_syllabus_members_on_user_id"
+
create_table "syllabuses", :force => true do |t|
t.string "title"
t.text "description"
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index aeb9e645a..b74d8b71e 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1459,7 +1459,7 @@ function expand_blog_comment_reply(container, btnid, id, type, div_id, homepage)
}
}
-function expand_reply_homework(container, btnid, id, type, div_id, is_in_course, course_activity, user_activity_id) {
+function expand_reply_homework(container, btnid, id, type, div_id, hw_status, user_activity_id) {
var target = $(container);
var btn = $(btnid);
if (btn.data('init') == '0') {
@@ -1470,8 +1470,7 @@ function expand_reply_homework(container, btnid, id, type, div_id, is_in_course,
type: type,
id: id,
div_id: div_id,
- is_in_course: is_in_course,
- course_activity: course_activity,
+ hw_status: hw_status,
user_activity_id: user_activity_id
},
function(data) {
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 8f6c56a4b..a2117bdf3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -130,7 +130,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
/*作业信息*/
.mt-2 {margin-top:-2px;}
-.homeworkInfo {background:#F6F6F6; padding:10px; margin-bottom:10px;}
+.homeworkInfo {background:#F6F6F6; padding:10px;}
.homeworkDetail {line-height:18px; font-size:12px; color:#484848; overflow:hidden;}
.homeworkDetail p,.homeworkDetail div,.homeworkDetail em, .homeworkDetail span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
.max_h54 {max-height:54px; }
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index 1841e0348..eccbcc9b1 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -249,7 +249,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
.StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: left;height: 40px;}
/*作业信息*/
-.homeworkInfo {background:#F6F6F6; padding:10px; margin-bottom:10px;}
+.homeworkInfo {background:#F6F6F6; padding:10px;}
.homeworkDetail {line-height:18px; font-size:12px; color:#484848; overflow:hidden;}
.homeworkDetail p,.homeworkDetail div,.homeworkDetail em, .homeworkDetail span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
.homeworkState {padding:3px 5px; background-color:#28be6c; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 9aac34eae..1a04c73a5 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -617,3 +617,20 @@ a:hover.sy_class_ltitle{ color:#333;}
/* 我的作业 */
.hw_classname{ width:180px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px; border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; }
+
+/*20160918教师团队*/
+.sy_new_tablebox{ padding:15px; padding-bottom:none;}
+.sy_new_table{ width:100%; background:#fff; border:1px solid #e5e5e5; padding-bottom:30px;}
+.sy_new_table thead tr{ height:40px; line-height:40px;}
+.sy_new_table thead tr th{ border-bottom:1px solid #e5e5e5;}
+.sy_new_table tbody tr:hover{ background:#f5f5f5;}
+.sy_new_table tbody tr td{ height:40px; line-height:40px; border-bottom:1px dashed #e5e5e5; font-weight:normal; color:#888; text-align: center}
+.sy_new_table tbody tr:last-child{ height:40px;}
+.sy_new_tchlist li{ height:30px; line-height:30px;}
+.sy_new_search{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:370px;box-shadow: inset 0px 0px 3px #dcdcdc; }
+.sy_new_tchbox{ background:#f5f5f5; padding:15px; margin:15px; margin-top:0px;}
+.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;}
+.sy_new_namebox{ width:180px; overflow:hidden;}
+.sy_new_name{ display:block;max-width:120px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+.sy_new_long_name{ display:block;width:180px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+.mt12{ margin-top:12px;}
diff --git a/spec/controllers/syllabus_member_controller_spec.rb b/spec/controllers/syllabus_member_controller_spec.rb
new file mode 100644
index 000000000..b56654f55
--- /dev/null
+++ b/spec/controllers/syllabus_member_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SyllabusMemberController, :type => :controller do
+
+end
diff --git a/spec/factories/syllabus_members.rb b/spec/factories/syllabus_members.rb
new file mode 100644
index 000000000..ab1bd6701
--- /dev/null
+++ b/spec/factories/syllabus_members.rb
@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :syllabus_member do
+ rank 1
+ syllabus nil
+ user nil
+ end
+end
diff --git a/spec/models/syllabus_member_spec.rb b/spec/models/syllabus_member_spec.rb
new file mode 100644
index 000000000..464c1e965
--- /dev/null
+++ b/spec/models/syllabus_member_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SyllabusMember, :type => :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end