constructor-pages 0.9.1 → 1.0.0beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e755c7454fde82d556e68e6749f7b00f1978329c
-  data.tar.gz: 08e089d2046af17158a9d625e021d6201bc37f6b
+  metadata.gz: 076592077cf4756361ca5c20ab57059950ffc7f5
+  data.tar.gz: b6fdd943392882e13f845a80b61a02696a449230
 SHA512:
-  metadata.gz: 8688f88106b25e39fd86809883682dbebd091b208513e7141979983541606ba9c304ec22e67231f88d2e4dbd655a4e9901b69bc3760cc4783eef3a9f60cbf3ba
-  data.tar.gz: b352ae490e4241bae3ea985ca6c6daf4bd54e7d0f2b02ae6c5fbf7845d14339896b69680debd5fe190702d295d359a2a144f6579b39e0ac763406cc9c6af3fd8
+  metadata.gz: ad18e8a26816becc289dd612ddd8270cdc3babacb8deb4b792f0e108e557fcec13138135b49fc1ab2cf4c430f3f97e17c0c8ef3ef36d579a36594cbb487577d3
+  data.tar.gz: 72d2db5db1bd322ec155f42e77284b1e952f002692f485f848a5b1ef34afa42d62c442abddc5cb342fce915ab9a1fb81776fe812ec0e4b36c710fe8f9ff9a0d8

data/app/controllers/constructor_pages/fields_controller.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
 module ConstructorPages
-  class FieldsController < ApplicationController
+  class FieldsController < ConstructorCore::ApplicationController
+    include TheSortableTreeController::Rebuild
+    include TheSortableTreeController::ExpandNode
+
     def new
       @field = Field.new.tap {|f| @template = f.template = Template.find(params[:template_id])}
     end
@@ -50,7 +53,13 @@ module ConstructorPages
       redirect_to edit_template_url(template), notice: t(:field_success_removed, name: name)
     end
 
-    %w{up down}.each {|m| define_method "move_#{m}" do move_to m.to_sym end}
+    def sortable_model
+      Field
+    end
+
+    def sortable_collection
+      ConstructorPages::Field
+    end
 
     private
 
@@ -62,11 +71,5 @@ module ConstructorPages
           :type_value
       )
     end
-
-    def move_to(to)
-      @field = Field.find(params[:id])
-      to == :up ? @field.move_higher : @field.move_lower
-      redirect_to :back, notice: t(:field_success_moved, name: @field.name)
-    end
   end
 end

data/app/controllers/constructor_pages/pages_controller.rb

@@ -1,15 +1,16 @@
 # encoding: utf-8
 
 module ConstructorPages
-  class PagesController < ApplicationController
-    layout 'constructor_core/application_core', except: [:show]
+  class PagesController < ConstructorCore::ApplicationController
+    include TheSortableTreeController::Rebuild
+    include TheSortableTreeController::ExpandNode
 
-    movable :page
+    layout 'constructor_core/application_core', except: [:show]
 
     before_filter -> {@pages = Page.all}, only: [:new, :edit]
 
     def index
-      @pages = Page.includes(:template).load
+      @pages = Page.nested_set.roots.includes(:template)
       @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.id, p.name, p.full_url, p.in_url, p.template.lft, p.lft, p.template_id]}.join)
       @template_exists = Template.count != 0
       flash[:notice] = 'Create at least one template' unless @template_exists
@@ -83,6 +84,10 @@ module ConstructorPages
       redirect_to pages_path, notice: t(:page_success_removed, name: @page.name)
     end
 
+    def sortable_model
+      Page
+    end
+
     private
 
     def page_params

data/app/controllers/constructor_pages/templates_controller.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 
 module ConstructorPages
-  class TemplatesController < ApplicationController
-    include TreeviewHelper
+  class TemplatesController < ConstructorCore::ApplicationController
+    include TheSortableTreeController::Rebuild
+    include TheSortableTreeController::ExpandNode
 
-    movable :template
-
-    before_filter -> {@templates = Template.all}, only: [:index, :new, :edit, :update, :create]
+    before_filter -> {@templates = Template.all}, only: [:new, :edit, :update, :create]
 
     def index
+      @templates = Template.roots
       @templates_cache = Digest::MD5.hexdigest(@templates.map{|t| [t.id, t.name, t.lft]}.join)
     end
 
@@ -52,6 +52,10 @@ module ConstructorPages
       end
     end
 
+    def sortable_model
+      Template
+    end
+
     private
 
     def template_params

data/app/helpers/constructor_pages/for_select.rb

