constructor-pages 0.3.3 → 0.4.0

data/app/controllers/constructor_pages/fields_controller.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 
 module ConstructorPages
-  class FieldsController < ConstructorCore::AdminController
-    # TODO
-    include ConstructorCore::DeviseHelper
-
+  class FieldsController < ConstructorCore::ApplicationController
     before_filter :authenticate_user!
+
     layout 'constructor_core/application_admin'
 
     def new

data/app/controllers/constructor_pages/pages_controller.rb

@@ -1,22 +1,15 @@
 # encoding: utf-8
 
 module ConstructorPages
-  class PagesController < ConstructorCore::AdminController
-    # TODO
-    include ConstructorCore::DeviseHelper
+  class PagesController < ConstructorCore::ApplicationController
+    before_filter :authenticate_user!, :except => [:show, :search, :sitemap]
 
     caches_page :show
 
-    before_filter :authenticate_user!, :except => [:show, :search, :sitemap]
     before_filter {@roots = Page.roots}
     layout 'constructor_core/application_admin', :except => [:show, :search, :sitemap]
     before_filter :cache, :only => [:create, :update, :destroy, :move_up, :move_down]
 
-    # TODO
-    def index
-      @user_signed_in = user_signed_in?
-    end
-
     def new
       @page = Page.new
       @template = Template.first.id
@@ -53,9 +46,6 @@ module ConstructorPages
 
       instance_variable_set('@'+@page.template.code_name.to_s, @page)
 
