aerogel-pages 1.4.12 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e26c560b6efb0c21e672cdec8a7ff2ebf041c1b
-  data.tar.gz: eb661e738d4d57d2d5808c7ae1b16f7f7d53ab1d
+  metadata.gz: a7fc6805efa9811f6d76a551bf6d7d2c1000f0bc
+  data.tar.gz: 24021121763b86687a79764e6d2554e12a4a58e2
 SHA512:
-  metadata.gz: 7877fad07008c646599daff5ad77adc06d5e6f589e3dc2911c06f3bf7cd6789f61cad45d58907bc61f8553cf95abd51a1ea8ffba700c712b1e5378c4d721d83d
-  data.tar.gz: 076ff583a35fabd307a3edf87cad5a1956875f20919998d00af042c14c2b7788f7f7a61f9926e56581527d577c7876a025a52ce120bc9a50e6b323602243a2c3
+  metadata.gz: 82155ceec35741890c97862ab65862934fa7890b98ef178a8beff3bfda82995f947b1d1e7d7d91597302c03f3f0d260678335883aca5a70bccfe1fb55c3aa943
+  data.tar.gz: 9fc7908a47cdfbcd5bd31556f1b17fce9c5fc18b1ceebb6f98d30f14edfaa2060904845a1c6c6aefcc0c3fe944086e92a90f958ebabcf48fd416c78969149255

data/app/routes/admin-pages.rb

@@ -8,6 +8,27 @@ namespace "/admin/pages" do
     pass
   end
 
+  post "/pages_reorder" do
+    positions = {}
+    params[:page_nodes].each do |id, data|
+      parent_id = data['parent_id']
+      page_node = PageNode.find( id ) or halt 404
+      if positions.key? parent_id
+        new_position = ( positions[parent_id] += 1 )
+      else
+        new_position = ( positions[parent_id] = 0 )
+      end
+      page_node.parent_id = parent_id
+      page_node.position = new_position
+      unless page_node.save
+        halt 500, page_node.errors.full_messages
+      end
+    end
+    redirect "/admin/pages/", notice: t.aerogel.admin.pages.reordered
+    # pass
+  end
+
+
   namespace "/:lang-:id" do
     before do
       @lang = params[:lang]
@@ -68,7 +89,7 @@ namespace "/admin/pages" do
       parent_id = @page_node.parent_id
       @page_node.destroy
       redirect "/admin/pages/#{@lang}-#{parent_id}",
-        notice: "Page \"#{admin_pages_title_as_text @page_node, @lang}\" deleted."
+        notice: t.aerogel.admin.pages.deleted( title: admin_pages_title_as_text( @page_node, @lang ) )
     end
 
 

data/assets/javascripts/admin-pages/pages-widget.js.coffee

@@ -30,6 +30,13 @@ class @PagesWidget
         @push_state()
         log "on_page_selected: id:#{@current_state.page_node_id}"
 
+    # Callback invoked by tree 'reorder pages' action
+    on_pages_reorder_started: () =>
+        @current_state.pages_reorder_enabled = true
+        # @current_state.page_attributes = object.attributes
+        @push_state()
+        log "on_pages_reorder: started!"
+
 
     # Callback invoked on pane open/close events
     on_pane_open: ( left_middle_right ) =>
@@ -43,12 +50,17 @@ class @PagesWidget
 
     push_state: ->
         # push current state to history,
+        #@history_id ?= 1
+        #@history_id += 1
         url = ''
         if @current_state.page_node_id?
             url = "#{@current_state.lang}-#{@current_state.page_node_id}"
+        # if !!@current_state.pages_reorder_enabled
+        #    url = "#{url}#reorder_pages"
         log "setting url to '#{url}'"
         log "setting lang '#{@current_state.lang}'"
         History.pushState( @current_state, @current_title, url )
+        @update( @current_state )
 
 
     set_state: ( state ) ->

data/assets/javascripts/admin-pages/pane-tree.js.coffee

@@ -11,6 +11,7 @@ class @PaneTree
         @tree_table = new SmartTreeTable @element.find( tree_selector ).first(),
             column: tree_column
             on_select: @on_tree_item_selected
+            on_tree_change: @on_tree_changed
             prefix:
                 branch:
                     expanded: '<i class="prefix-expanded fa fa-caret-down"></i>'
@@ -30,12 +31,28 @@ class @PaneTree
             footer: @bottom_toolbar()
             observe: $('.pane-tree .content')
 
