From 5b4beed2d458c634f9eb37d3bfda58819ac9f17f Mon Sep 17 00:00:00 2001
From: manson <manson@rulingcom.com>
Date: Tue, 13 May 2014 15:06:23 +0800
Subject: [PATCH] Update category and tag

---
 app/views/admin/announcements/_form.html.erb | 6 +++---
 lib/announcement/engine.rb                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb
index 738fa1d..d4d8a98 100644
--- a/app/views/admin/announcements/_form.html.erb
+++ b/app/views/admin/announcements/_form.html.erb
@@ -42,14 +42,14 @@
 
       <!-- Date Time Picker -->
       <div class="control-group">
-        <label class="control-label muted"><%= t(:start) %></label>
+        <label class="control-label muted"><%= t(:start_date) %></label>
         <div class="controls">
           <%= f.datetime_picker :postdate, :no_label => true %>
         </div>
       </div>
 
       <div class="control-group">
-        <label class="control-label muted"><%= t(:end) %></label>
+        <label class="control-label muted"><%= t(:end_date) %></label>
         <div class="controls">
           <%= f.datetime_picker :deadline, :no_label => true %>
         </div>
@@ -83,7 +83,7 @@
     <div class="tab-pane fade" id="tag">
       <div class="control-group">
         <label class="control-label muted"><%= t(:tags) %></label>
-        <%= select_tag(f, @module_app, @bulletin) %>
+        <%= select_tag(f, @module_app) %>
       </div>
     </div>
 
diff --git a/lib/announcement/engine.rb b/lib/announcement/engine.rb
index b93b6fe..6c9bfd5 100644
--- a/lib/announcement/engine.rb
+++ b/lib/announcement/engine.rb
@@ -20,12 +20,12 @@ module Announcement
                                 :priority=>1,
                                 :active_for_action=>{'admin/announcements'=>'index'},
                                 :available_for => [:all]
-          context_link 'announcement.add_new', 
+          context_link 'new_', 
                                 :link_path=>"new_admin_announcement_path" ,
                                 :priority=>2,
                                 :active_for_action=>{'admin/announcements'=>'new'},
                                 :available_for => [:sub_manager]
-          context_link 'announcement.categories',
+          context_link 'categories',
                                 :link_path=>"admin_module_app_categories_path" ,
                                 :link_arg=>{:module_app_id=>get_module_app.id},
                                 :priority=>3,