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

app/views/users/_course_message.html.erb

@@ -98,7 +98,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait mr15"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>

app/views/users/_course_news.html.erb

@@ -69,7 +69,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait mr15"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>

app/views/users/_project_issue.html.erb

@@ -114,7 +114,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait mr15"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" ><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>

app/views/users/_project_message.html.erb

@@ -83,7 +83,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait mr15"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>

app/views/users/_user_programing_attr.html.erb

@@ -29,6 +29,7 @@
   <% end %>
 
   <div class="mt10">
+    <span class="f12 c_red db mt5 fl">温馨提示：您可以在发布作业后，在作业“模拟答题”中进行标准代码的检测和提交。</span>
     <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
     <div class="cl"></div>
   </div>

public/stylesheets/new_user.css

@@ -588,6 +588,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:33px;}
+.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}