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

app/models/mailer.rb

@@ -186,7 +186,7 @@ class Mailer < ActionMailer::Base
     @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT jfm.* from journals_for_messages jfm, members m, courses c
      where m.user_id = '#{user.id}' and c.id = m.course_id and jfm.jour_id = c.id
      and jfm.jour_type='Course' and (jfm.created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
-
+    
     @user_journal_messages = user.journals_for_messages.where("jour_type='Principal' and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
 
     # 查询user在项目中留言（用户反馈）

app/views/issues/_edit.html.erb

@@ -5,7 +5,7 @@
     <% if @edit_allowed || !@allowed_statuses.empty? %>
         <div id="all_attributes" style="display:none;">
           <%= render :partial => 'form', :locals => {:f => f} %>
-          <div class="ping_C mb10"></div>
+          <div class="ping_C mb10 ml10"></div>
           <!--<a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">-->
             <!--<%#= l(:button_submit) %>-->
           <!--</a>-->

app/views/issues/_history.html.erb

@@ -3,9 +3,9 @@
 <!-- modified by bai -->
 <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>" style=" word-wrap: break-word; word-break: break-all">
 <!-- end -->
-  <div class="ping_C mb10">
+  <div class="ping_C mb10 ml10">
     <div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(journal.user), :class => "ping_dispic",:width => 46,:height => 46) %></a></div>
-    <div class="ping_discon">
+    <div class="ping_discon" style="width: 600px;">
       <div class="ping_distop">
         <a href="#" target="_blank" class="c_blue fb fl mb10 "><%= journal.user %></a><span class="c_grey fr"><%= format_time journal.created_on %></span>
         <div class="cl"></div>