From 525a6394ca887872d9f01cda2fde24f0ca1744e9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 Mar 2015 10:20:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92=202=E3=80=81=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=89=88=E6=9C=AC=E8=BF=87=E4=BD=8E=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=EF=BC=88=E6=A0=B7=E5=BC=8F=E9=9C=80=E8=A6=81=E5=86=8D?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                      |   6 ++-
 app/models/memo.rb                        |   2 +-
 app/views/layouts/_base_feedback.html.erb |  12 +++---
 app/views/layouts/_point_browser.html.erb |  45 ++++++++++++++++++++++
 public/images/img_floatbox.png            | Bin 0 -> 1012 bytes
 5 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 app/views/layouts/_point_browser.html.erb
 create mode 100644 public/images/img_floatbox.png

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index b404ea531..e1c538fd0 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -125,7 +125,7 @@ class Mailer < ActionMailer::Base
 
   end
 
-
+  # 公共讨论区发帖、回帖添加邮件发送信息
   def forum_message_added(memo)
     @memo = memo
     redmine_headers 'Memo' => memo.id
@@ -134,9 +134,11 @@ class Mailer < ActionMailer::Base
     @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
     @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
-    if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
+    #将帖子创建者邮箱地址加入数组
+    if @forum.creator.mail_notification != 'day' && @forum.creator.mail_notification != 'week'
       recipients << @forum.creator.mail
     end
+    #回复人邮箱地址加入数组
     if @author.mail_notification != 'day' && @author.mail_notification != 'week'
       recipients << @author.mail
     end