@@ -0,0 +1,13 @@
+module ConstructorPages
+  module ForSelect
+    def for_select(items, full_url = false)
+      result = []
+      items && items.each do |i|
+        arr = ["#{'--'*i.level} #{i.name}", i.id]
+        arr << {'data-full_url' => i.full_url} if full_url
+        result.push(arr)
+      end
+      result
+    end
+  end
+end

data/app/helpers/constructor_pages/pages_helper.rb

@@ -1,6 +1,6 @@
 module ConstructorPages
   module PagesHelper
-    include TreeviewHelper
+    include ForSelect
 
     def templates
       Template.all.map{|t| ["#{'--'*t.level} #{t.name}", t.id]}

data/app/helpers/constructor_pages/templates_helper.rb

@@ -1,5 +1,5 @@
 module ConstructorPages
   module TemplatesHelper
-    include TreeviewHelper
+    include ForSelect
   end
 end

data/app/models/constructor_pages/page.rb

@@ -4,6 +4,7 @@ module ConstructorPages
   # Page model. Pages are core for company websites, blogs etc.
   class Page < ActiveRecord::Base
     include ActiveSupport::Inflector
+    include TheSortableTree::Scopes
 
     # Adding has_many for all field types
     Field::TYPES.each do |t|

data/app/models/constructor_pages/template.rb

@@ -9,6 +9,7 @@ module ConstructorPages
   class Template < ActiveRecord::Base
     # Adding code_name_uniqueness method
     include CodeNameUniq
+    include TheSortableTree::Scopes
 
     validates_presence_of :name, :code_name
     validates_uniqueness_of :code_name

data/app/models/constructor_pages/types/image_type.rb

@@ -5,6 +5,7 @@ module ConstructorPages
     # Image type. Render select file field.
     class ImageType < ActiveRecord::Base
       extend Dragonfly::Model
+
       belongs_to :field
       belongs_to :page, touch: true
 

data/app/views/constructor_pages/fields/_field.html.slim

@@ -1,11 +1,6 @@
-.control-group
-  = label_tag '', field.name, class: 'control-label'
-  .controls
-    = link_to field_move_down_path(field), class: "btn btn-mini #{'disabled' if field.last?}" do
-      i.icon-arrow-down
-    = link_to field_move_up_path(field), class: "btn btn-mini #{'disabled' if field.first?}" do
-      i.icon-arrow-up
-    = link_to edit_template_field_path(field.template, field), class: 'btn btn-mini btn-primary' do
-      i.icon-pencil
-    = link_to [field.template, field], method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-mini btn-danger' do
-      i.icon-remove
+.b-form__row
+  = label_tag '', field.name, class: 'b-form__label'
+  = link_to edit_template_field_path(field.template, field), class: 'b-button b-button_size_small b-button_color_light' do
+    i.fa.fa-pencil
+  = link_to [field.template, field], method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'b-button b-button_size_small b-button_color_light' do
+    i.fa.fa-times

data/app/views/constructor_pages/fields/_form.html.slim

@@ -1,29 +1,25 @@
 = form_for [@template, @field] do |f|
   - if @field.errors.any?
-    .alert.alert-error.fade.in.span12
+    .b-error
       = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
       - @field.errors.full_messages.each do |m|
         = m
 
-  .form-horizontal
-    .control-group
-      = f.label :name, class: 'control-label'
-      .controls= f.text_field :name, class: 'span4'
+  .b-form__row
+    = f.label :name, class: 'b-form__label'
+    = f.text_field :name, class: 'b-form__field'
 
-    .control-group
-      = f.label :code_name, class: 'control-label'
-      .controls= f.text_field :code_name, class: 'span4'
-      = f.hidden_field :template_id, value: @template.id, class: 'span4'
+  .b-form__row
+    = f.label :code_name, class: 'b-form__label'
+    = f.text_field :code_name, class: 'b-form__field'
+    = f.hidden_field :template_id, value: @template.id
 
-    - unless @field.type_value == 'image'
-      .control-group
-        = f.label :type_value, class: 'control-label'
-        .controls
-          = f.select :type_value, options_for_select(types_value, selected: @field.type_value), class: 'span4'
+  - unless @field.type_value == 'image'
+    .b-form__row
+      = f.label :type_value, class: 'b-form__label'
+      = f.select :type_value, options_for_select(types_value, selected: @field.type_value), class: 'b-form__field'
 
