various fixes

stefansenk · Nov 3, 2016 · 068288f · 068288f
1 parent a3191c2
commit 068288f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/app/controllers/spree/admin/blog_entries_controller.rb b/app/controllers/spree/admin/blog_entries_controller.rb
diff --git a/app/views/spree/admin/blog_entries/_form.html.erb b/app/views/spree/admin/blog_entries/_form.html.erb
@@ -20,14 +20,14 @@
     <%= form.field_container :category_list do %>
 	<div class="form-group">
       <%= form.label :category_list, Spree.t(:category_list)  %>
-      <%= form.text_field :category_list, :class => '' %>
+      <%= form.text_field :category_list, value: @blog_entry.category_list.join(', ') %>
 	  </div><!-- form-group -->
     <% end %>
 
     <%= form.field_container :tag_list do %>
 	<div class="form-group">
       <%= form.label :tag_list, Spree.t(:tag_list) %>
-      <%= form.text_field :tag_list, :class => '' %>
+      <%= form.text_field :tag_list, value: @blog_entry.tag_list.join(', ') %>
 	  </div><!-- form-group -->
     <% end %>
 
@@ -106,7 +106,7 @@
   <div class="col-sm-12">
 <%= form.field_container :body do %>
 <div class="form-group">
-  <%= form.label :body %> <span class="text-alert">*</span>
+  <%= form.label :body %> <span class="text-danger">*</span>
   <%= form.text_area :body, { :rows => 10, :class => 'form-control', :id => 'blog_entry_body'} %>
   <%= form.error_message_on :body %>
   </div><!-- form-group -->

diff --git a/app/views/spree/blog_entries/show.html.erb b/app/views/spree/blog_entries/show.html.erb
@@ -8,7 +8,7 @@
   <%= render :partial => 'spree/blog_entries/blog_sidebar' %>
 <% end %>
 
-<div id="blog_entry_container" class='container'>
+<div id="blog_entry_container" class=''>
   <div id="blog_entry_entry" class=''>
 
     <h1><%= @blog_entry.title %></h1>

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -64,5 +64,5 @@ ru:
       archive: Архив
   time:
     formats:
-      blog_date: "%e %b %Y"
+      blog_date: "%e %B %Y"
 
diff --git a/config/routes.rb b/config/routes.rb
@@ -6,10 +6,7 @@
   scope Spree::Config['blog_alias'], as: 'blog' do
     get '/tag/:tag' => 'blog_entries#tag', :as => :tag
     get '/category/:category' => 'blog_entries#category', :as => :category
-    get '/author/:author' => 'blog_entries#author', :as => :author
     get '/:year/:month/:day/:slug' => 'blog_entries#show', :as => :entry_permalink
-    get '/:year(/:month)(/:day)' => 'blog_entries#archive', :as => :archive, 
-      :constraints => {:year => /(19|20)\d{2}/, :month => /[01]?\d/, :day => /[0-3]?\d/}
     get '/feed' => 'blog_entries#feed', :as => :feed, :format => :rss
     get '/' => 'blog_entries#index'
   end