Merge branch 'release/0.5.4_patch.2'

* release/0.5.4_patch.2:
  #FIX bug
  #367 some updates

app/helpers/application_helper.rb

@@ -3,7 +3,7 @@ module ApplicationHelper
   include ActionView::Helpers
   include DatesHelper
 
-  def title(page_title = t('.title'), area = :default)
+  def title(page_title = default_title, area = :default)
     if area != :default
       title_text = "#{page_title} | #{t(area)} | #{t('application.name')}"
     elsif page_title == :app_name
@@ -14,6 +14,10 @@ def title(page_title = t('.title'), area = :default)
     content_for(:title) { title_text }
   end
 
+  def default_title
+    t('.title')
+  end
+
   def menu_item(name = nil, path = '#', *args, &block)
     path = name || path if block_given?
     options = args.extract_options!

app/views/layouts/web/shared/activity_lines/corporative/confession/_confessions_of_the_year.html.haml

@@ -1,3 +1,4 @@
+- vote ||= false
 .confessions_of_the_year{ id: "confession_#{year}" }
   .year_text
     = year

app/views/web/admin/activity_lines/corporative/confessions/index.html.haml

@@ -1 +1 @@
-= render 'web/admin/default/index', items: @confessions
+= render 'web/admin/default/index', items: @confessions, default_page_title: default_title

app/views/web/admin/default/_index.html.haml

@@ -1,10 +1,12 @@
 - tabs = items.keys.except(:search)
-- title model_class.model_name.human.pluralize(:ru), :admin
+- default_page_title ||= nil
+- current_title = default_page_title || model_class.model_name.human.pluralize(:ru)
+- title current_title, :admin
 .page-header
   .row
     .col-md-6
       %h1
-        = t model_class.model_name.human.pluralize(:ru)
+        = current_title
         = link_to "#{t 'helpers.links.new'}", send("new_admin_#{to_path(model_class)}_path"), class: 'btn btn-primary'
     - if searchable_model?(model_class)
       .col-md-6

config/locales/ru/admin.yml

@@ -37,6 +37,11 @@ ru:
           add_venue: Добавить место
           registrations: Участники
           add_registration: Добавить участника
+      activity_lines:
+        corporative:
+          confessions:
+            index:
+              title: Премия «Признание»
   layouts:
     web:
       admin:

db/schema.rb

@@ -131,16 +131,6 @@
     t.datetime "updated_at",  null: false
   end
 
-  create_table "content_videos", force: :cascade do |t|
-    t.text     "title"
-    t.text     "description"
-    t.integer  "author_id"
-    t.text     "link"
-    t.text     "state"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-  end
-
   create_table "documents", force: :cascade do |t|
     t.text     "file"
     t.text     "title"