-    .row-fluid
-      .span12
-        .form-actions
-          = f.submit class: 'btn btn-primary'
-          = link_to t(:cancel), edit_template_path(@template), class: 'btn'
-          = link_to t(:delete_field), [@template, @field], method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @field.new_record?
+  .b-form__actions
+    = f.submit class: 'b-button'
+    = link_to t(:cancel), edit_template_path(@template), class: 'b-button b-button_color_light'
+    = link_to t(:delete_field), [@template, @field], method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @field.new_record?

data/app/views/constructor_pages/fields/edit.html.slim

@@ -1,6 +1,5 @@
-- content_for :page_title do
+.b-header
   =t :edit_field
 
-section.span12
-  = render 'form'
+= render 'form'
 

data/app/views/constructor_pages/fields/new.html.slim

@@ -1,6 +1,5 @@
-- content_for :page_title do
+.b-header
   =t :new_field
 
-section.span12
-  = render 'form'
+= render 'form'
 

data/app/views/constructor_pages/fields/types/_float.html.slim

@@ -1 +1 @@
-= number_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2', step: 'any'
+= number_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'b-form__field', step: 'any'

data/app/views/constructor_pages/fields/types/_image.html.slim

@@ -2,6 +2,5 @@
 
 - if image
   = image_tag image.thumb('200x200').url
-  br
 
-= file_field_tag "fields[#{field.code_name}]", class: 'span6'
+= file_field_tag "fields[#{field.code_name}]", class: 'b-form__file'

data/app/views/constructor_pages/fields/types/_integer.html.slim

@@ -1 +1 @@
-= number_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2'
+= number_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'b-form__field'

data/app/views/constructor_pages/pages/_field.html.slim

@@ -1,4 +1,3 @@
-.control-group
-  = label_tag "fields[#{field.code_name}]", field.name, class: 'control-label'
-  .controls
-    = render "constructor_pages/fields/types/#{field.type_value}", field: field, page: @page
+.b-form__row
+  = label_tag "fields[#{field.code_name}]", field.name, class: 'b-form__label'
+  = render "constructor_pages/fields/types/#{field.type_value}", field: field, page: @page

data/app/views/constructor_pages/pages/_form.html.slim

@@ -1,97 +1,80 @@
-= form_for @page, html: {multipart: @page.multipart?} do |f|
+= form_for @page, html: {multipart: @page.multipart?, class: 'b-form'} do |f|
   - if @page.errors.any?