+        @pages_reorder_enabled = false
+        $("body").on "click", "A.pages-reorder-link", (e) =>
+            e.preventDefault()
+            pages_widget.on_pages_reorder_started()
+
+        $("body").on "click", ".pages-reorder-save-link", (e) =>
+            e.preventDefault()
+            log "** save reordered pages"
+            for row in @ordered_row_list()
+                log "** #{row.id}: parent:#{row.parent_id}"
+
         log "initialized"
 
     # Updates pane tree widget
     #
     update: (state) ->
+        log "** update:"
         @tree_table.select state.page_node_id, false
+        if !!state.pages_reorder_enabled && !@pages_reorder_enabled
+            @tree_table.enable_drag_and_drop()
+            @pages_reorder_enabled = true
+            log "** pages reorder enabled!"
         @scroll_to_view state.page_node_id
         @update_bottom_toolbar state
         @update_top_toolbar state
@@ -65,12 +82,29 @@ class @PaneTree
     on_tree_item_selected: (id, object, el) =>
         pages_widget.on_page_selected id, object
 
+    # Callback to be invoked when pages (tree branches/leaves) are reordered
+    #
+    on_tree_changed: () =>
+        log "** tree changed!"
+        form = @bottom_toolbar('.pages-reorder-actions form').first()
+        form.find("input.page_nodes").remove()
+        for row in @ordered_row_list()
+            parent_id = if row.parent_id? then row.parent_id else ''
+            form.append("<input type='hidden' name='page_nodes[#{row.id}][parent_id]' value='#{parent_id}' class='page_nodes'/>")
+            log "** #{row.id}: parent:#{row.parent_id}"
+
 
     # Returns row object specified by given +id+
     #
     find_row_by_id: (id) ->
         @tree_table.rows[id]
 
+    # Returns ordered list of rows as objects with +id+, +parent_id+
+    #
+    ordered_row_list: ->
+        { id: row.id, parent_id: row.parent_id } for row in @tree_table.rows_list()
+
+
     # Returns action buttons elements, or elements within buttons specified by +selector+
     #
     bottom_toolbar: (selector = '') ->
@@ -79,15 +113,25 @@ class @PaneTree
     # Updates action buttons state and labels
     #
     update_bottom_toolbar: (state) ->
-        unless state.page_node_id?
+        unless state.page_node_id? || @pages_reorder_enabled
+            log "** update_bottom_toolbar: disabling"
             @bottom_toolbar().hide()
             return
         object = @find_row_by_id state.page_node_id
         @bottom_toolbar().show()
-        @bottom_toolbar('.page-append-link').attr 'href', pages_widget.url_to_action 'append'
-        @bottom_toolbar('.page-insert-link').attr 'href', pages_widget.url_to_action 'insert'
-        @bottom_toolbar('.page-delete-link').attr 'href', pages_widget.url_to_action 'delete'
-        @bottom_toolbar(' .page-name').text object.contents
+        if @pages_reorder_enabled
+            @bottom_toolbar('.pages-reorder-actions').show()
+            @bottom_toolbar('.page-actions').hide()
+        else
+            @bottom_toolbar('.pages-reorder-actions').hide()
+            if state.page_node_id?
+                @bottom_toolbar('.page-actions').show()
+                @bottom_toolbar('.page-append-link').attr 'href', pages_widget.url_to_action 'append'
+                @bottom_toolbar('.page-insert-link').attr 'href', pages_widget.url_to_action 'insert'
+                @bottom_toolbar('.page-delete-link').attr 'href', pages_widget.url_to_action 'delete'
+                @bottom_toolbar(' .page-name').text object.contents
+            else
+                @bottom_toolbar('.page-actions').hide()
         @attached_footer.update_footer()
 
     # Returns top toolbar element, or elements within buttons specified by +selector+
@@ -102,4 +146,11 @@ class @PaneTree
             lang = $(@).attr 'data-lang-id'
             $(@).attr 'href', pages_widget.url_to( lang, state.page_node_id )
 
+        if @pages_reorder_enabled
+            @top_toolbar('.pages-reorder-link').addClass "disabled"
+            @top_toolbar('.pages-reorder-link .checkmark').show()
+        else
+            @top_toolbar('.pages-reorder-link').removeClass "disabled"
+            @top_toolbar('.pages-reorder-link .checkmark').hide()
+
 

data/assets/stylesheets/admin-pages/_admin-pages-alert.css.scss

@@ -10,5 +10,6 @@ $alert-width: 70%;
     left: (100%-$alert-width)/2;
     .alert {
         margin-bottom: 15px;
+        box-shadow: 4px 4px 11px 0px rgba(0, 0, 0, 0.73);
     }
 }

data/db/model/page.rb

@@ -4,6 +4,7 @@ class Page
 
   # embedded_in :page
   belongs_to :page_node, touch: true
