From b9cb857025d599bb3bbee1b9c40826f6e30c9bc5 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 8 Feb 2017 14:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=90=A7=E9=A6=96=E9=A1=B5=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E2=80=9C=E6=88=91=E8=A6=81=E6=8F=90=E9=97=AE=E2=80=9D?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=9C=89?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8D=E5=90=88=E9=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb | 1 +
 app/views/forums/index.html.erb     | 2 +-
 app/views/memos/_form.html.erb      | 5 +++--
 app/views/memos/new.html.erb        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 3e5127897..8e84f2659 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -28,6 +28,7 @@ class MemosController < ApplicationController
   end
 
   def new
+    # 如何是问吧主页来的，导航不显示具体贴吧名
     @memo = Memo.new
     @my_forums_count = Memo.where("author_id =? and parent_id is null", User.current.id).count
     @my_memos_count =  Memo.where("author_id =? and parent_id is not null", User.current.id).count
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index d324a9770..5b9f374f8 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -9,7 +9,7 @@
     <div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0);"  id="reorder_popu" class=""></a></div>
     <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class=""></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
     <div class="creatPost" id="create_memo_btn">
-      <%= link_to "发布新帖",new_forum_memo_path(:forum_id => Forum.first.id), :class => "c_white db creatPostIcon bGreen" %>
+      <%= link_to "发布新帖", new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true), :class => "c_white db creatPostIcon bGreen" %>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/memos/_form.html.erb b/app/views/memos/_form.html.erb
index 1128d0a86..bab98541b 100644
--- a/app/views/memos/_form.html.erb
+++ b/app/views/memos/_form.html.erb
@@ -37,7 +37,9 @@
 
 <script>
     $(document).ready(function(){
-        $("#forums_question_"+<%= params[:forum_id] %>).addClass("wenba-tiwen-tag-active");
+        <% if params[:forum_index] != 'true'%>
+            $("#forums_question_"+<%= params[:forum_id] %>).addClass("wenba-tiwen-tag-active");
+        <% end %>
     });
     function add_forum(id){
         $("#memo_classify_tips").attr('style','color: #333;');
@@ -104,7 +106,6 @@
       }else if(memo_content.isEmpty()){
           $("#memo_contents_error_tips").html("内容不能为空").show();
       }else if ($("#forum_name").attr('value')== ""){
-          alert("请选择分类");
           $("#memo_classify_tips").attr('style','color: #F00;');
       }
   }
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index 5c6e9bd95..42bf0aacf 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -1,4 +1,4 @@
-<div class="banner-big f16 fontGrey3 mb10"><%= link_to "问吧", forums_path, :class => "c_blue" %> > <%= link_to @forum.name, forum_path(@forum), :class => "c_blue" %> > 我要提问</div>
+<div class="banner-big f16 fontGrey3 mb10"><%= link_to "问吧", forums_path, :class => "c_blue" %> <% if params[:forum_index] != 'true'%> > <%= link_to @forum.name, forum_path(@forum), :class => "c_blue" %> <% end %> > 我要提问</div>
 <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
     <%= render :partial => "memos/form", :locals => {:f => f} %>
 <% end %>