-    .row-fluid
-      .alert.alert-error.fade.in.span12
-        = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
-        - @page.errors.full_messages.each do |m|
-          = m
-          
-  .form-horizontal
-    .control-group
-      = f.label :active, class: 'control-label'
-      .controls= f.check_box :active, class: 'span6'
-
-    .control-group
-      = f.label :name, class: 'control-label'
-      .controls= f.text_field :name, class: 'span4'
-
-    .control-group.auto_url
-      = f.label :auto_url, class: 'control-label'
-      .controls
-        = f.check_box :auto_url, class: 'span9'
-
-    .control-group.url
-      = f.label :url, class: 'control-label'
-      .controls
-        .full_url
-          span.path= @page.parent.full_url if @page.parent
-          | /
-          span.address= @page.url
-        = f.text_field :url, class: 'span3'
-        i.address_icon.icon-pencil<
-
-    = render partial: 'field', collection: @page.fields
-
-    .accordion
-      .accordion-group
-        .accordion-heading.text-center
-          = link_to t(:settings), '#collapse', class: 'accordion-toggle', 'data-toggle' => 'collapse'
-        .accordion-body.in.collapse#collapse
-          .accordion-inner
-            .control-group
-              = f.label :parent_id, class: 'control-label'
-              .controls
-                = f.select :parent_id, options_for_select(for_select(@pages, true), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: '--'
-
-            .control-group
-              = f.label :template_id, :class => 'control-label'
-              .controls
-                = f.select :template_id,  options_for_select(templates, selected: @template_id)
-            .control-group
-              = f.label :redirect, class: 'control-label'
-              .controls
-                = f.text_field :redirect, class: 'span9'
-            .control-group
-              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
-
-                label.checkbox.inline.span2 for='in_url'
-                  = f.check_box :in_url
-                  =t :url
-
-    .accordion
-      .accordion-group
-        .accordion-heading.text-center
-          = link_to t(:seo), '#collapse-three', class: 'accordion-toggle', 'data-toggle' => 'collapse'
-        .accordion-body.in.collapse#collapse-three
-          .accordion-inner
-            .control-group
-              = f.label :title, class: 'control-label'
-              .controls
-                = f.text_field :title, class: 'span9'
-            .control-group
-              = f.label :keywords, class: 'control-label'
-              .controls
-                = f.text_field :keywords, class: 'span9'
-            .control-group
-              = f.label :description, class: 'control-label'
-              .controls
-                = f.text_area :description, class: 'span9', rows: 8
-
-    .row-fluid        
-      .span12
-        .form-actions
-          = f.submit class: 'btn btn-primary'
-          = link_to t(:cancel), pages_url, class: 'btn'
-          = link_to t(:delete_page), @page, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @page.new_record?
+    .b-error
+      = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
+      - @page.errors.full_messages.each do |m|
+        = m
+
+  .b-form__row
+    = f.label :active, class: 'b-form__label'
+    = f.check_box :active
+
+  .b-form__row
+    = f.label :name, class: 'b-form__label'
+    = f.text_field :name, class: 'b-form__field'
+
+  .b-form__row.auto_url
+    = f.label :auto_url, class: 'b-form__label'
+    = f.check_box :auto_url
+
+  .b-form__row.url
+    = f.label :url, class: 'b-form__label'
+    .b-inline.b-full-url
+      span.b-full-url__path
+        = @page.parent.full_url if @page.parent
+        | /
+      span.b-full-url__url= @page.url
+      = f.text_field :url, class: 'b-form__field'
+      i.fa.fa-pencil.b-full-url__icon
+
+  = render partial: 'field', collection: @page.fields
+
+  .b-form__row
+    = f.label :parent_id, class: 'b-form__label'
+    = f.select :parent_id, options_for_select(for_select(@pages, true), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: '--'
+
+  .b-form__row
+    = f.label :template_id, class: 'b-form__label'
+    = f.select :template_id,  options_for_select(templates, selected: @template_id)
+
+  .b-form__row
+    = f.label :redirect, class: 'b-form__label'
+    = f.text_field :redirect, class: 'b-form__field'
+
+  .b-form__row
+    label.b-form__label
+      =t :display_in
+
+    label for='in_menu'
+    = f.check_box :in_menu
+    =t :menu
+
+    label for='in_map'
+    = f.check_box :in_map
+    =t :sitemap
+
+    label for='in_nav'
+    = f.check_box :in_nav
+    =t :breadcrumbs
+
+    label for='in_url'
+    = f.check_box :in_url
+    =t :url
+
+  .b-form__row
+    = f.label :title, class: 'b-form__label'
+    = f.text_field :title, class: 'b-form__field'
+
+
+  .b-form__row
+    = f.label :keywords, class: 'b-form__label'
+    = f.text_field :keywords, class: 'b-form__field'
+
+  .b-form__row
+    = f.label :description, class: 'b-form__label'
+    = f.text_area :description, class: 'b-form__field', rows: 8
+
+  .b-form__actions
+    = f.submit class: 'b-button'
+    = link_to t(:cancel), pages_url, class: 'b-button b-button_color_light'
+    = link_to t(:delete_page), @page, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'b-button b-button_color_light g-float_right' unless @page.new_record?

data/app/views/constructor_pages/pages/edit.html.slim

@@ -1,6 +1,5 @@
-- content_for :page_title do
+.b-header
   =t :edit_page
-   
-section.span12
-  = render 'form'
+
+= render 'form'
 

data/app/views/constructor_pages/pages/index.html.slim

@@ -1,31 +1,8 @@
-- content_for :page_title do
-  =t :structure
-
-- content_for :actions do
+.l-pages
   - if @template_exists
-    .span4.clearfix.text-right
-      = link_to pages.new_page_path, class: 'btn btn-large btn-link' do
-        i.icon-plus>
-        =t :new_page
-
-section.b-tree.span12
-  ul
-    - cache @pages_cache do
-      - @pages.each do |page|
-        li class="level#{page.level}"
-          - if page.published?
-            = link_to page.name, page.full_url, class: 'btn btn-link'
-          - else
-            button.btn.disabled= page.name
-
-          .b-tree__buttons
-            = arrow_buttons_for(page)
+    = link_to new_page_path, class: 'b-button' do
+      =t :new_page
 
-            = link_to edit_page_path(page), class: 'btn btn-primary btn-mini' do
-              i.icon-pencil>
-              =>t :edit
-              = page.template.to_accusative
 
-            = link_to page, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
-              i.icon-remove>
-              =t :delete
+  ol.b-block.b-tree.g-out data-rebuild_url="#{rebuild_pages_path}" data-expand-node-url="#{expand_node_pages_path}" data-cookie-store='true'
+    = expandable_tree(@pages, title: :name)

data/app/views/constructor_pages/pages/new.html.slim

@@ -1,6 +1,5 @@
-- content_for :page_title do
+.b-header
   =t :new_page
 
-section.span12
-  = render 'form'
+= render 'form'
 

data/app/views/constructor_pages/templates/_form.html.slim

@@ -1,37 +1,30 @@
-= form_for @template do |f|
+= form_for @template, html: {class: 'b-form'} do |f|
   - if @template.errors.any?
-    .row-fluid
-      .alert.alert-error.fade.in.span12
-        = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
-        - @template.errors.full_messages.each do |m|
-          = m
+    = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
+    - @template.errors.full_messages.each do |m|
+      = m
 
-  .form-horizontal
-    .control-group
-      = f.label :name, class: 'control-label'
-      .controls= f.text_field :name, class: 'span4'
+  .b-form__row
+    = f.label :name, class: 'b-form__label'
+    = f.text_field :name, class: 'b-form__field'
 
-    .control-group
-      = f.label :code_name, class: 'control-label'
-      .controls= f.text_field :code_name, class: 'span4'
+  .b-form__row
+    = f.label :code_name, class: 'b-form__label'
+    = f.text_field :code_name, class: 'b-form__field'
 
-    .control-group
-      = f.label :parent_id, class: 'control-label'
-      .controls
-        = f.select :parent_id, options_for_select(for_select(@templates), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: '--'
+  .b-form__row
+    = f.label :parent_id, class: 'b-form__label'
+    = f.select :parent_id, options_for_select(for_select(@templates), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: '--'
 
-    - unless @template.new_record?
-      .control-group
-        .controls
-          = link_to new_template_field_path(@template), class: 'btn btn-mini btn-link' do
-            i.icon-plus
-            =t :new_field
+  - unless @template.new_record?
+    .b-form__row
+      .b-form__label
+      = link_to new_template_field_path(@template), class: 'b-button b-button_color_light b-button_size_small' do
+        =t :new_field
 
     = render @template.fields
 
-    .row-fluid
-      .span12
-        .form-actions
-          = f.submit class: 'btn btn-primary'
-          = link_to t(:cancel), templates_url, class: 'btn'
-          = link_to t(:delete_template), @template, method: :delete, data: {confirm: t(:are_you_sure?)},  class: 'btn btn-danger pull-right' unless @template.new_record?
+  .b-form__actions
+    = f.submit class: 'b-button'
+    = link_to t(:cancel), templates_url, class: 'b-button b-button_color_light'
+    = link_to t(:delete_template), @template, method: :delete, data: {confirm: t(:are_you_sure?)},  class: 'b-button b-button_color_light g-float_right' unless @template.new_record?

data/app/views/constructor_pages/templates/edit.html.slim

@@ -1,6 +1,5 @@
-- content_for :page_title do
+.b-header
   =t :edit_template
 
-section.span12
-  = render 'form'
+= render 'form'
 

data/app/views/constructor_pages/templates/index.html.slim

@@ -1,27 +1,6 @@
-- content_for :page_title do
-  =t :templates
+.l-pages
+  = link_to new_template_path, class: 'b-button' do
+    =t :new_template
 
-- content_for :actions do
-  .span4.clearfix.text-right
-    = link_to new_template_path, class: 'btn btn-link btn-large' do
-      i.icon-plus>
-      =t :new_template
-
-section.b-tree.span12
-  ul
-    - cache @templates_cache do
-      - @templates.each do |template|
-        li class="level#{template.level}"
-          button.btn.btn-link.disabled= template.name
-
-          .b-tree__buttons
-            = arrow_buttons_for(template)
-
-            = link_to edit_template_path(template), class: 'btn btn-primary btn-mini' do
-              i.icon-pencil>
-              =>t :edit
-              = t(:template).mb_chars.downcase
-
-            = link_to template, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
-              i.icon-remove>
-              =t :delete
+  ol.b-block.b-tree.g-out data-rebuild_url="#{rebuild_templates_path}" data-expand-node-url="#{expand_node_templates_path}" data-cookie-store='true'
+    = expandable_tree(@templates, title: :name)

data/app/views/constructor_pages/templates/new.html.slim

@@ -1,6 +1,5 @@
-- content_for :page_title do
+.b-header
   =t :new_template
 
-section.span12
-  = render 'form'
+= render 'form'
 

data/app/views/pages/expand_node.slim

@@ -0,0 +1,8 @@
+ol.b-tree__nested-set
+  - @children.each do |child|
+    li.b-tree__li data-node-id="#{ child.id }"
+      .b-tree__item
+        i.fa.fa-bars.b-tree__handle
+        - unless child.leaf?
+          i.fa.fa-plus-square-o.b-tree__expand.b-tree__plus
+        = link_to child.name, edit_page_path(child), class: 'b-tree__link'

data/app/views/templates/expand_node.slim

@@ -0,0 +1,8 @@
+ol.b-tree__nested-set
+  - @children.each do |child|
+    li.b-tree__li data-node-id="#{ child.id }"
+      .b-tree__item
+        i.fa.fa-bars.b-tree__handle
+        - unless child.leaf?
+          i.fa.fa-plus-square-o.b-tree__expand.b-tree__plus
+        = link_to child.name, edit_template_path(child), class: 'b-tree__link'

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
-  structure: Structure
+  pages: Pages
   templates: Templates
   settings: Settings
   new_field: New field
@@ -30,8 +30,6 @@ en:
   menu: Menu
   breadcrumbs: Breadcrumbs
 
-  are_you_sure?: Are you sure?
-
   page_not_found: Page not found
 
   new_page: New page

data/config/locales/fr.yml

@@ -1,5 +1,5 @@
 fr:
-  structure: Structure
+  pages: Pages
   templates: Modèles
   settings: Réglages
   new_field: Nouveau champ
@@ -29,8 +29,6 @@ fr:
   menu: Menu
   breadcrumbs: Chapelure
 
-  are_you_sure?: Etes-vous sûr?
-
   page_not_found: Page introuvable
 
   new_page: Nouvelle page

data/config/locales/ru.yml

@@ -1,11 +1,10 @@
 ru:
-  structure: Структура
+  pages: Страницы
   templates: Шаблоны
   settings: Настройки
   new_field: Новое поле
   edit_field: Редактирование поля
   seo: Поисковая оптимизация
-  are_you_sure?: Вы уверены?
   display_in: Отображать в
   delete: Удалить
   url: "Адрес"

data/config/routes.rb

@@ -1,18 +1,27 @@
 ConstructorPages::Engine.routes.draw do
   scope '/admin' do
-    resources :pages, except: [:show]
+    resources :pages, except: [:show] do
+      collection do
+        post :rebuild
+        post :expand_node
+      end
+    end
+
     resources :templates, except: [:show] do
-      resources :fields, except: [:show, :index]
-    end  
+      collection do
+        post :rebuild
+        post :expand_node
+      end
 
-    %w{page template field}.each do |c|
-      %w{up down}.each do |d|
-        get "#{c.pluralize}/move/#{d}/:id" => "#{c.pluralize}#move_#{d}", as: "#{c}_move_#{d}"
+      resources :fields, except: [:show, :index] do
+        collection do
+          post :rebuild
+        end
       end
     end
   end
 
-  root :to => 'pages#show'
+  root to: 'pages#show'
 
   get '*all(.:format)' => 'pages#show', format: /(html|json|xml)/
 end

data/spec/features/constructor_pages/fields_spec.rb

@@ -47,12 +47,6 @@ module ConstructorPages
         find("a[href='#{pages.template_field_path(@template, @content_field)}']").should be_true
         find("a[href='#{pages.template_field_path(@template, @price_field)}']").should be_true
       end
-
-      it 'should has move field link' do
-        visit pages.edit_template_path(@template)
-        find("a[href='#{pages.field_move_down_path(@content_field)}']").should be_true
-        find("a[href='#{pages.field_move_up_path(@price_field)}']").should be_true
-      end
     end
 
     describe 'New field' do

data/spec/features/constructor_pages/pages_spec.rb

@@ -66,13 +66,7 @@ module ConstructorPages
       it 'should has edit_page link' do
         _page = Page.create name: 'Zanussi'
         visit pages.pages_path
-        page.should have_link 'Edit page', pages.edit_page_path(_page)
-      end
-
-      it 'should has delete_page link' do
-        _page = Page.create name: 'Zanussi'
-        visit pages.pages_path
-        page.should have_link 'Delete', pages.page_path(_page)
+        page.should have_link 'Zanussi', pages.edit_page_path(_page)
       end
     end
 
@@ -111,52 +105,6 @@ module ConstructorPages
       end
     end
 
-    describe 'Moving' do
-      it 'should move page' do
-        _page_first = Page.create name: 'First'
-        _page_second = Page.create name: 'Second'
-        _page_third = Page.create name: 'Third'
-
-        _page_first.left_sibling.should be_nil
-        _page_first.right_sibling.should == _page_second
-
-        _page_second.left_sibling.should == _page_first
-        _page_second.right_sibling.should == _page_third
-
-        _page_third.left_sibling.should == _page_second
-        _page_third.right_sibling.should be_nil
-
-        visit pages.pages_path
-        find("a[href='#{pages.page_move_down_path(_page_first.id)}']").click
-
-        _page_first.reload
-        _page_first.left_sibling.should == _page_second
-        _page_first.right_sibling.should == _page_third
-
-        _page_second.reload
-        _page_second.left_sibling.should be_nil
-        _page_second.right_sibling.should == _page_first
-
-        _page_third.reload
-        _page_third.left_sibling.should == _page_first
-        _page_third.right_sibling.should be_nil
-
-        find("a[href='#{pages.page_move_up_path(_page_third.id)}']").click
-
-        _page_first.reload
-        _page_first.left_sibling.should == _page_third
-        _page_first.right_sibling.should be_nil
-
-        _page_second.reload
-        _page_second.left_sibling.should be_nil
-        _page_second.right_sibling.should == _page_third
-
-        _page_third.reload
-        _page_third.left_sibling.should == _page_second
-        _page_third.right_sibling.should == _page_first
-      end
-    end
-
     describe 'New page' do
       describe 'Access' do
         it 'should be accessed by new_page_path if logged in' do
@@ -257,52 +205,9 @@ module ConstructorPages
         @page.description.should == 'Zanussi conditioners Voronezh'
         page.should have_text 'updated successfully'
       end
-
-      describe 'regenerate descendants' do
-        before :each do
-          _template = Template.create name: 'Another page', code_name: 'another_page'
-          _page_first = Page.create name: 'First', template: _template
-          _page_second = Page.create name: 'Second', parent_id: _page_first.id, template: _template
-          _page_third = Page.create name: 'Third', parent_id: _page_second.id, template: _template
-
-          visit pages.pages_path
-          page.should have_link('First', '/first')
-          page.should have_link('Second', '/first/second')
-          page.should have_link('Third', '/first/second/third')
-
-          visit pages.edit_page_path(_page_first)
-        end
-
-        it 'should regenerate full_url of descendants without url if full_url or in_url changed' do
-          uncheck 'URL'
-          click_button 'Update Page'
-
-          page.should have_link('First', '/first')
-          page.should have_link('Second', '/second')
-          page.should have_link('Third', '/second/third')
-        end
-
-        it 'should regenerate full_url of descendants with url if full_url or in_url changed' do
-          uncheck 'URL'
-          click_button 'Update Page'
-
-          page.should have_link('First', '/first')
-          page.should have_link('Second', '/first/second')
-          page.should have_link('Third', '/first/second/third')
-        end
-      end
     end
 
     describe 'Delete page' do
-      it 'should delete from pages index' do
-        Page.create name: 'Page'
-        visit pages.pages_path
-        Page.count.should == 1
-        click_link 'Delete'
-        Page.count.should == 0
-        page.should have_text 'removed successfully'
-      end
-
       it 'should delete from page' do
         _page = Page.create name: 'Page'
         visit pages.edit_page_path(_page)

data/spec/features/constructor_pages/templates_spec.rb

@@ -51,60 +51,7 @@ module ConstructorPages
       it 'should has edit_template link' do
         _template = Template.create name: 'Page', code_name: 'page'
         visit pages.templates_path
-        page.should have_link 'Edit template', pages.edit_template_path(_template)
-      end
-
-      it 'should has delete_page link' do
-        _template = Template.create name: 'Page', code_name: 'page'
-        visit pages.templates_path
-        page.should have_link 'Delete', pages.template_path(_template)
-      end
-    end
-
-    describe 'Moving' do
-      it 'should move template' do
-        _template_first = Template.create name: 'First', code_name: 'first'
-        _template_second = Template.create name: 'Second', code_name: 'second'
-        _template_third = Template.create name: 'Third', code_name: 'third'
-
-        _template_first.left_sibling.should be_nil
-        _template_first.right_sibling.should == _template_second
-
-        _template_second.left_sibling.should == _template_first
-        _template_second.right_sibling.should == _template_third
-
-        _template_third.left_sibling.should == _template_second
-        _template_third.right_sibling.should be_nil
-
-        visit pages.templates_path
-
-        find("a[href='#{pages.template_move_down_path(_template_first.id)}']").click
-
-        _template_first.reload
-        _template_first.left_sibling.should == _template_second
-        _template_first.right_sibling.should == _template_third
-
-        _template_second.reload
-        _template_second.left_sibling.should be_nil
-        _template_second.right_sibling.should == _template_first
-
-        _template_third.reload
-        _template_third.left_sibling.should == _template_first
-        _template_third.right_sibling.should be_nil
-
-        find("a[href='#{pages.template_move_up_path(_template_third.id)}']").click
-
-        _template_first.reload
-        _template_first.left_sibling.should == _template_third
-        _template_first.right_sibling.should be_nil
-
-        _template_second.reload
-        _template_second.left_sibling.should be_nil
-        _template_second.right_sibling.should == _template_third
-
-        _template_third.reload
-        _template_third.left_sibling.should == _template_second
-        _template_third.right_sibling.should == _template_first
+        page.should have_link 'Page', pages.edit_template_path(_template)
       end
     end
 
@@ -234,15 +181,6 @@ module ConstructorPages
     end
 
     describe 'Delete template' do
-      it 'should delete from templates index' do
-        Template.create name: 'Page', code_name: 'page'
-        visit pages.templates_path
-        Template.count.should == 1
-        click_link 'Delete'
-        Template.count.should == 0
-        page.should have_text 'removed successfully'
-      end
-
       it 'should delete from template' do
         _template = Template.create name: 'Page', code_name: 'page'
         visit pages.edit_template_path(_template)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0beta1
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0beta1
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -122,15 +122,14 @@ files:
 - app/assets/javascripts/constructor_pages/.keep
 - app/assets/javascripts/constructor_pages/urlify.js
 - app/assets/stylesheets/constructor_pages/.keep
-- app/controllers/constructor_pages/application_controller.rb
 - app/controllers/constructor_pages/fields_controller.rb
 - app/controllers/constructor_pages/pages_controller.rb
 - app/controllers/constructor_pages/templates_controller.rb
 - app/helpers/constructor_pages/code_name_uniq.rb
 - app/helpers/constructor_pages/fields_helper.rb
+- app/helpers/constructor_pages/for_select.rb
 - app/helpers/constructor_pages/pages_helper.rb
 - app/helpers/constructor_pages/templates_helper.rb
-- app/helpers/constructor_pages/treeview_helper.rb
 - app/models/constructor_pages/field.rb
 - app/models/constructor_pages/page.rb
 - app/models/constructor_pages/template.rb
@@ -163,6 +162,8 @@ files:
 - app/views/constructor_pages/templates/edit.html.slim
 - app/views/constructor_pages/templates/index.html.slim
 - app/views/constructor_pages/templates/new.html.slim
+- app/views/pages/expand_node.slim
+- app/views/templates/expand_node.slim
 - config/initializers/dragonfly.rb
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -217,9 +218,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11

data/app/controllers/constructor_pages/application_controller.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-
-module ConstructorPages
-  class ApplicationController < ConstructorCore::ApplicationController
-    def self.movable(what)
-      %w{up down}.each {|m| define_method "move_#{m}" do move_to what, params[:id], m.to_sym end}
-    end
-
-    def move_to(what, id, to)
-      from = ('constructor_pages/'+what.to_s).classify.constantize.find(id)
-      to_sibling = to == :up ? from.left_sibling : from.right_sibling
-
-      if not to_sibling.nil? and from.move_possible?(to_sibling)
-        to == :up ? from.move_left : from.move_right
-      end
-
-      redirect_to :back
-    end
-  end
-end

data/app/helpers/constructor_pages/treeview_helper.rb

@@ -1,27 +0,0 @@
-module ConstructorPages
-  module TreeviewHelper
-    def arrow_buttons_for(item)
-      output = "<div class='btn-group'>"
-
-      {down: :right, up: :left}.each_pair do |a, b|
-        sibling = item.send(b.to_s+'_sibling')
-        if sibling and item.move_possible?(sibling)
-          output += link_to("<i class='icon-arrow-#{a}'></i>".html_safe, "/admin/#{item.class.to_s.demodulize.downcase.pluralize}/move/#{a}/#{item.id}", class: 'btn btn-mini')
-        end
-      end
-
-      output += "</div>"
-      output.html_safe
-    end
-
-    def for_select(items, full_url = false)
-      result = []
-      items && items.each do |i|
-        arr = ["#{'--'*i.level} #{i.name}", i.id]
-        arr << {'data-full_url' => i.full_url} if full_url
-        result.push(arr)
-      end
-      result
-    end
-  end
-end