Merge branch 'release/0.6.11.2'

ulmic · Mar 20, 2016 · 39547f0 · 39547f0
2 parents 7897f52 + 0027e93
commit 39547f0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app/views/web/admin/events/_form.html.haml b/app/views/web/admin/events/_form.html.haml
@@ -1,7 +1,11 @@
 - current_title = page_title(action, Event.model_name.human)
+
 - title current_title, :admin
 .page-header
   %h1= page_title(action, Event.model_name.human)
+  .alert.alert-dissmissible.alert-danger
+    %span.glyphicon.glyphicon-info-sign
+    = t('messages.technical_works')
   - if @event_form.model.creator.present?
     = link_to "Автор: #{@event_form.model.creator.decorate.short_name}", member_path(@event_form.model.creator.ticket), class: :blank
   - else
@@ -65,7 +69,7 @@
           = f.simple_fields_for :registrations do |reg_form|
             = render 'registration_fields', f: reg_form
         = link_to_add_association t('.add_registration'), f, :registrations, data: { 'association-insertion-node' => 'this' }, class: 'btn btn-warning add_fields'
-      = f.button :submit, t('helpers.links.save'), class: 'btn-success'
+      -#= f.button :submit, t('helpers.links.save'), class: 'btn-success'
       = link_to t('helpers.links.back'), events_path, class: 'btn btn-default'
 .popup#place_form
   = render 'layouts/web/admin/shared/places/form'
diff --git a/app/views/web/events/show.html.haml b/app/views/web/events/show.html.haml
@@ -16,14 +16,14 @@
             .when
               .mic-label-black
                 = "#{t('.when')}:"
-            .where
+            -#.where
               .mic-label-black
                 = "#{t('.where')}:"
           .texts
             .when
               .event-label-text
                 = @event.full_date_duration
-            .where
+            -#.where
               .event-label-text
                 %i.fa.fa-foursquare
                 = @event.place_link_to_4sq

diff --git a/config/locales/ru/admin.yml b/config/locales/ru/admin.yml
@@ -3,6 +3,7 @@ ru:
   messages:
     record_saved_success: Сохранено
     fill_member_form: Вставьте номер членского билета, имя крёстного и дату вступления в МИЦ
+    technical_works: На сайте ведутся технические работы. Использование этого функционала временно недоступно
     events:
       enter_organizers_also: В поле участники сразу добавляйте организаторов мероприятия
   web:

diff --git a/config/locales/ru/state_machines.yml b/config/locales/ru/state_machines.yml
@@ -6,6 +6,7 @@ ru:
           states:
             unviewed: Новые
             confirmed: Подтверждённые
+            declined: Отклонённые
           events:
             renew: Сделать непросмотренным
             decline: Отклонить