-      @children_of_current_root = @page.root.children
-      @children_of_current_page = @page.children
-
       respond_to do |format|
         format.html { render :template => "html_templates/#{@page.template.code_name}" }
         format.json {
@@ -107,9 +97,6 @@ module ConstructorPages
 
       instance_variable_set('@'+template.code_name.pluralize, @pages)
 
-      @children_of_current_root = @page.root.children
-      @children_of_current_page = @page.children
-
       render :template => "templates/#{template.code_name}_search"
     end
 

data/app/controllers/constructor_pages/templates_controller.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 
 module ConstructorPages
-  class TemplatesController < ConstructorCore::AdminController
-    # TODO
-    include ConstructorCore::DeviseHelper
-
+  class TemplatesController < ConstructorCore::ApplicationController
     before_filter :authenticate_user!
+
     before_filter {@roots = Template.roots}
     layout 'constructor_core/application_admin'
 

data/app/helpers/constructor_pages/fields_helper.rb

@@ -4,14 +4,14 @@ module ConstructorPages
   module FieldsHelper
     def types_value
       [
-          ["Строка", "string"],
-          ["Целое число", "integer"],
-          ["Дробное число", "float"],
-          ["Булево", "boolean"],
-          ["Дата", "date"],
-          ["Текст", "text"],
-          ["HTML", "html"],
-          ["Изображение", "image"]
+          [t(:string), "string"],
+          [t(:integer), "integer"],
+          [t(:float), "float"],
+          [t(:boolean), "boolean"],
+          [t(:date), "date"],
+          [t(:text), "text"],
+          [t(:html), "html"],
+          [t(:image), "image"]
       ]
     end
   end

data/app/views/constructor_pages/fields/_form.haml

@@ -24,6 +24,5 @@
     .row-fluid
       .span12
         .form-actions
-          .btn-group
-            = f.submit :class => "btn btn-primary"
-            = link_to "Отмена", edit_template_url(@field.template), :class => "btn"
+          = f.submit :class => "btn btn-primary"
+          = link_to t(:cancel), edit_template_url(@field.template), :class => "btn"

data/app/views/constructor_pages/fields/edit.haml

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Редактирование поля
+  =t :edit_field
 
 %section.span12
   = render 'form'

data/app/views/constructor_pages/fields/new.haml

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Создание поля
+  =t :new_field
 
 %section.span12
   = render 'form'

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

@@ -39,13 +39,13 @@
     .accordion
       .accordion-group
         .accordion-heading.text-center
-          = link_to 'Настройки', '#collapse', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
+          = link_to t(:settings), '#collapse', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
         .accordion-body.in.collapse#collapse
           .accordion-inner
             .control-group
               = f.label :parent, :class => 'control-label'
               .controls
-                = f.select :parent_id, options_for_select(for_select(@roots), :selected => @page.parent_id, :disabled => @page.self_and_descendants.map{|p| p.id}), :include_blank => 'Нет'
+                = f.select :parent_id, options_for_select(for_select(@roots), :selected => @page.parent_id, :disabled => @page.self_and_descendants.map{|p| p.id}), :include_blank => t(:no)
 
             .control-group
               = f.label :template, :class => 'control-label'
@@ -56,24 +56,24 @@
               .controls
                 = f.text_field :link, :class => "span9"          
             .control-group
-              %label.control-label Отображать в
+              %label.control-label=t :display_in
               .controls
                 %label.checkbox.inline.span2{:for => 'in_menu'}
                   = f.check_box :in_menu
-                  Меню
+                  =t :menu
 
                 %label.checkbox.inline.span2{:for => 'in_map'}
                   = f.check_box :in_map
-                  Карта сайта
+                  =t :sitemap
 
                 %label.checkbox.inline.span2{:for => 'in_nav'}
                   = f.check_box :in_nav
-                  Хлебные крошки
+                  =t :breadcrumbs
 
     .accordion
       .accordion-group
         .accordion-heading.text-center
-          = link_to 'Поисковая оптимизация', '#collapse-three', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
+          = link_to t(:seo), '#collapse-three', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
         .accordion-body.in.collapse#collapse-three
           .accordion-inner
             .control-group
@@ -92,7 +92,6 @@
     .row-fluid        
       .span12
         .form-actions
-          .btn-group
-            = f.submit :class => "btn btn-primary"
-            = link_to "Отмена", pages_url, :class => "btn"   
-          = link_to "Удалить страницу", @page, :confirm => 'Вы уверены?', :method => :delete, :class => "btn btn-danger pull-right" unless @page.new_record?
+          = f.submit :class => "btn btn-primary"
+          = link_to t(:cancel), pages_url, :class => "btn"
+          = link_to t(:delete_page), @page, :confirm => t(:are_you_sure?), :method => :delete, :class => "btn btn-danger pull-right" unless @page.new_record?

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

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Редактирование страницы
+  =t :edit_page
    
 %section.span12
   = render 'form'

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

@@ -3,21 +3,22 @@
   %head
     %meta{'charset' => 'utf-8'}/
     %meta{'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1'}/
-    %title Страница не найдена
+    %title=t :page_not_found
     
     = stylesheet_link_tag 'styles'
     = csrf_meta_tag
     = favicon_link_tag
 
+    %style
+      body { font-family: 'Arial', sans-serif; }
+
   %body
     .b-error-404
-      %h1.b-error-404__h1 Ошибка 404
-      %p.b-error-404__text
-        Не правильно набран адрес,
-        %br/
-        или такой страницы на сайте больше не существует.
+      %h1.b-error-404__h1
+        =t :error
+        404
       %p
-        = link_to "Главная страница сайта", '/', :class => "b-error-404__link-home"
-        //%br/
-        //= link_to "Карта сайта", "/sitemap"
+        = link_to t(:homepage), '/', :class => "b-error-404__link-home"
+        %br/
+        = link_to t(:sitemap), "/sitemap"
 

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

@@ -1,12 +1,12 @@
 - content_for :page_title do
-  Структура
+  =t :structure
 
 - content_for :actions do
   .span4.clearfix.text-right
-    = link_to "<i class='icon-plus icon-white'></i>".html_safe, pages.new_page_path, :class => "btn btn-success"
+    = 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.span8
-  %ul#tree.treeview-gray
+%section.b-tree.span8
+  %ul
     - @roots.each do |root|
       - level = root.level
       - last_page = nil

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

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Создание страницы
+  =t :new_page
 
 %section.span12
   = render 'form'

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

@@ -17,17 +17,17 @@
     .control-group
       = f.label :parent, :class => 'control-label'
       .controls
-        = f.select :parent_id, options_for_select(for_select(@roots), :selected => @template.parent_id), :include_blank => 'Нет'
+        = f.select :parent_id, options_for_select(for_select(@roots), :selected => @template.parent_id), :include_blank => t(:no)
 
     .control-group
       = f.label :child, :class => 'control-label'
       .controls
-        = f.select :child_id, options_for_select(for_select(@roots), :selected => @template.child_id), :include_blank => 'Нет'
+        = f.select :child_id, options_for_select(for_select(@roots), :selected => @template.child_id), :include_blank => t(:no)
 
     - unless @template.new_record?
       .control-group
         .controls
-          = link_to "<i class='icon-plus icon-white'></i> Добавить поле".html_safe, new_field_path(@template.id), :class => "btn btn-mini btn-success"
+          = link_to "<i class='icon-plus icon-white'></i> #{t :new_field}".html_safe, new_field_path(@template.id), :class => "btn btn-mini btn-link"
 
     - @template.fields.each do |field|
       .control-group
@@ -37,12 +37,11 @@
           = link_to "<i class='icon-arrow-up'></i>".html_safe, field_move_up_path(field), :class => "btn btn-mini #{"disabled" if field.first?}"
 
           = link_to "<i class='icon-pencil icon-white'></i>".html_safe, edit_field_path(field, field.template), :class => "btn btn-mini btn-primary"
-          = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), :method => :delete, :confirm => "Вы уверены?", :class => "btn btn-mini btn-danger"
+          = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), :method => :delete, :confirm => t(:are_you_sure?), :class => "btn btn-mini btn-danger"
 
     .row-fluid
       .span12
         .form-actions
