Timeslots form at admin panel improvement.

nastachku · Apr 11, 2013 · c8c248c · c8c248c
1 parent 30dd27d
commit c8c248c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/app/views/web/admin/halls/_slot_fields.html.haml b/app/views/web/admin/halls/_slot_fields.html.haml
@@ -2,8 +2,14 @@
   .span9.well
     = f.input :event_type, collection: Slot.event_type.options, include_blank: true, input_html: { class: 'span7 event-type-select span-nomargin' }
     = f.input :event_id, as: :events,  include_blank: true, input_html: { class: 'span7 event-id-select span-nomargin' }
-    = f.input :start_time, as: :date_time_picker, input_html: { class: 'span2 start_time' }
-    = f.input :finish_time, as: :date_time_picker, input_html: { class: 'span2 finish_time' }
-    .controls
-      .span7.span-nomargin
-        = link_to_remove_association t('.delete'), f, class: 'btn btn-danger pull-right'
+    .control-group
+      .control-label
+        = t('.time_from_till')
+      .controls
+        .row-fluid
+          .span4
+            = f.input_field :start_time, as: :date_time_picker, class: 'span8 start_time'
+          .span4
+            = f.input_field :finish_time, as: :date_time_picker, class: 'span8 finish_time'
+          .span4
+            = link_to_remove_association t('.delete'), f, class: 'btn btn-danger'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -393,6 +393,7 @@ ru:
           cancel: 'Отменить'
         slot_fields:
           delete: 'Удалить таймслот'
+          time_from_till: 'Время «От» и «До»'
 
       event_breaks:
         new: