From fe20c45c26a550aa7d0c26d11aab5583d5693615 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 27 Dec 2016 17:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B4=B4=E5=90=A7=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_new.html.erb   | 38 +++++++++++++++++---------------
 public/stylesheets/css/forum.css |  9 +++++++-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app/views/forums/_new.html.erb b/app/views/forums/_new.html.erb
index e70a63ff2..d195168f6 100644
--- a/app/views/forums/_new.html.erb
+++ b/app/views/forums/_new.html.erb
@@ -1,23 +1,25 @@
-<div id="muban_popup_box" style="width:475px;">
-  <div class="muban_popup_top">
-    <h3 class="fl">新建贴吧</h3>
-    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+<div style="width:460px;">
+  <div class="sy_popup_top">
+    <h3 class="fl">欢迎加入项目</h3>
+    <a href="javascript:void(0);" class="sy_icons_close fr" onclick="hideModal()"></a>
     <div class="cl"></div>
   </div>
   <div class="muban_popup_con mt15" >
-    <ul class="newuploadbox">
-      <li class="mb10 clear">
-        <label class=" fl">贴吧名称&nbsp;&nbsp;:&nbsp;</label>
-        <input type="text" placeholder="请输入新建贴吧名称，最多20个字符" class="issues_calendar_input fl " style="width:320px;">
-      </li>
-      <li class=" clear">
-        <label class=" fl">贴吧描述&nbsp;&nbsp;:&nbsp;</label>
-        <textarea class="mr15 mb10 fl newupload_textarea "  placeholder=" 请输入新建贴吧描述，最多250个字符" style="width:320px; height:100px;"></textarea>
-      </li>
-    </ul>
-    <div class="clear  mr45">
-      <button  class=" btn fr">取消</button >
-      <button  class=" btn btn-blue fr mr5">确定</button >
-    </div>
+    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum),:remote=>true) do |f|  %>
+        <ul class="newuploadbox">
+          <li class="mb10 clear">
+            <label class=" fl">贴吧名称&nbsp;&nbsp;:&nbsp;</label>
+            <input type="text" placeholder="请输入新建贴吧名称，最多20个字符" class="issues_calendar_input fl " style="width:320px;">
+          </li>
+          <li class=" clear">
+            <label class=" fl">贴吧描述&nbsp;&nbsp;:&nbsp;</label>
+            <textarea class="mr15 mb10 fl newupload_textarea "  placeholder=" 请输入新建贴吧描述，最多250个字符" style="width:320px; height:100px;"></textarea>
+          </li>
+        </ul>
+        <div class="clear  mr45">
+          <button  class=" btn fr">取消</button >
+          <button  class=" btn btn-blue fr mr5">确定</button >
+        </div>
+    <% end %>
   </div>
 </div>
\ No newline at end of file
diff --git a/public/stylesheets/css/forum.css b/public/stylesheets/css/forum.css
index 5e6984aed..04549526b 100644
--- a/public/stylesheets/css/forum.css
+++ b/public/stylesheets/css/forum.css
@@ -14,4 +14,11 @@ textarea.wenba-tiwen-textarea{ padding:5px;width:705px; height: 150px;}
 a.wenba-tiwen-tag{background-color: #E4EFF6;border-bottom: 1px solid #B1D3EB; border-right: 1px solid #B1D3EB;-webkit-text-size-adjust: none; color: #3E6D8E; font-size:12px;line-height: 2.4; padding: 5px 10px;text-decoration: none; white-space: nowrap;}
 a:hover.wenba-tiwen-tag,a.wenba-tiwen-tag-active{ background: #3b94d6; color: #fff;border-bottom: 1px solid #2e76ab; border-right: 1px solid #2e76ab;}
 .wenba-tagbox li{ float: left; margin:0 5px 5px 0;}
-.wenba-tagbox h3{ font-weight: normal; color: #333;}
\ No newline at end of file
+.wenba-tagbox h3{ font-weight: normal; color: #333;}
+/*按钮*/
+.btn{display: inline-block;border:none; padding:0 10px;color: #333;background: #e1e1e1; text-align:center;font-size: 12px;  height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; }
+.btn:hover{background: #c3c3c3; color: #333;}
+.btn-green{background: #60b25e; color: #fff;}
+.btn-green:hover{background: #51a74f; color: #fff;}
+.btn-blue{background: #3b94d6; color: #fff;}
+.btn-blue:hover{background: #2788d0; color: #fff;}
\ No newline at end of file