mail

app/models/journal_observer.rb

@@ -24,9 +24,9 @@ class JournalObserver < ActiveRecord::Observer
           (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
         )
              ##by senluo
-      thread4=Thread.new do
+ #     thread4=Thread.new do
         Mailer.issue_edit(journal).deliver
-      end
+  #    end
     end
   end
 end

app/models/journals_for_message_observer.rb

@@ -1,7 +1,9 @@
 # Added by young
 class JournalsForMessageObserver < ActiveRecord::Observer
   def after_create(journals_for_message)
+    thread4=Thread.new do
     Mailer.journals_for_message_add(User.current, journals_for_message).deliver
+    end
   end
 end
 

app/models/mailer.rb

@@ -31,7 +31,7 @@ class Mailer < ActionMailer::Base
   #
   def journals_for_message_add(user, journals_for_message)
      @user = User.current
-     if journals_for_message.jour_type!="Project"
+     if journals_for_message.jour_type!="Project"&&journals_for_message.jour_type!="Bid"
          
      @mail = journals_for_message.jour
      

app/views/bids/_bid_homework_show.html.erb

@@ -40,8 +40,10 @@
 					<% else %> 
 						<% if betweentime(bid.deadline) < 3 %>
 						<span style="color: red"><%= l(:label_commit_ar) %></span>
-						<% else %>						
-						<% end %>
+						<% else %>					
+						<% end %> 				
+
+				
 					<% end %>	</span>
 						</td>
 					</tr>										

app/views/layouts/base_users.html.erb

@@ -118,28 +118,29 @@
 									<div class="inf_user_context">
 										<table style="font-family:微软雅黑" width="240">
 											<tr>
-												<td style="padding-left: 8px" width="70px"><%= l(:label_user_joinin) %></td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= format_time(@user.created_on) %></td>
+												<td style="padding-left: 5px" width="70px"><%= l(:label_user_joinin) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= format_time(@user.created_on) %></td>
 											</tr>
 											<tr>
-												<td style="padding-left: 8px"><%= l(:label_user_login) %></td><td class="font_lighter_sidebar" style="padding-left: 0px"><%= format_time(@user.last_login_on) %></td>
+												<td style="padding-left: 5px"><%= l(:label_user_login) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px"><%= format_time(@user.last_login_on) %></td>
 											</tr>
 											<tr>
-												<td valign="top" style="padding-left: 8px;"><%= l(:label_user_mail) %></td><td class="font_lighter_sidebar"  style="padding-left: 0px; word-wrap: break-word; word-break: break-all"><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
+												<td valign="top" style="padding-left: 5px;"><%= l(:label_user_mail) %>：</td><td class="font_lighter_sidebar"  style="padding-left: 0px; word-wrap: break-word; word-break: break-all"><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
 											</tr>
 
 											<!-- added by bai 在个人主页里显示“工作单位”“地区”"教师的职称"-->
+											<!-- modified by linchun 在个人主页里显示“加入时间”，“最后登录”，“邮件地址”后面添加冒号-->
 
 											<% unless @user.user_extensions.nil? %>
 											<% unless @user.user_extensions.identity == 2 %>
 											<tr>
-												<td style="padding-left: 8px" width="70px"><%= l(:field_occupation) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.occupation %></td>
+												<td style="padding-left: 5px" width="70px"><%= l(:field_occupation) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.occupation %></td>
 											</tr>
 											<% end %>
 											<tr>
-												<td style="padding-left: 8px" width="70px"><%= l(:label_location) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.location %><%= @user.user_extensions.location_city %></td>
+												<td style="padding-left: 5px" width="76px"><%= l(:label_location) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.location %><%= @user.user_extensions.location_city %></td>
 											</tr>
 											<tr>
-												<td style="padding-left: 8px" width="70px"> <% if @user.user_extensions.identity == 0 %>
+												<td style="padding-left: 5px" width="76px"> <% if @user.user_extensions.identity == 0 %>
 												<%= l(:label_technical_title) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.technical_title %></td>
 												<% end %>
 											</tr>

config/locales/zh.yml

@@ -219,6 +219,7 @@ zh:
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
 
 
+
   field_name: 名称
   #added by huang
   field_tea_name: 教师