注册激活页面代码重构，及添加新的字体

app/views/account/email_valid.html.erb

@@ -5,7 +5,7 @@
   <div class="email_verify" style="width: 580px;">
     <p class="fb f18" style="color:green;"><i class="icon-ok mr5 f18"></i>注册成功！
       <span style=" color:#3b94d6; font-size:12px; font-weight:normal;">请在24小时内点击邮件中的链接来激活您的账号。</span></p>
-    <p class="f14  mt30  mb5">请登录邮箱（<span class="c_red"><%= email %></span>）收取账号激活邮件。<br/>点击邮件中的激活链接，方可使用该账号
+    <p class="f14  mt30  mb5">请登录邮箱（<span class="c_red"><%= @mail_type %></span>）收取账号激活邮件。<br/>点击邮件中的激活链接，方可使用该账号
     </p>
     <p>
       <a href="http://mail.<%= email %>" class="btn btn-blue" target="_blank"><%= l(:label_check_email)%></a>
@@ -22,7 +22,7 @@
       <li>4.如果您无法收到激活邮件，请直接给我们留言：</li>
       <div class="mt10 clearfix">
         <% get_memo %>
-        <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum, :type => "mail_valid"), :id => "mail_valid_new_memo", :remote => true) do |f|  %>
+        <%= form_for(@new_memo, :url => mail_feedback_forum_path(@public_forum, :user_id => @user.id), :id => "mail_valid_new_memo", :remote => true) do |f|  %>
             <%= f.text_area :subject, :id => "subject", :class => "email_prompt_mes", :style => "width: 568px;", :placeholder => l(:label_feedback_tips) %>
             <%= f.hidden_field :content, :id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
             <span class="c_grey fl">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>

app/views/forums/_emali_valid_tip.html.erb

@@ -7,7 +7,11 @@
   <div class="sy_popup_con02" >
     <ul class="sy_popup_tishi ">
       <li>
-        <p>我们将尽快处理好并通知您。感谢您的反馈！</p>
+        <% if !@user.nil? %>
+            <p>反馈成功，我们将尽快处理好并通知您。感谢您的反馈！</p>
+        <% else %>
+            <p>反馈失败，请先登录！</p>
+        <% end %>
       </li>
       <li>
         <% if @flag == 6 %>

app/views/forums/create_feedback.js.erb

@@ -1,11 +1,6 @@
-<% if @type == "mail_valid" %>
-var htmlvalue = "<%= escape_javascript(render :partial => 'forums/emali_valid_tip') %>";
-pop_box_new(htmlvalue,380,166);
-<% else %>
 $(function(){
     $("#button1").click(function(){
         myTips(<%= l(:label_forums_feedback_success)%>,"success");
     });
 
-})
-<% end %>
+})

app/views/forums/mail_feedback.js.erb

@@ -0,0 +1,2 @@
+var htmlvalue = "<%= escape_javascript(render :partial => 'forums/emali_valid_tip') %>";
+pop_box_new(htmlvalue,380,250);

config/routes.rb

@@ -457,6 +457,7 @@ RedmineApp::Application.routes.draw do
     member do
       post 'create_memo'
       post 'create_feedback'
+      post 'mail_feedback'
       match 'search_memo', :via => [:get, :post]
       match 'delete_forum_tag',:via =>[:get]
       match 'add_forum_tag',:via=>[:get]

public/stylesheets/css/font-awesome.css

@@ -1,34 +1,9 @@
-*!
- *  Font Awesome 3.2.1
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
- */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('/font/fontawesome-webfont.eot?v=3.2.1');
-  src: url('/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+  src: url('../font/fontawesome-webfont.eot?v=3.2.1');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
   font-weight: normal;
   font-style: normal;
 }