Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/admin/messages.html.erb

@@ -12,7 +12,7 @@
         <p id="content_notice_span" class="ml55"></p>
       </div>
       <div class="actions">
-        <%= link_to l(:label_submit), "javascript:void(0)",:class => "small", :onclick => "system_message_editor.sync();submit_message();" %>
+        <%= link_to l(:label_submit), "javascript:void(0)", :class => "btn_message_free", :onclick => "system_message_editor.sync();submit_message();" %>
       </div>
   <% end %>
 </div>

app/views/users/user_messages.html.erb

@@ -99,7 +99,7 @@
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
-                <% if ma.course_message_type == "HomeworkCommon" %>
+                <% if ma.course_message_type == "HomeworkCommon" &&  ma.status != 1 %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了作业：</span></li>

public/stylesheets/application.css

@@ -2809,4 +2809,5 @@ img.school_avatar {
     max-width: none;
 }
 
-.admin_message_warn{font-size: 12px;color: red;}
+.admin_message_warn{font-size: 12px;color: red;}
+a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;}

public/stylesheets/new_user.css

@@ -680,6 +680,8 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 /*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; border: none;}
+.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
+.AgreementImg{margin: 0px auto; width: 820px;}
 
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/

public/stylesheets/public.css

@@ -19,7 +19,7 @@ table{ background:#fff;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat;}
-
+a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
 h3{ font-size:14px; color:#e8770d;}
@@ -536,5 +536,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 }
 
 .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; border: none;}
 .AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
 .AgreementImg{margin: 0px auto; width: 820px;}

public/stylesheets/public_new.css

@@ -789,3 +789,9 @@ div.flash.warning, .conflict {
 /*消息铃铛样式*/
 .navHomepageNews {width:30px; display:block; float:right; margin-top:4px; position:relative; margin-right: 8px;}
 .newsActive {width:6px; height:6px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:20px; top:8px;z-index:999}
+
+/*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; border: none;}
+.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
+.AgreementImg{margin: 0px auto; width: 820px;}