diff --git a/app/models/memo.rb b/app/models/memo.rb
index 052ca03db..b4e30dabe 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -42,7 +42,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters! #, :sendmail#,:be_user_score -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :sendmail
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 2172af8de..d964b788f 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -121,15 +121,15 @@ function cookiesave(n, v, mins, dn, path)
 {
     if(n)
     {
-		
+
 	    if(!mins) mins = 365 * 24 * 60;
 		if(!path) path = "/";
 	    var date = new Date();
-		
+
 	    date.setTime(date.getTime() + (mins * 60 * 1000));
-		
+
 	    var expires = "; expires=" + date.toGMTString();
-		
+
 	    if(dn) dn = "domain=" + dn + "; ";
 	    document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
 
@@ -170,8 +170,8 @@ function cookieget(n)
           			<%= f.hidden_field :content, :required => true , :value => l(:label_feedback_value) %>
 		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
           			<a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
-				  <% end %>   			   			                
-                </div>                               
+				  <% end %>
+                </div>
                 <div class="msgserver">
                    	<a href="http://user.trustie.net/users/12/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>黄井泉</a>
                     <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
diff --git a/app/views/layouts/_point_browser.html.erb b/app/views/layouts/_point_browser.html.erb
new file mode 100644
index 000000000..ccd84f35f
--- /dev/null
+++ b/app/views/layouts/_point_browser.html.erb
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>升级浏览器</title>
+  <script src="jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js" type="text/javascript"></script>
+  <style type="text/css">
+      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background: #F2F2F2; font-style:normal;}
+      .update{ position: fixed; border-bottom:1px solid #d7d7d7; color:#fea254; text-align:center; width:100%; font-size:10px; height:30px; background:#fdffd9; padding:2px 0;z-index:1000;}
+      a.green_btn{ padding:2px 10px; background:#3caf3f; font-size:12px;color:#fff;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+      a:hover.green_btn{ background:#289c2b;}
+      a.close_btn{ background:url(images/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px;  float:right; margin:7px 5px 0 0;}
+      a:hover.close_btn{ background:url(images/img_floatbox.png) -20px -63px no-repeat;}
+  </style>
+  <script type="text/javascript">
+      function close_window(){
+          $('#light').slideUp(400);
+      }
+      if ((navigator.userAgent.indexOf('MSIE 8.0') >= 0) && (navigator.userAgent.indexOf('Opera') < 0))
+      {alert('你是使用IE')}else
+      if (navigator.userAgent.indexOf('Firefox') >= 0)
+      Document.html{
+          div class="update" id="light">
+                  <p>您的浏览器版本过低，建议升级您的浏览器。
+      <a href="#" onClick="close_window();" class="close_btn" ></a>
+          </p>
+          <div class="cl"></div>
+          </div>
+      }
+      {alert('你是使用Firefox')}else
+      if (navigator.userAgent.indexOf('Opera') >= 0){alert('你是使用Opera')}else
+      {alert('你是使用其他的浏览器浏览网页！')}
+  </script>
+</head>
+
+<body style=" height:1500px;">
+<div class="update" id="light">
+  <p>您的浏览器版本过低，建议升级您的浏览器。
+    <a href="#" onClick="close_window();" class="close_btn" ></a>
+  </p>
+  <div class="cl"></div>
+</div>
+
+</body>
+</html>
diff --git a/public/images/img_floatbox.png b/public/images/img_floatbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2167f5ffffb44e15fa2aa86f6e816dadab940f7
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq001Na002`61^@s6_a~*{00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<dPzh<RCwC#n6Xb2Q5?rVJsPDf+#m=uF%CF5xXBI0#6*@$44C*Y2qU2v&-Icw
zIuKDrWg=m`0a+A=!;J((!ruTwOfJzVQKSyOyIhZVZE5Y%=zB?rw(ou4C%@nK_iKMw
zs8*|V(<%<W{|K-HtN~A&II{|j0Ji`R@7&DXX!^kpuol`@LtWDkR)G-%xC&ec9s@lM
z&b<ci0@s?jAl5bgpr^s!Sl0kP0rS8&-~=!-&MgA>fy+RDBcRZ>YIIFMFfw3b-O#rB
zqfK+bbKooRO98b6JOFxuzGnRp+E$Hj8p`y8SU0q-K2jIY0?!msOTeUzOz(M38roKk
zZUiM^CS_z|-E<@>zzcc!C-6odx&)M3t(?%dYIIFMh;>8Ts?k;DbryIE90ODGv%YrA
zSw^ZxH%e0@Ab=|}Z6^}O_)Bf3MptEY)kQCXhq48{0)Au|{anlR1Ep>ns;GdOk_L`)
zdjdR?P(8qDi!f8tz$N)vtZVu~PiR}G=?E<<VA4iEccf&Wsew@#J&sf)zMSYYr3|Al
zoEOUUgXKh@DP<UaAqiywLkXCAeP&MflP|#MCSZmVFue_$XRK=g2f#*?O|Js10J}|;
z`2ny|4<?nq6=1h8@NTEAI<EI?-^w!Rvek7!g>L)Ds8gnaG>`_;KpIE`X`pTaavW#N
zahxFcCunuPyL}N6Dt1a(Mz<H35JDVf>=^*w0>?rKtJ5AT@#i_@ro31MvnltK@-X!T
zum_B$p%O5oa?ibnfASs2sR9Tg3T>oqP!6Hd#p6IV1yfF@v{0#3wpuXoR+RG=pvZ!0
zCuL1XO$c!)BNL@B69%9tgc$2o$`Y&E;C+6bT4CTl;0Cavsy-uUm~o(-fI8C>j2vOg
zLWo1@n{rl5=wyV}vka_&T5ksEgM78Rz60A?)s%qRmV5Qn4-KS&G>`_;KpN=304nb9
z?<>FXJZ}rAx~{97E{2DP^=#kPnwgo2XM5Lmk210l&-U~4^ZCv8@?sUt#m)9fs07TJ
z*}h{yuIr{J)=kgz1{E;nWJ(Lu)6*@@_EFBWR#d&7=hdC<BbcaaJ3iYhBBhK>TxG87
zj%8FpRSN!Fv%SJI@ocZEJ|kzCGqZgf%E%F>?7Hru^i4UdCFC~SCk?EC%6GO`RZ{{=
i&-NNf1O4AXzXt%Mbf5S7A4@j?0000<MNUMnLSTX~XTC@P

literal 0
HcmV?d00001