-          .btn-group
-            = f.submit :class => "btn btn-primary"
-            = link_to "Отмена", templates_url, :class => "btn"
-          = link_to "Удалить шаблон", @template, :confirm => 'Вы уверены?', :method => :delete, :class => "btn btn-danger pull-right" unless @template.new_record?
+          = f.submit :class => "btn btn-primary"
+          = link_to t(:cancel), templates_url, :class => "btn"
+          = link_to t(:delete_template), @template, :confirm => t(:are_you_sure?), :method => :delete, :class => "btn btn-danger pull-right" unless @template.new_record?

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

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Редактирование шаблона
+  =t :edit_template
 
 %section.span12
   = render 'form'

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

@@ -1,12 +1,12 @@
 - content_for :page_title do
-  Шаблоны
+  =t :templates
 
 - content_for :actions do
   .span4.clearfix.text-right
-    = link_to 'Создать шаблон', new_template_path, :class => "btn btn-success btn-large"
+    = link_to "<i class='icon-plus icon-white'></i> #{t :new_template}".html_safe, new_template_path, :class => "btn btn-link btn-large"
 
-%section.span8
-  %ul#tree.treeview-gray
+%section.b-tree.span8
+  %ul
     - @roots.each do |root|
       - level = root.level
       - last_template = nil

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

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Создание шаблона
+  =t :new_template
 
 %section.span12
   = render 'form'

data/config/locales/en.yml

@@ -0,0 +1,34 @@
+en:
+  structure: 'Structure'
+  templates: 'Templates'
+  settings: 'Settings'
+  new_field: 'New field'
+  edit_field: 'Edit field'
+  seo: 'SEO'
+  display_in: 'Display in'
+
+  string: 'String'
+  integer: 'Integer'
+  float: 'Float'
+  boolean: 'Boolean'
+  date: 'Date'
+  text: 'Text'
+  html: 'HTML'
+  image: 'Image'
+
+  menu: 'Menu'
+  breadcrumbs: 'Breadcrumbs'
+
+  are_you_sure?: 'Are you sure?'
+
+  new_page: 'New page'
+  edit_page: 'Edit page'
+  delete_page: 'Delete page'
+
+  new_template: 'New template'
+  edit_template: 'Edit template'
+  delete_template: 'Delete template'
+
+  new_field: 'New field'
+
+  page_not_found: 'Page not found'

data/config/locales/ru.yml

@@ -1,4 +1,37 @@
 ru:
+  structure: 'Структура'
+  templates: 'Шаблоны'
+  settings: 'Настройки'
+  new_field: 'Новое поле'
+  edit_field: 'Редактирование поля'
+  seo: 'Поисковая оптимизация'
+  are_you_sure?: 'Вы уверены?'
+  display_in: 'Отображать в'
+
+  menu: 'Меню'
+  breadcrumbs: 'Хлебные крошки'
+
+  new_page: 'Создать страницу'
+  edit_page: 'Редактирование страницы'
+  delete_page: 'Удалить страницу'
+
+  new_template: 'Создать шаблон'
+  edit_template: 'Редактирование шаблона'
+  delete_template: 'Удалить шаблон'
+
+  new_field: 'Добавить поле'
+
+  string: 'Строка'
+  integer: 'Целое число'
+  float: 'Дробное число'
+  boolean: 'Булево'
+  date: 'Дата'
+  text: 'Текст'
+  html: 'HTML'
+  image: 'Изображение'
+
+  page_not_found: 'Страница не найдена'
+
   activerecord:
     attributes:
       constructor_pages/field:

data/constructor-pages.gemspec

@@ -23,9 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack-cache'
   s.add_dependency 'awesome_nested_set', '~> 2.0'
   s.add_dependency 'haml-rails'
-  s.add_dependency 'aws-s3'
-  s.add_dependency 'russian', '~> 0.6.0'
-  s.add_dependency 'RedCloth'
   s.add_dependency 'acts_as_list'
 
   s.add_development_dependency 'rspec-rails'

data/lib/constructor-pages.rb

@@ -1,7 +1,5 @@
 require 'awesome_nested_set'
 require 'haml-rails'
-require 'russian'
-require 'redcloth'
 require 'constructor_pages/engine'
 require 'rack/cache'
 require 'acts_as_list'

data/spec/models/constructor_pages/page_model_spec.rb

@@ -97,6 +97,14 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-14 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.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -91,54 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: russian
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +178,7 @@ files:
 - app/views/constructor_pages/templates/index.haml
 - app/views/constructor_pages/templates/new.haml
 - config/initializers/dragonfly.rb
+- config/locales/en.yml
 - config/locales/ru.yml
 - config/routes.rb
 - constructor-pages.gemspec