+  field :position, type: Integer # !!! denormalized from PageNode
 
   PUBLICATION_STATES = [:published, :hidden, :not_published]
 
@@ -11,12 +12,11 @@ class Page
   field :published_at, type: Time
   field :publication_state, type: Symbol, default: :published
   field :link, type: String
-  field :parent_links, type: Array, default: nil
   field :title, type: String
   field :html_description, type: String
   field :html_keywords, type: String
 
-  before_save :update_links
+  before_create :denormalize_position
   before_update :touch_ancestors
   before_destroy :touch_ancestors
 
@@ -45,6 +45,7 @@ class Page
   # Returns url to this page if it is accessible, constructed from the parent links.
   #
   def url
+    parent_links = ancestors.sort_by(&:depth).map(&:link)
     parts = [parent_links, link].flatten
     parts.shift # skip root page
     "/"+parts.join("/")
@@ -81,6 +82,12 @@ class Page
     Page.where( lang: lang, :page_node_id.in => page_node.ancestors.map(&:_id) )
   end
 
+  # Returns depth of the page_node
+  #
+  def depth
+    page_node.depth
+  end
+
   # Returns list of allowed content block types.
   #
   def available_block_types
@@ -96,35 +103,11 @@ class Page
 
 # private
 
-  def update_links
-    self.parent_links = default_parent_links if parent_links.nil?
-    update_children_links
-  end
-
-  # Generates default value for parent_links, that is used to populate new Page object.
-  #
-  # NOTE: This is impossible to do as field's default with Proc, because by some reason
-  # Mongoid does not initialize relations at 'assign defaults' stage.
-  #
-  def default_parent_links
-    # puts "** default_parent_links: self.page_node=#{self.page_node.inspect}"
-    # puts "** default_parent_links: self=#{self.inspect}"
-    parent_page = parent
-    if parent_page.present?
-      parent_page.parent_links + [parent_page.link]
-    else
-      []
-    end
+  def denormalize_position
+    # puts "** denormalizing position from page_node: #{page_node_id} -> #{page_node.inspect}"
+    self.position = page_node.try(:position)
   end
 
-  def update_children_links
-    return unless link_changed? || parent_links_changed?
-    # puts "** update children links fired"
-    links = parent_links + [link]
-    children.each do |p|
-      p.update_attributes parent_links: links
-    end
-  end
 
   # Touches parents (if present)
   #

data/db/model/page_node.rb

@@ -16,6 +16,8 @@ class PageNode
     allow_destroy: true
 
   before_update :touch_ancestors
+  before_update :touch_pages
+  before_update :denormalize_position
   before_destroy :touch_ancestors
 
   # scope :with_content, ->(lang) { where( :'pages.lang' => lang ) }
@@ -38,6 +40,16 @@ private
     ancestors.update_all updated_at: Time.now
   end
 
+  # Touches pages (if present)
+  #
+  def touch_pages
+    pages.update_all updated_at: Time.now
+  end
 
+  # Denormalize +position+ to owned Page(s).
+  #
+  def denormalize_position
+    pages.update_all( position: position )
+  end
 
 end # class Page

data/db/model/pages/blocks/pages_list.rb

@@ -18,16 +18,14 @@ module Pages::Blocks
       return [] if target_page_node.nil?
       listed = target_page_node.page( lang ).children
       listed = (show_hidden ? listed.published_and_hidden : listed.published )
-      listed = listed.to_a
-      # unless ordered_by == :position
-      #   listed = listed.sort_by do |p|
-      #     p.content( lang ).try( :send, ordered_by ).try( :to_i ) || 0
-      #   end
-      # end
-      # listed = listed.reverse if ordered_asc == :desc
-      # listed = listed.first( limit ) if limit.present? && limit > 0
-      @_listed_pages_cache = listed
-      listed
+      if ordered_asc == :desc
+        listed = listed.desc( ordered_by )
+      else
+        listed = listed.asc( ordered_by )
+      end
+      listed = listed.limit( limit ) if limit.present? && limit > 0
+      @_listed_pages_cache = listed.to_a
+      # listed
     end
 
     def listed_pages_DISABLED

data/lib/aerogel/pages/core.rb

@@ -1,3 +1,9 @@
+# will define methods in Page class
+unless defined?(::Page)
+  class ::Page
+  end
+end
+
 module Aerogel::Pages
 
   def self.registered(app)
@@ -23,6 +29,13 @@ module Aerogel::Pages
 
   def self.register_page_block_type( type, model )
     registered_page_block_types[type] = model
