Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/layouts/static_base.html.erb

@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify','css/project', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>

public/500.html

@@ -67,21 +67,8 @@
                 <img src="/images/404/pic_500.jpg" >
                 <p class="pages_new_404_txt" style="margin-top: 40px;">网站正在维护，请稍后重试。
                     <a href="javascript:history.back()" id="history_back" class="linkBlue2 mr10">返回上页>></a>
-                    <a href="javascript:void(0)" class="linkBlue2 mr10" onclick="$('#feedback_div').toggle();"> 给我留言>></a>
                     <a href="http://shang.qq.com/wpa/qunwpa?idkey=064e805dac955b8aea158c4b0dd3f033b8841bcee175fd619613f0e4ac4d8151" target="_blank" class="linkBlue2">QQ反馈>></a>
                 </p>
-
-                <div style="display:none; margin-top: 10px;" id="feedback_div">
-                    <% get_memo %>
-                    <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-                    <%= f.text_area :subject, :id=>"subject", :style => "width: 570px;", :class => "feedbackText mb5", :placeholder => "请在此输入平台的问题和建议，您也可以通过QQ留言，谢谢！" %>
-                    <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-                    <span class="c_grey fl">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>
-                    <a href="javascript:void(0);" class="sy_btn_blue_mini f12 fr mr10" onclick="$('#new_memo').submit();">留&nbsp;&nbsp;言</a>
-                    <a href="javascript:void(0);" class="sy_btn_grey_mini f12 fr mr10" onclick="$('#feedback_div').hide();">取&nbsp;&nbsp;消</a>
-                    <div class="cl"></div>
-                    <% end %>
-                </div>
             </div>
         </div>
 	</body>

public/stylesheets/css/common.css

@@ -730,57 +730,7 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
 
 #popupWrap ul{cursor: default;}
 
-.bg_checked{background-color: #64bdd9;}
/* 缺陷列表 */
+.bg_checked{background-color: #64bdd9;}
-.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 #c8c8c8; }
-#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/new_project/arrow.png") no-repeat scroll right center transparent;}
-.issues_form_filter select.my_issues_filter{ background:none; width:50px; margin-left: 10px;margin-right: 10px;}
-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") -29px 9px 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:260px;  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/new_project/icons_issue.png") 0 0 no-repeat;}
-.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -30px no-repeat;}
-.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("/images/new_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: 50px; line-height: 50px;  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; }

public/stylesheets/css/courses.css

@@ -548,7 +548,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 #worksDescription p {word-wrap:break-word;}
 
 /*20160907作业详情更改*/
-.homework-type-option {border:1px solid #d9d9d9; width:128px; height:28px; color:#888; font-size:14px;}
+.homework-type-option {border:1px solid #d9d9d9; width:138px; height:28px; color:#888; font-size:14px;}
 .homework-detail-tab {font-size:14px; color:#484848; overflow:hidden;}
 .homework-detail-tab li {float:left; width:100px; text-align:center; padding:3px 0; border-bottom:2px solid #ddd;}
 .homework-detail-tab li.selected {border-bottom:2px solid #f00;}

public/stylesheets/css/project.css

@@ -742,14 +742,15 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
 .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/new_project/arrow.png") no-repeat scroll right center transparent;}
+.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; }
+.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_con_list{border:1px solid #c8c8c8; }
 #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;}
@@ -764,12 +765,13 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
 .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/new_project/arrow.png") no-repeat scroll right center transparent;}
+.issues_form_filter select.my_issues_filter{ background:none; width:50px; margin-left: 10px;margin-right: 10px;}
 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_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px 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.issues_list_title{ color:#444; max-width:260px;  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/new_project/icons_issue.png") 0 0 no-repeat;}
@@ -778,10 +780,9 @@ a:hover.issues_list_title{color:#3b94d6;}
 .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{ height: 50px; line-height: 50px;  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;padding-right: 25px;}