Merge branch 'guange_dev' into szzh

app/models/mailer.rb

@@ -66,8 +66,8 @@ class Mailer < ActionMailer::Base
     subject = "[ #{user.show_name} : #{l(:label_day_mail)}]"
     @subject = " #{user.show_name} : #{date_to}  #{l(:label_day_mail)}"
 
-    date_from = "#{date_from} 23:59:59"
-    date_to = "#{date_to} 23:59:59"
+    date_from = "#{date_from} 17:59:59"
+    date_to = "#{date_to} 17:59:59"
     
     # 生成token用于直接点击登录
     @user = user
@@ -122,11 +122,11 @@ class Mailer < ActionMailer::Base
       end
     end
     #  查询user在课程中发布的通知，项目中发的新闻
-    @course_news = News.find_by_sql("select DISTINCT n.*  from news n
+    @course_news = (course_ids && !course_ids.empty?) ? News.find_by_sql("select DISTINCT n.*  from news n
                                                 where n.course_id in (#{course_ids})
-                                                    and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
-    @project_news = News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
-                                                     and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+                                                    and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : []
+    @project_news = (project_ids && !project_ids.empty?) ? News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
+                                                     and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc") : []
 
     # 查询user在课程及个人中留言
     @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where

app/views/attachments/_form_course.html.erb

@@ -38,7 +38,7 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+<%= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
 <%= file_field_tag 'attachments[dummy][file]',
       :id => '_file',
       :class => 'file_selector',

app/views/welcome/_search_project.html.erb

@@ -90,7 +90,7 @@ form #search_by
 <div class="project-search" style="float: right">
     <%= submit_tag l(:label_search), :class => "enterprise", :name => nil,:style =>"float: right; margin-left:3px;margin-top:2px" %>
 	<div class='search_widget' >
-		<%= text_field_tag :q, nil, :placeholder => l('welcome.search.information'), style:"float:left;" %>
+		<%= text_field_tag :q, nil, :placeholder => l('welcome.search.information'), style:"float:left; width:185px;" %>
         <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
 		<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %>
         <%= select_tag(:search_by,options_for_select([[l('welcome.search.select.userinfo.nickname'),"0"],[l('welcome.search.select.userinfo.showname'),"1"],[l('welcome.search.select.userinfo.email'),"2"]]), :onchange => "searchByChange();",:style => "float:right" )  %>

config/configuration.yml

@@ -78,9 +78,8 @@
 # http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
 
 
-# default configuration options for all environments
+
 default:
-  # Outgoing emails configuration (see examples above)
   email_delivery:
     delivery_method: :smtp
     smtp_settings:
@@ -203,6 +202,15 @@ default:
 production:
   # CJK support
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
 
 # specific configuration options for development environment
 # that overrides the default ones

public/javascripts/attachments.js

@@ -37,7 +37,7 @@ function addFile(inputEl, file, eagerUpload) {
         $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,
         $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload),
         $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload' }).click(function(){
-            if(confirm('您确定要删除吗？')){
+            if(confirm($(inputEl).data('areYouSure'))){
                 removeFile();
                 if(!eagerUpload){
                     (function(e){
@@ -107,7 +107,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
     //gcm files count and add delete_all link
 
     var count=$('#attachments_fields>span').length;
-    $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+"个文件已上传");
+    $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
     if(count>=1){
     	var add_attachs=$('.add_attachment');
     	var delete_all=$('.remove_all');	
@@ -141,7 +141,7 @@ function removeFile() {
 
 //gcm delete all file
 function removeAll(){
-	if(confirm("您确定要删除所有文件吗")){
+	if(confirm($(inputEl).data('deleteAllFiles'))){
 		$(".remove-upload").removeAttr("data-confirm");
 		$(".remove-upload").click();
 	}
@@ -196,7 +196,7 @@ function addInputFiles(inputEl) {
         attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false);
         if (attachmentId) {
             $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide();
-            $('#upload_file_count').html("已上传"+"<span id=\"count\">"+1+"</span>"+"个文件");
+            $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
         }
     }