+
+    # define multiple objects accessor
+    ::Page.send( :define_method, :"#{type}s" ) { page_blocks.where( :_type => model ) }
+
+    # define single (first) object accessor
+    ::Page.send( :define_method, type ) { page_blocks.where( :_type => model ).first }
+
   end
 
   def self.create_page_block( type, *args )

data/lib/aerogel/pages/version.rb

@@ -1,5 +1,5 @@
 module Aerogel
   module Pages
-    VERSION = "1.4.12"
+    VERSION = "1.4.14"
   end
 end

data/locales/actions.en.yml

@@ -4,8 +4,13 @@ en:
             pages:
                 delete: Delete page
                 delete_short: Delete
+                deleted: "Page <b>%{title}</b> deleted"
                 insert: Insert page
                 insert_short: Insert
                 append: Append page
                 append_short: Append
                 edit: Edit page
+                reorder: Re-order pages
+                reorder_cancel: Cancel
+                reorder_save: Save changes
+                reordered: Pages reordered

data/locales/actions.ru.yml

@@ -4,8 +4,13 @@ ru:
             pages:
                 delete: Удалить страницу
                 delete_short: Удалить
+                deleted: "Страница <b>%{title}</b> удалена"
                 insert: Вставить новую страницу
                 insert_short: Вставить
                 append: Добавить новую страницу
                 append_short: Добавить
                 edit: Редактировать страницу
+                reorder: Изменить порядок страниц
+                reorder_cancel: Отмена
+                reorder_save: Сохранить изменения
+                reordered: Порядок страниц изменён

data/views/admin/pages/index/_pane_tree.html.erb

@@ -23,7 +23,7 @@
 
     <div class="bottom-toolbar">
         <div class="container">
-            <div class="btn-group">
+            <div class="btn-group page-actions">
                 <% link_to "new",
                     class: "btn btn-default btn-sm page-append-link",
                     title: t.aerogel.admin.pages.append do
@@ -39,10 +39,21 @@
                 <% end %>
             </div>
 
-            <% link_to_modal "new", class: "btn btn-default btn-sm page-delete-link" do %>
+            <% link_to_modal "new", class: "btn btn-default btn-sm page-delete-link page-actions" do %>
                 <%= icon 'fa-times' %>
                 <%= t.aerogel.admin.pages.delete %>
             <% end %>
+
+            <div class="pages-reorder-actions">
+                <% form nil, action: "pages_reorder", html_params: { class: 'pages-reorder-form' } do %>
+                    <%= link_to "", t.aerogel.admin.pages.reorder_cancel.to_s,
+                        class: "btn btn-default pages-reorder-cancel-link"
+                    %>
+                    <%= button :submit, label: t.aerogel.admin.pages.reorder_save.to_s,
+                        class: "btn btn-primary pages-reorder-save-link"
+                    %>
+                <% end %>
+            </div>
         </div>
     </div>
 

data/views/admin/pages/index/_pane_tree_tabs.html.erb

@@ -7,18 +7,23 @@
                 %>
             </li>
         <% end %>
-        <li class="pull-right dropdown disabled">
+        <li class="pull-right dropdown">
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                 <%= icon 'fa-cog' %> <span class="caret"></span>
             </a>
             <ul class="dropdown-menu">
+                <!--
                 <li class="disabled">
                     <a href="#">item 1</a>
                 </li>
                 <li class="divider">
                 </li>
-                <li>
-                    <a href="#">Re-order pages</a>
+                -->
+                <li class="pages-reorder-link">
+                    <a href="#" class="pages-reorder-link">
+                        <span class="checkmark"><%= icon 'fa-check' %></span>
+                        <%= t.aerogel.admin.pages.reorder %>
+                    </a>
                 </li>
             </ul>
         </li>

data/views/layouts/pages/_menu.html.erb

@@ -2,7 +2,9 @@
     <li>
         <%= link_to "/", icon('fa-home')+" "+Page.root(current_locale).try(:title) %>
     </li>
-    <%= partial "layouts/pages/menu_item", collection: Page.root(current_locale).try(:children) %>
+    <%= partial "layouts/pages/menu_item",
+        collection: Page.root(current_locale).try(:children).try(:published).try( :asc, :position )
+    %>
 
     <li class="divider"></li>
     <li>

data/views/layouts/pages/_menu_item.html.erb

@@ -1,6 +1,6 @@
 <%
     page = menu_item
-    subpages = page.children.published.to_a
+    subpages = page.children.published.asc(:position).to_a
 %>
 <li class="<%= (current_url.start_with? page.url) ? 'active' : '' %>">
     <%= link_to page.url, h(page.title) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerogel-pages
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.14
 platform: ruby
 authors:
 - Alex Kukushkin