<%= render :partial => 'layouts/base_project_top' %>
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 8944fad0c..5ad1a159b 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -52,7 +52,7 @@ zh:
label_agree_join_project: 同意加入
label_apply_project: "+加入"
- label_button_following: "+添加关注"
+ label_button_following: "添加关注"
label_exit_project: 退出项目
label_apply_project_waiting: 已处理申请，请等待管理员审核
label_member_of_project: 该用户已经是项目成员了！
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 44b607b3b..71902786a 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -894,4 +894,294 @@ a.sy_btn_pink{
-o-border-radius:3px;
border-radius:3px;
}
-a:hover.sy_btn_pink{ background: #e64c4c;}
\ No newline at end of file
+a:hover.sy_btn_pink{ background: #e64c4c;}
+
+/*20161009新项目*/
+
+
+/* 按钮 复制课程大纲*/
+a.btn_orange_big{
+ display: inline-block;
+ border: 1px solid #ee4a1f;
+ color: #ee4a1f;
+ text-align: center;
+ font-size: 14px;
+ padding:0 10px;
+ height: 30px;
+ line-height: 30px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ -o-border-radius:3px;
+ border-radius:3px;
+}
+a:hover.btn_orange_big{
+ background: #ee4a1f;
+ color: #fff;
+}
+a.btn_green_big{
+ display: inline-block;
+ border: 1px solid #60b25e;
+ color: #60b25e;
+ text-align: center;
+ font-size: 14px;
+ padding:0 10px;
+ height: 30px;
+ line-height: 30px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ -o-border-radius:3px;
+ border-radius:3px;
+}
+a:hover.btn_green_big{
+ background: #60b25e;
+ color: #fff;
+}
+a.sy_btn_green{
+ display: inline-block;
+ color: #fff;
+ background: #60b25e;
+ text-align: center;
+ font-size: 12px;
+ padding:0 15px;
+ height: 30px;
+ line-height: 30px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ -o-border-radius:3px;
+ border-radius:3px;
+}
+a:hover.sy_btn_green{ background: #51a74f;}
+a.sy_btn_grey{
+ display: inline-block;
+ color: #333;
+ background: #e1e1e1;
+ text-align: center;
+ font-size: 12px;
+ padding:0 15px;
+ height: 30px;
+ line-height: 30px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ -o-border-radius:3px;
+ border-radius:3px;
+}
+a:hover.sy_btn_grey{ background: #c3c3c3;}
+a.sy_btn_blue{
+ display: inline-block;
+ color: #fff;
+ background: #3b94d6;
+ text-align: center;
+ font-size: 12px;
+ padding:0 15px;
+ height: 30px;
+ line-height: 30px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ -o-border-radius:3px;
+ border-radius:3px;
+}
+a:hover.sy_btn_blue{ background: #2788d0;}
+a.hw_btn_blue{
+ display: inline-block;
+ color: #3b94d6;
+ border:1px solid #3b94d6;
+ background:#fff;
+ text-align: center;
+ font-size: 12px;
+ padding:0 15px;
+ height: 30px;
+ line-height: 30px;
+ -webkit-border-radius:3px;
+ -moz-border-radius:3px;
+ -o-border-radius:3px;
+ border-radius:3px;
+}
+a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
+
+/* 缺陷列表 */
+.issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; }
+.issues_greycirbg_btn:hover{background-color:#cbcbcb;}
+input:focus,select:focus{ border:none;outline:medium;border-right:none;}
+.issues_con{ width:718px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; }
+.issues_statistics{ line-height:35px;}
+.issues_statistics ul li{ float:left; }
+.issues_statistics ul li a{ font-size:12px; margin:5px; color:#888; }
+.issues_statistics ul li a.act{}
+
+.issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;}
+.issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;}
+.issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;}
+.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;}
+input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
+.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background:url("../images/public_icon.png") -29px 9px no-repeat; }
+/* 缺陷Tab */
+.issues_con_list{border:1px solid #dbdbdb; }
+#issues_list_nav {border-bottom:1px solid #d0d0d0;}
+#issues_list_nav li {float:left; padding:10px 15px; text-align:center; }
+#issues_list_nav li a{font-size:12px; color:#444;}
+.issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; }
+.issues_nav_nomall {border-bottom:none; }
+.issues_nav_tag{ background-color:#eaeaea; padding:2px 8px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;}
+.undis {display:none;}
+.dis {display:block;}
+.issues_form_filter{ position: absolute; top:0; right: 0;}
+.issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; padding-right:10px;}
+.issues_form_filter select.issues_filter_select_min{width:50px; }
+.issues_form_filter select:focus,.issues_form_filter input:focus{border:none; }
+.issues_filter_data input{height:28px;width:91px; border:1px solid #c8c8c8;background-color:#fff;}
+.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;}
+input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
+.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -27px 7px no-repeat; }
+
+.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #c8c8c8;}
+.issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;}
+a.issues_list_title{ color:#444; max-width:380px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; }
+a:hover.issues_list_title{color:#3b94d6;}
+.issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; }
+.issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("../images/project/icons_issue.png") 0 0 no-repeat;}
+.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -30px no-repeat;}
+.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -57px no-repeat; }
+.issues_list_name{ font-size: 12px;}
+.issues_list_name:hover{ color: #3b94d6;}
+.issues_list_small{ font-size: 12px; color: #666;}
+.issues_list_txt li{ height: 24px; line-height: 24px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;}
+.issues_list_txt li.issues_list_min{ width: 50px;}
+
+
+/* 搜索 与课程相同 */
+.hw_search_box{ position:relative; }
+.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;}
+.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;}
+.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}
+.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;}
+/* 编辑删除 与课程相同 */
+.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; }
+.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;}
+.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; }
+.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;}
+/* 翻页 与课程相同*/
+.pages a{
+ display:block;
+ border:1px solid #d1d1d1;
+ color:#888;
+ float:left;
+ width:30px;
+ text-align:center;
+ padding:3px 0;
+ line-height:1.9;
+ margin-right:5px;
+}
+.pages a:hover{
+ background-color:#3b94d6;
+ border:1px solid #3b94d6;
+ color:#fff;
+}
+a.pages-big{
+ width:50px;
+}
+.pages .active{
+ background-color:#3b94d6;
+ border:1px solid #3b94d6;
+ color:#fff;
+}
+.pages{
+ width:330px;
+
+ margin:20px auto 10px;
+}
+.sy_corange{ color: #ee4a1f;}
+.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;}
+.sy_cgrey{ color: #888;}
+a.sy_cgrey{ color: #888;}
+.sy_corange{ color: #ee4a1f;}
+a.sy_corange{ color: #ee4a1f;}
+a.sy_cblue{ color: #3b94d6;}
+
+/* 我的缺陷列表*/
+.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; }
+.myissues_head{ width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; }
+.myissues_head h2{ font-size: 14px;}
+select.issues_filter_active { font-weight: bold; color: #333;}
+.issues_form_filter select.issues_filter_select_min02{width:60px; }
+.issues_form_filter select.issues_filter_select_max{width:100px; padding-left:20px;}
+.issues_list_txt li.issues_list_max{ width:100px; }
+
+/* 新建缺陷*/
+.pro_new_con{width: 1000px;}
+.pro_new_conbox_left{ padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; width: 718px;}
+.pro_new_conbox_right{ padding:15px; border:1px solid #ddd; background-color:#fff; width: 208px;}
+.pro_newissue_con input{ border:1px solid #c8c8c8; height: 28px; width: 200px; color: #888;}
+.pro_newissue_con input.input_min{ width: 175px; }
+.pro_newissue_con select{ border:1px solid #c8c8c8; height: 30px; width: 208px; color: #888;}
+.pro_new_conbox_left li,.pro_new_conbox_right li{ margin-bottom: 10px;}
+.pro_new_conbox_left li:last-child,.pro_new_conbox_right li:last-child{ margin-bottom: 0px;}
+.pro_new_conbox_left label{width: 100px; text-align: right; display: inline-block;}
+input.pro_newissue_con_check{ width: 15px; height: 15px;}
+.pro_new_conbox_leftspan{ width: 70px; text-align: right; display: block;}
+.pro_new_conbox_rightspan{ width: 125px; text-align: left; display: block; color: #666;}
+.pro_new_conbox_right li{ margin-bottom: 10px;}
+
+/* 新版项目头部*/
+.pro_new_top {padding-top:15px; border:1px solid #ddd; background-color:#fff; width: 998px;}
+.icons_newpro_lock{width: 22px; height: 23px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -113px no-repeat;}
+.pro_new_name{width: 600px; }
+.pro_new_name a { font-size: 24px; color: #3b94d6; line-height: 24px;}
+.pro_new_name a:hover{ color: #2783c7;}
+a.pro_new_proname{ width: 150px; overflow: hidden;white-space: nowrap;text-overflow:ellipsis;}
+a.pro_new_topbtn{ padding: 3px 7px; font-size: 12px; line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd; border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;}
+a.pro_new_topbtn_left { padding: 3px 10px; font-size: 12px;line-height: 20px; background-image: linear-gradient(#fcfcfc, #eee); border: 1px solid #d5d5d5;border-radius: 3px;border-top-right-radius: 0;border-bottom-right-radius: 0; color: #333; }
+a:hover.pro_new_topbtn_left{background-image: linear-gradient(#ededed, #dddddd);}
+.pro_new_topnav ul{border-bottom: 3px solid #ddd; height: 30px; line-height: 30px;}
+.pro_new_topnav ul li{ float: left; width: 110px; height: 30px; line-height: 30px;text-align: center; }
+.pro_new_topnav ul li:hover{border-bottom: 3px solid #3b94d6;}
+.pro_new_topnav_active{border-bottom: 3px solid #3b94d6; }
+/* 翻页 新版缺陷列表*/
+.pages_right a{ display: inline-block;border:1px solid #d1d1d1; color:#888; float:left;text-align:center; padding:3px 10px; line-height:1.9; margin-right:5px; }
+.pages_right a:hover,.pages_right a.active{ background-color:#3b94d6; border:1px solid #3b94d6;color:#fff;}
+.pages_right{ margin: 10px 5px 10px 0; }
+.btn_newpro_grey{display: inline-block;color: #7b7b7b; border:1px solid #dbdbdb;background:#fff;text-align: center;font-size: 12px; padding:0 15px; height:24px; line-height: 24px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px;}
+a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
+
+/*缺陷统计表格*/
+.sy_new_table{ width:100%; background:#fff; border:1px solid #e5e5e5; border-bottom: none; text-align: center;}
+.sy_new_table thead tr,.sy_new_table tbody tr{ height:40px; line-height:40px; border-bottom:1px solid #e5e5e5;}
+.sy_new_table thead tr td{ border-bottom:1px solid #e5e5e5; font-weight: bold; background-image: linear-gradient(#fcfcfc, #eee);}
+.sy_new_table tbody tr:hover{ background:#f5f5f5;}
+.sy_new_table tbody tr td{ height:40px; line-height:40px; border-bottom:1px solid #e5e5e5; color:#888;}
+/*项目简介*/
+.pro_new_info{ border:1px solid #ddd; background-color:#fff; width: 998px;}
+.pro_new_info h2{ background: #eee; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px;}
+.pro_new_info p{ padding:15px; color: #666;}
+.pro_new_info_weight{ font-size: 16px; font-weight: bold;}
+/* 新版项目配置*/
+.pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;}
+.pro_new_setting_leftnav ul li a{ display: block; height: 40px; line-height: 40px; border-bottom:3px solid #fff; text-align: center; width:162px;}
+.pro_new_setting_leftnav ul li a:hover,.pro_new_setting_leftnav .active{ color: #3b94d6; background: #f3faff; }
+.pro_new_setting_conbox{ background: #fff; width: 818px; border:1px solid #ddd; padding-top: 15px;}
+.pro_new_setting_conbox input,.pro_new_setting_conbox select{ border:1px solid #c8c8c8; height: 28px; color: #888;}
+.pro_new_setting_conbox label{width: 100px; text-align: right; display: inline-block;}
+.w690{width: 690px; }
+.pro_new_upimg{ width: 60px; height: 58px; border:1px solid #ddd; padding:1px;}
+.pro_newsetting_title{ font-size: 14px; color: #3b94d6;}
+/*新版项目配置使用课程教师团队代码*/
+.sy_new_tablebox{ padding:15px; }
+.sy_new_table{ width:100%; background:#fff; border:1px solid #e5e5e5; border-bottom: none; }
+.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 th{ height:40px; line-height:40px; border-bottom:1px solid #e5e5e5; font-weight:normal; color:#888;}
+.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;width:120px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+.mt12{ margin-top:12px;}
+.pro_new_idbox{ width: 40%; padding-left: 30px;}
+.pro_new_idlist{ width: 50%; border-right: 1px solid #e5e5e5; padding-right: 30px;}
+.pro_new_idname{display:block;width:340px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+.sy_new_tchbox p{ line-height: 30px;}
+.pro_newsetting_con p,.pro_newsetting_con { line-height: 30px;}
+.w650{ width: 650px;}
+.pro_new_prompt{ border:1px solid #f6d0b1; padding:10px; background: #fff9e9; color: #ee4a20; text-align: center;}
+p.pro_new_grey{ line-height: 1.9; }
\ No newline at end of file