constructor-pages 0.5.0 → 0.5.1

data/app/controllers/constructor_pages/fields_controller.rb

@@ -20,7 +20,7 @@ module ConstructorPages
       @field = Field.new params[:field]
 
       if @field.save
-        redirect_to edit_template_path(@field.template_id), :notice => "Поле «#{@field.name}» успешно добавлено."
+        redirect_to edit_template_path(@field.template_id), notice: t(:field_success_added, name: @field.name)
       else
         render :action => 'new', :template_id => @field.template_id
       end
@@ -47,7 +47,7 @@ module ConstructorPages
           end
         end
       if @field.update_attributes params[:field]
-        redirect_to edit_template_url(@field.template.id), :notice => "Поле «#{@field.name}» успешно обновлено."
+        redirect_to edit_template_url(@field.template.id), notice: t(:field_success_updated, name: @field.name)
       else
         render :action => "edit"
       end
@@ -58,19 +58,19 @@ module ConstructorPages
       name = @field.name
       template = @field.template.id
       @field.destroy
-      redirect_to edit_template_url(template), :notice => "Поле «#{name}» успешно удалено."
+      redirect_to edit_template_url(template), notice: t(:field_success_removed, name: name)
     end
 
     def move_up
       @field = Field.find(params[:id])
       @field.move_higher
-      redirect_to :back, :notice => 'Поле успешно перемещено.'
+      redirect_to :back, notice: t(:field_success_moved, name: @field.name)
     end
 
     def move_down
       @field = Field.find(params[:id])
       @field.move_lower
-      redirect_to :back, :notice => 'Поле успешно перемещено.'
+      redirect_to :back, notice: t(:field_success_moved, name: @field.name)
     end
   end
 end

data/app/controllers/constructor_pages/pages_controller.rb

@@ -112,7 +112,7 @@ module ConstructorPages
       @page = Page.new params[:page]
 
       if @page.save
-        redirect_to pages_url, :notice => "Страница «#{@page.name}» успешно добавлена."
+        redirect_to pages_url, notice: t(:page_success_added, name: @page.name)
       else
         render :action => "new"
       end
@@ -152,7 +152,7 @@ module ConstructorPages
           end
         end
 
-        redirect_to pages_url, :notice => "Страница «#{@page.name}» успешно обновлена."
+        redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)
       else
         render :action => "edit"
       end
@@ -162,7 +162,7 @@ module ConstructorPages
       @page = Page.find(params[:id])
       title = @page.name
       @page.destroy
-      redirect_to pages_url, :notice => "Страница «#{title}» успешно удалена."
+      redirect_to pages_url, notice: t(:page_success_removed, name: @page.name)
     end
 
     def move_up

data/app/models/constructor_pages/page.rb

@@ -79,7 +79,13 @@ module ConstructorPages
 
     # if url has been changed by manually or url is empty
     def friendly_url
-      self.url = ((auto_url || url.empty?) ? name : url).parameterize
+      self.url = ((auto_url || url.empty?) ? translit(name) : url).parameterize
+    end
+
+    # TODO: add more languages
+    # translit to english
+    def translit(str)
+      Russian.translit(str)
     end
 
     # page is not valid if there is no template

data/app/views/constructor_pages/pages/index.haml

@@ -5,7 +5,7 @@
   .span4.clearfix.text-right
     = link_to "<i class='icon-plus icon-white'></i> #{t :new_page}".html_safe, pages.new_page_path, :class => "btn btn-large btn-link"
 
-%section.b-tree.span8
+%section.b-tree.span12
   %ul
     - @roots.each do |root|
       - level = root.level
@@ -22,25 +22,27 @@
 
         <li>
         - if page.active == true
-          = link_to page.name, page.full_url, :class => "btn"
+          = link_to page.name, page.full_url, :class => "btn btn-link"
         - else
           %button.btn.disabled= page.name
 
