From dbd8802b9c4454955a4aaa709836aab00c4754c7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Dec 2016 21:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E5=8F=91=E9=82=AE=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/email_valid.html.erb  | 4 ++--
 app/views/users/_intro_content.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb
index 58d7291c7..fcda47f72 100644
--- a/app/views/account/email_valid.html.erb
+++ b/app/views/account/email_valid.html.erb
@@ -47,8 +47,8 @@
         </div>
         <p>
           <a href="http://mail.<%= email %>" class="btn btn-blue" target="_blank"><%= l(:label_check_email)%></a>
-          &nbsp; &nbsp; <%#= link_to l(:label_mail_resend), { :controller => 'account', :action => 'resendmail',:user => @user}, :remote => true, :method => 'get' %>
-          <a href="<%= resendmail_path(@user) %>" data-remote="true"><input class="btn btn-blue" type="button" id="btn" value="重新获取验证码" onclick="settime(this)" /></a>
+          &nbsp; &nbsp; <%= link_to "<input class='btn btn-blue' type='button' id='btn' value='重新获取验证码' onclick='settime(this)' />".html_safe, { :controller => 'account', :action => 'resendmail', :user => @user}, :remote => true, :method => 'get' %>
+          <!--<a href="<%#= resendmail_path(@user) %>" data-remote="true"><input class="btn btn-blue" type="button" id="btn" value="重新获取验证码" onclick="settime(this)" /></a>-->
         </p>
              
           
diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index 7522a9b8d..796a8bd95 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -1,5 +1,5 @@
 <div class="homepagePostIntro break_word upload_img  maxh360 table_maxWidth " id="activity_description_<%= user_activity_id%>">
-  <div id="intro_content_<%= user_activity_id%>" style="width: 645px">
+  <div id="intro_content_<%= user_activity_id%>" style="width:98%">
     <%= content.to_s.html_safe %>
   </div>
 </div>