From 25b2418730e977e66edfebb6aa4a7c9786232dc4 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 21 Sep 2016 14:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=99=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E6=A1=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_forbidden_new_feedback.html.erb  | 47 ++++++++++++-------
 public/stylesheets/nyan.css                   |  2 +-
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/app/views/layouts/_forbidden_new_feedback.html.erb b/app/views/layouts/_forbidden_new_feedback.html.erb
index 03c9855f9..9dc4a560b 100644
--- a/app/views/layouts/_forbidden_new_feedback.html.erb
+++ b/app/views/layouts/_forbidden_new_feedback.html.erb
@@ -3,38 +3,49 @@
 <div class="scrollsidebar" id="scrollsidebar">
   <div class="side_content">
     <div class="side_list">
-      <div class="side_title">
-        <a title="<%= l(:button_hide) %>" class="close_btn">
-          <span>
-          </span>
-        </a>
+      <div style="background-color:#fff; padding:10px 0; border:1px solid #aaa; border-bottom:none;">
+        <span class="fontGrey3 f14 ml40" style="vertical-align:top;">问题和建议</span>
+        <span class="hide-side-bar side-bar-circle fr mt3 mr10" title="关闭"><span class="side-bar-content" style="font-family:'微软雅黑, 宋体'">×</span></span>
+        <span class="close_btn side-bar-circle fr mt3 mr10" title="隐藏"><span class="side-bar-content" style="left:4px; font-family:'微软雅黑, 宋体'">›</span></span>
       </div>
-      <div class="side_center">
-        <div class="custom_service">
+      <div style="background-color:#fff; border-left:1px solid #aaa; border-right:1px solid #aaa;">
+        <div class="custom_service tac">
           <% get_memo %>
           <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-              <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+              <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => "完善您的基本资料后，可在此输入问题和建议", :disabled => "disabled" %>
               <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-              <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick="">
-                <%= l(:label_submit)%>
-              </a>
+              <!--<span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>-->
+              <!--<a href="javascript:void(0);" class="linkBlue f14 fr mr10" style="height:21px;" id="" onclick="f_submit();">-->
+                <%#= l(:label_submit)%>
+              <!--</a>-->
+              <div class="cl"></div>
           <% end %>
         </div>
-        <div class="mt5" style="color: #269ac9;cursor: default">
+      </div>
+      <div style="background-color:#fff; border:1px solid #aaa; border-top:none; padding-top:5px;">
+        <div class="fl mt5 ml10 tac">
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
           <%#= l(:label_technical_support) %>
           <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
           <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
           <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
-          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="http://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a>
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
+          <p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
         </div>
+        <div class="fr mr10 tac">
+          <img src="/images/wechat/trustie_QR.jpg" width="80" style="display:inline-block; margin-right:-5px;" /><p class="fontGrey3" style="padding-bottom:10px;">关注官方微信</p>
+        </div>
+        <div class="cl"></div>
       </div>
-      <div class="side_bottom"></div>
     </div>
   </div>
-  <div class="show_btn">
-    <span><%= l(:label_submit)%></span>
-    <a href="javascript:void(0)" class="closeSidebar"></a>
+  <div class="show_btn tac">
+    <div style=" border:1px solid #aaa;">
+      <div style="height:79px;">
+        <img src="/images/dialog.png" width="18" class="mt10 mb5" />
+        <span class="f14 fontBlue">提<br />问</span>
+      </div>
+      <span  class="closeSidebar f16">×</span>
+    </div>
   </div>
 </div>
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 75da9349d..d219a8efb 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1447,7 +1447,7 @@ ul.contest-notification-list li span{
 .xls {
     /*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;*/
     /*padding: 2px 0px 3px 16px;*/
-    font-family:微软雅黑 !important;
+    font-family:"微软雅黑" !important;
     font-size: 12px !important;
     color: #136b3b !important;
     font-weight:normal !important;