-        .btn-group          
-          - if not page.right_sibling.nil? and page.move_possible?(page.right_sibling)
-            = link_to "<i class='icon-arrow-down'></i>".html_safe, page_move_down_path(page), :method => :post, :class => "btn btn-mini"
-          - if not page.left_sibling.nil? and page.move_possible?(page.left_sibling)
-            = link_to "<i class='icon-arrow-up'></i>".html_safe, page_move_up_path(page), :method => :post, :class => "btn btn-mini"
-      
-        = link_to "<i class='icon-pencil icon-white'></i>".html_safe, edit_page_path(page), :class => "btn btn-primary btn-mini"
-
-        - unless page.template.nil?
-          - if page.template.child_id.nil?
-            - if !page.template.leaf?
-              = link_to "<i class='icon-plus icon-white'></i> #{page.template.descendants.first.name}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
-          - else
-            = link_to "<i class='icon-plus icon-white'></i> #{ConstructorPages::Template.find(page.template.child_id).name}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
+        .b-tree__buttons
+          .btn-group
+            - if not page.right_sibling.nil? and page.move_possible?(page.right_sibling)
+              = link_to "<i class='icon-arrow-down'></i>".html_safe, page_move_down_path(page), :method => :post, :class => "btn btn-mini"
+            - if not page.left_sibling.nil? and page.move_possible?(page.left_sibling)
+              = link_to "<i class='icon-arrow-up'></i>".html_safe, page_move_up_path(page), :method => :post, :class => "btn btn-mini"
 
+          = link_to "<i class='icon-pencil'></i> #{t :edit} #{page.template.name.downcase}".html_safe, edit_page_path(page), :class => "btn btn-primary btn-mini"
+
+          - unless page.template.nil?
+            - if page.template.child_id.nil?
+              - if !page.template.leaf?
+                = link_to "<i class='icon-chevron-down'></i> #{t :add} #{page.template.descendants.first.name.downcase}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
+            - else
+              = link_to "<i class='icon-chevron-down'></i> #{t :add} #{ConstructorPages::Template.find(page.template.child_id).name.downcase}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
+
+          = link_to "<i class='icon-remove'></i> #{t :delete}".html_safe, page_path(page), confirm: t(:are_you_sure?), method: :delete, class: 'btn btn-danger btn-mini pull-right'
 
         
 

data/app/views/constructor_pages/templates/index.haml

@@ -5,7 +5,7 @@
   .span4.clearfix.text-right
     = link_to "<i class='icon-plus icon-white'></i> #{t :new_template}".html_safe, new_template_path, :class => "btn btn-link btn-large"
 
-%section.b-tree.span8
+%section.b-tree.span12
   %ul
     - @roots.each do |root|
       - level = root.level
@@ -21,15 +21,16 @@
           </li>
 
         <li>
-        %button.btn.disabled= template.name
+        %button.btn.btn-link.disabled= template.name
 
-        .btn-group
-          - if not template.right_sibling.nil? and template.move_possible?(template.right_sibling)
-            = link_to "<i class='icon-arrow-down'></i>".html_safe, template_move_down_path(template), :method => :post, :class => "btn btn-mini"
-          - if not template.left_sibling.nil? and template.move_possible?(template.left_sibling)
-            = link_to "<i class='icon-arrow-up'></i>".html_safe, template_move_up_path(template), :method => :post, :class => "btn btn-mini"
+        .b-tree__buttons
+          .btn-group
+            - if not template.right_sibling.nil? and template.move_possible?(template.right_sibling)
+              = link_to "<i class='icon-arrow-down'></i>".html_safe, template_move_down_path(template), :method => :post, :class => "btn btn-mini"
+            - if not template.left_sibling.nil? and template.move_possible?(template.left_sibling)
+              = link_to "<i class='icon-arrow-up'></i>".html_safe, template_move_up_path(template), :method => :post, :class => "btn btn-mini"
 
-        = link_to "<i class='icon-pencil icon-white'></i>".html_safe, edit_template_path(template), :class => "btn btn-primary btn-mini"
+          = link_to "<i class='icon-pencil'></i> #{t :edit} #{ t(:template).downcase}".html_safe, edit_template_path(template), :class => "btn btn-primary btn-mini"
 
 
         - level = template.level

data/config/locales/en.yml

@@ -6,6 +6,15 @@ en:
   edit_field: 'Edit field'
   seo: 'SEO'
   display_in: 'Display in'
+  help: 'Help'
+  edit: 'Edit'
+
+  new_field: 'New field'
+
+  field_success_added: 'Field «%{name}» added successfully.'
+  field_success_updated: 'Field «%{name}» updated successfully.'
+  field_success_removed: 'Field «%{name}» removed successfully.'
+  field_success_moved: 'Field «%{name} moved successfully.'
 
   string: 'String'
   integer: 'Integer'
