From a396a97407aa50e647ed7c02bc4805c4eda2f4c7 Mon Sep 17 00:00:00 2001
From: manson <manson@rulingcom.com>
Date: Tue, 1 Jul 2014 18:28:54 +0800
Subject: [PATCH] Update plugin intro

---
 app/controllers/writing_conferences_controller.rb      |  6 ------
 app/models/writing_conference_intro.rb                 | 10 +---------
 .../writing_conferences/frontend_setting.html.erb      |  4 ++--
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 app/controllers/writing_conferences_controller.rb

diff --git a/app/controllers/writing_conferences_controller.rb b/app/controllers/writing_conferences_controller.rb
deleted file mode 100644
index 939f5c9..0000000
--- a/app/controllers/writing_conferences_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class WritingConferencesController
-  def show
-    writing_conference = WritingConference.find_by(:uid=>param[:uid])
-    
-  end
-end
\ No newline at end of file
diff --git a/app/models/writing_conference_intro.rb b/app/models/writing_conference_intro.rb
index 4a1bd75..07a0cff 100644
--- a/app/models/writing_conference_intro.rb
+++ b/app/models/writing_conference_intro.rb
@@ -1,10 +1,2 @@
-class WritingConferenceIntro
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :member_profile
-
-  field :text, localize: true
-  field :display_intro, :type => Boolean, :default => true
-  field :display_conference_list, :type => Boolean, :default => true
+class WritingConferenceIntro < PersonalPluginIntro
 end
diff --git a/app/views/admin/writing_conferences/frontend_setting.html.erb b/app/views/admin/writing_conferences/frontend_setting.html.erb
index 6e99d0f..de2fd5a 100644
--- a/app/views/admin/writing_conferences/frontend_setting.html.erb
+++ b/app/views/admin/writing_conferences/frontend_setting.html.erb
@@ -34,8 +34,8 @@
           <div class="control-group">
             <label class="control-label muted"><%= t("personal_plugins.frontend_page") %></label>
             <div class="controls">
-                <%= f.check_box :display_intro, :checked => @intro.display_intro %> <%= t("personal_plugins.brief_intro") %>
-                <%= f.check_box :display_conference_list, :checked => @intro.display_conference_list %> <%= t("personal_plugins.complete_list") %>
+                <%= f.check_box :brief_intro, :checked => @intro.brief_intro %> <%= t("personal_plugins.brief_intro") %>
+                <%= f.check_box :complete_list, :checked => @intro.complete_list %> <%= t("personal_plugins.complete_list") %>
             </div>
           </div> 
         </div>