@@ -21,14 +30,17 @@ en:
 
   are_you_sure?: 'Are you sure?'
 
+  page_not_found: 'Page not found'
+
   new_page: 'New page'
   edit_page: 'Edit page'
   delete_page: 'Delete page'
 
+  page_success_added: 'Page «%{name}» added successfully.'
+  page_success_updated: 'Page «%{name}» updated successfully.'
+  page_success_removed: 'Page «%{name}» removed successfully.'
+
+  template: 'Template'
   new_template: 'New template'
   edit_template: 'Edit template'
-  delete_template: 'Delete template'
-
-  new_field: 'New field'
-
-  page_not_found: 'Page not found'
+  delete_template: 'Delete template'

data/config/locales/ru.yml

@@ -8,19 +8,22 @@ ru:
   are_you_sure?: 'Вы уверены?'
   display_in: 'Отображать в'
 
+
   menu: 'Меню'
   breadcrumbs: 'Хлебные крошки'
 
-  new_page: 'Создать страницу'
-  edit_page: 'Редактирование страницы'
-  delete_page: 'Удалить страницу'
-
+  template: 'Шаблон'
   new_template: 'Создать шаблон'
   edit_template: 'Редактирование шаблона'
   delete_template: 'Удалить шаблон'
 
   new_field: 'Добавить поле'
 
+  field_success_added: 'Поле «%{name}» успешно добавлено.'
+  field_success_updated: 'Поле «%{name}» успешно обновлено.'
+  field_success_removed: 'Поле «%{name}» успешно удалено.'
+  field_success_moved: 'Поле «%{name}» успешно перемещено.'
+
   string: 'Строка'
   integer: 'Целое число'
   float: 'Дробное число'
@@ -29,9 +32,19 @@ ru:
   text: 'Текст'
   html: 'HTML'
   image: 'Изображение'
+  help: 'Помощь'
+  edit: 'Редактировать'
 
   page_not_found: 'Страница не найдена'
 
+  new_page: 'Создать страницу'
+  edit_page: 'Редактирование страницы'
+  delete_page: 'Удалить страницу'
+
+  page_success_added: 'Страница «%{name}» успешно добавлена.'
+  page_success_updated: 'Страница «%{name}» успешно обновлена.'
+  page_success_removed: 'Страница «%{name}» успешно удалена.'
+
   activerecord:
     attributes:
       constructor_pages/field:

data/lib/constructor-pages.rb

@@ -2,4 +2,5 @@ require 'awesome_nested_set'
 require 'haml-rails'
 require 'constructor_pages/engine'
 require 'rack/cache'
-require 'acts_as_list'
+require 'acts_as_list'
+require 'russian'

data/spec/models/constructor_pages/page_model_spec.rb

@@ -97,14 +97,6 @@ module ConstructorPages
         page_two.full_url.should == '/hello/world'
       end
 
-      it 'should be translit utf-8' do
-        page = Page.create name: 'Проверка'
-        page.full_url.should == '/proverka'
-
-        page_two = Page.create name: 'Тест', parent: page
-        page_two.full_url.should == '/proverka/test'
-      end
-
       context 'if parent or url has been changed' do
         it 'should update full_url' do
           page = Page.create name: 'Change url', url: 'change-url', auto_url: false
@@ -134,6 +126,16 @@ module ConstructorPages
       end
     end
 
+    describe 'translit' do
+      it 'should translit utf-8' do
+        page = Page.create name: 'Проверка'
+        page.full_url.should == '/proverka'
+
+        page_two = Page.create name: 'Тест', parent: page
+        page_two.full_url.should == '/proverka/test'
+      end
+    end
+
     describe 'descendants_update' do
       it 'should update descendants full_url' do
         page = Page.create name: 'Update descendants', url: 'update-descendants', auto_url: false

data/spec/models/constructor_pages/template_model_spec.rb

@@ -9,6 +9,10 @@ module ConstructorPages
       template.valid?.should be_true
     end
 
+    describe '#name' do
+      it 'should convert russian suffix'
+    end
+
     describe '#code_name' do
       context 'validation' do
         it 'should be uniqueness'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement