aerogel-pages 1.4.14 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fc6805efa9811f6d76a551bf6d7d2c1000f0bc
-  data.tar.gz: 24021121763b86687a79764e6d2554e12a4a58e2
+  metadata.gz: 450d81f92e580383aa75ee553109e1f85e7a46c0
+  data.tar.gz: 41bbb28488a461483adc3698ab12dc609dd0deb3
 SHA512:
-  metadata.gz: 82155ceec35741890c97862ab65862934fa7890b98ef178a8beff3bfda82995f947b1d1e7d7d91597302c03f3f0d260678335883aca5a70bccfe1fb55c3aa943
-  data.tar.gz: 9fc7908a47cdfbcd5bd31556f1b17fce9c5fc18b1ceebb6f98d30f14edfaa2060904845a1c6c6aefcc0c3fe944086e92a90f958ebabcf48fd416c78969149255
+  metadata.gz: f6fccc898ef0c78530e97bad769203a16ef430f46dc22d54db2e27b5b53a0b9b5ff60abfdfe44f4c3c20d4275a7e75345edd82c002f1519a269877357328a13c
+  data.tar.gz: 1ebdf51c152107bbbed8be527ea3df0b1cc56223a785820dd209317fa42ad2b4f270302e4dfa9c0c34464594a242dcacd6a70331938d415c169d43cc1457ac68

data/app/routes/admin-pages.rb

@@ -46,9 +46,17 @@ namespace "/admin/pages" do
       pass
     end
 
+    get "/append_select" do
+      @page_node = PageNode.find( @selected_page_node.parent_id ) or halt 404
+      @allowed_types = @page_node.page_type.allowed_children
+      # @page_node.page_type = PageType.where( type: :page ).first
+      pass
+    end
+
     get "/append" do
       @page_node = PageNode.new( parent_id: @selected_page_node.parent_id )
-      @page_node.page_type = PageType.where( type: :page ).first
+      page_type = @page_node.allowed_page_types.where( type: params[:page_type] ).first or halt 404
+      @page_node.page_type = page_type
       pass
     end
 
@@ -60,9 +68,17 @@ namespace "/admin/pages" do
       redirect "/admin/pages/#{@lang}-#{@page_node.id}"
     end
 
+    get "/insert_select" do
+      @page_node = @selected_page_node
+      @allowed_types = @page_node.page_type.allowed_children
+      # @page_node.page_type = PageType.where( type: :page ).first
+      pass
+    end
+
     get "/insert" do
       @page_node = PageNode.new( parent_id: @selected_page_node.id )
-      @page_node.page_type = PageType.where( type: :page ).first
+      page_type = @page_node.allowed_page_types.where( type: params[:page_type] ).first or halt 404
+      @page_node.page_type = page_type
       pass
     end
 
@@ -101,7 +117,7 @@ namespace "/admin/pages" do
     post "/edit" do
       # flash.now[:debug] = "params: #{params.inspect}"
       @page_node = @selected_page_node
-      if @page_node.update_attributes params[:page_node].except( :page_type )
+      if @page_node.update_attributes params[:page_node].except( :page_type_id )
         redirect "/admin/pages/#{@lang}-#{@page_node.id}" #, notice: "Page updated"
       end
       # flash.now[:error] = t.aerogel.db.errors.failed_to_save( name: h( @page.id ),

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

@@ -73,7 +73,7 @@ class @PagesWidget
         @update @current_state
 
     update: ( state ) ->
-        log "calling update(): id=#{state.page_node_id}"
+        log "update: id=#{state.page_node_id}"
         pane_tree.update state
         pane_preview.update state
         if state.open_pane == 'left'

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

@@ -80,6 +80,9 @@ class @PaneTree
     # Callback to be invoked when page (tree item) is selected
     #
     on_tree_item_selected: (id, object, el) =>
+        if object?
+            allowed_children = @row_allowed_children_types object
+            console?.log "** tree item selected: #{object.attr 'type'} -> #{allowed_children.length}:#{allowed_children}"
         pages_widget.on_page_selected id, object
 
     # Callback to be invoked when pages (tree branches/leaves) are reordered
@@ -104,6 +107,14 @@ class @PaneTree
     ordered_row_list: ->
         { id: row.id, parent_id: row.parent_id } for row in @tree_table.rows_list()
 
+    # Returns array of allowed children types for the row object
+    #
+    row_allowed_children_types: (row) ->
+        return [] unless row?
+        s = row.attr 'allowed-children'
+        allowed_children = if s then s.split ',' else []
+        allowed_children
+
 
     # Returns action buttons elements, or elements within buttons specified by +selector+
     #
@@ -117,7 +128,8 @@ class @PaneTree
             log "** update_bottom_toolbar: disabling"
             @bottom_toolbar().hide()
             return
-        object = @find_row_by_id state.page_node_id
+        row = @find_row_by_id state.page_node_id
+        parent_row = if row? then @find_row_by_id row.parent_id else null
         @bottom_toolbar().show()
         if @pages_reorder_enabled
             @bottom_toolbar('.pages-reorder-actions').show()
@@ -126,10 +138,55 @@ class @PaneTree
             @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
+
+                if parent_row?
+                    # nested page selected
+                    allowed_children = @row_allowed_children_types parent_row
+                    if allowed_children.length > 1
+                        # append multiple
+                        @bottom_toolbar('.page-append-link').hide()
+                        @bottom_toolbar('.page-append-select-link').show()
+                        @bottom_toolbar('.page-append-select-link').attr 'href',
+                            pages_widget.url_to_action "append_select"
+                    else if allowed_children.length > 0
+                        # append single
+                        @bottom_toolbar('.page-append-select-link').hide()
+                        @bottom_toolbar('.page-append-link').show()
+                        @bottom_toolbar('.page-append-link').attr 'href',
+                            pages_widget.url_to_action "append?page_type=#{allowed_children}"
+                    else
+                        # no append
+                        @bottom_toolbar('.page-append-link').hide()
+                        @bottom_toolbar('.page-append-select-link').hide()
+
+                    @bottom_toolbar('.page-delete-link').show()
+                    @bottom_toolbar('.page-delete-link').attr 'href', pages_widget.url_to_action 'delete'
+                else
+                    # root selected
+                    @bottom_toolbar('.page-append-link').hide()
+                    @bottom_toolbar('.page-append-select-link').hide()
+                    @bottom_toolbar('.page-delete-link').hide()
+
+                if row?
+                    allowed_children = @row_allowed_children_types row
+                    if allowed_children.length > 1
+                        # insert multiple
+                        @bottom_toolbar('.page-insert-link').hide()
+                        @bottom_toolbar('.page-insert-select-link').show()
+                        @bottom_toolbar('.page-insert-select-link').attr 'href',
+                            pages_widget.url_to_action "insert_select"
+                    else if allowed_children.length > 0
+                        # insert single
+                        @bottom_toolbar('.page-insert-select-link').hide()
+                        @bottom_toolbar('.page-insert-link').show()
+                        @bottom_toolbar('.page-insert-link').attr 'href',
+                            pages_widget.url_to_action "insert?page_type=#{allowed_children}"
+                    else
+                        # no insert
+                        @bottom_toolbar('.page-insert-link').hide()
+                        @bottom_toolbar('.page-insert-select-link').hide()
+
+                # @bottom_toolbar(' .page-name').text row.contents
             else
                 @bottom_toolbar('.page-actions').hide()
         @attached_footer.update_footer()

data/assets/stylesheets/admin-pages/_page-types-select.css.scss

@@ -0,0 +1,18 @@
+.page-types {
+    .page-type {
+        display: inline-block;
+        text-align: center;
+        padding: 5px 15px;
+        i {
+            font-size: 36px;
+        }
+        a, a:hover {
+            color: black;
+            text-decoration: none;
+        }
+        &:hover {
+            background: $item-hover-bg;
+            color: $item-hover-fg;
+        }
+    }
+}

data/assets/stylesheets/controllers/admin-pages-page-types-select.css.scss

@@ -0,0 +1,2 @@
+@import "admin/global";
+@import "../admin-pages/page-types-select";

data/db/model/page.rb

@@ -52,6 +52,12 @@ class Page
     # ( root? ? "/" ) : parts.join("/")
   end
 
+  # Returns page type of the page.
+  #
+  def page_type
+    page_node.page_type
+  end
+
   # Returns +true+ if this Page is root.
   #
   def root?

data/db/model/page_node.rb

@@ -32,6 +32,16 @@ class PageNode
     pages.where( lang: lang.to_sym ).first
   end
 
+  # Returns allowed page types (depending on the parent page type).
+  #
+  def allowed_page_types
+    if parent.present?
+      parent.page_type.allowed_children
+    else
+      PageType.where( type: :root ).first
+    end
+  end
+
 private
 
   # Touches parents (if present)

data/db/model/page_type.rb

@@ -2,9 +2,8 @@ class PageType
   include Model
 
   field :type, type: Symbol
-  field :name, type: String
   field :allowed_parents, type: Array
-  field :allowed_children, type: Array
+  # field :allowed_children, type: Array
   field :allowed_content_blocks, type: Array
   field :defaults, type: Hash
 
@@ -12,4 +11,19 @@ class PageType
 
   has_many :page_nodes
 
-end # class PageType
+
+  def allowed_children
+    self.class.where( :allowed_parents.in => [type] )
+  end
+
+  def human_name
+    Aerogel::I18n.t "aerogel.pages.page_type.#{type}", default: type.to_s.humanize
+  end
+
+end # class PageType
+
+
+# :page -> [nil, :page]
+# :news -> [:page]
+# :news_article -> [:news]
+#

data/db/seed/01_page_types.seed

@@ -0,0 +1,12 @@
+model PageType
+
+find_by :type
+force :allowed_parents
+
+seeds [
+{ type: :root, allowed_parents: [] },
+{ type: :page, allowed_parents: [:root, :page] },
+{ type: :news, allowed_parents: [:root, :page] },
+{ type: :news_article, allowed_parents: [:news] }
+]
+

data/db/seed/02_root_page_node.seed

@@ -0,0 +1,8 @@
+root_page_type = PageType.where( type: :root ).first
+
+model PageNode
+
+find_by :page_type_id
+
+seeds [{ page_type_id: root_page_type }]
+

data/db/seed/development/01_news_page_node.seed

@@ -0,0 +1,15 @@
+# Sub pages created here only if root has no children
+#
+page_type_news = PageType.where( type: :news ).first
+page_node_root = PageNode.root
+
+model PageNode
+
+find_by :parent_id, :page_type_id
+
+seeds [
+{
+  parent_id: page_node_root.id, page_type_id: page_type_news.id
+}
+]
+

data/db/seed/development/{05_news_pages.seed → 02_news_pages.seed}

@@ -1,4 +1,5 @@
-news_page_node = PageNode.root.children.first
+news_page_type = PageType.where( type: :news ).first
+news_page_node = PageNode.where( page_type_id: news_page_type.id ).first
 
 model Page
 

data/lib/aerogel/pages/version.rb

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

data/locales/actions.en.yml

@@ -14,3 +14,4 @@ en:
                 reorder_cancel: Cancel
                 reorder_save: Save changes
                 reordered: Pages reordered
+                page_type_select: Choose type of the new page

data/locales/actions.ru.yml

@@ -13,4 +13,5 @@ ru:
                 reorder: Изменить порядок страниц
                 reorder_cancel: Отмена
                 reorder_save: Сохранить изменения
-                reordered: Порядок страниц изменён
+                reordered: Порядок страниц изменён
+                page_type_select: Выберите тип новой страницы

data/locales/aerogel-pages.en.yml

@@ -0,0 +1,8 @@
+en:
+    aerogel:
+        pages:
+            page_type:
+                root: Root page
+                page: Page
+                news: News
+                news_article: News article

data/locales/aerogel-pages.ru.yml

@@ -0,0 +1,8 @@
+ru:
+    aerogel:
+        pages:
+            page_type:
+                root: Корневая страница
+                page: Страница
+                news: Новостной раздел
+                news_article: Новость

data/views/admin/pages/_page-types-select.html.erb

@@ -0,0 +1,19 @@
+<% assets "controllers/admin-pages-page-types-select" %>
+<% base_url = "/admin/pages/#{@lang}-#{@selected_page_node.id}" %>
+<% page_title t.aerogel.admin.pages.page_type_select %>
+
+<div class="page-types">
+<% @allowed_types.each do |page_type| %>
+    <div class="page-type" style="pull-left">
+        <a href="<%= base_url %>/<%= action %>?page_type=<%= page_type.type %>">
+        <%= icon 'fa-file-o' %>
+        <br/>
+        <%= h page_type.human_name %>
+        </a>
+    </div>
+<% end %>
+</div>
+
+<% form nil, cancel_url: base_url do %>
+    <%= button :cancel %>
+<% end %>

data/views/admin/pages/append_select.html.erb

@@ -0,0 +1 @@
+<%= partial "admin/pages/page-types-select", locals: { action: 'append' } %>

data/views/admin/pages/edit/_breadcrumbs.html.erb

@@ -8,6 +8,6 @@
 <% end if @page_node.parent.present? %>
     <li>
         <%= icon 'fa-file-text-o' %>
-        <%= @page_node.page_type.try(:name) %>
+        <%= @page_node.page_type.try(:human_name) %>
     </li>
 </ol>

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

@@ -16,7 +16,7 @@
               admin_pages_title_as_text( p, options[:lang] )
             end
             column :type do |p|
-              p.page_type.try(:name)
+                p.page_type.try(:human_name)
             end
         end
     %>
@@ -24,6 +24,7 @@
     <div class="bottom-toolbar">
         <div class="container">
             <div class="btn-group page-actions">
+                <!-- append single -->
                 <% link_to "new",
                     class: "btn btn-default btn-sm page-append-link",
                     title: t.aerogel.admin.pages.append do
@@ -31,12 +32,30 @@
                     <%= icon 'fa-plus' %> <%= t.aerogel.admin.pages.append_short %>
                 <% end %>
 
+                <!-- append select multiple -->
+                <% link_to_modal "new",
+                    class: "btn btn-default btn-sm page-append-select-link",
+                    title: t.aerogel.admin.pages.append do
+                %>
+                    <%= icon 'fa-plus' %> <%= t.aerogel.admin.pages.append_short %> &hellip;
+                <% end %>
+
+                <!-- insert single -->
                 <% link_to "new",
                     class: "btn btn-default btn-sm page-insert-link",
                     title: t.aerogel.admin.pages.insert do
                 %>
                     <%= icon 'fa-arrow-right' %> <%= t.aerogel.admin.pages.insert_short %>
                 <% end %>
+
+                <!-- insert multiple -->
+                <% link_to_modal "new",
+                    class: "btn btn-default btn-sm page-insert-select-link",
+                    title: t.aerogel.admin.pages.insert do
+                %>
+                    <%= icon 'fa-arrow-right' %> <%= t.aerogel.admin.pages.insert_short %> &hellip;
+                <% end %>
+
             </div>
 
             <% link_to_modal "new", class: "btn btn-default btn-sm page-delete-link page-actions" do %>

data/views/admin/pages/insert_select.html.erb

@@ -0,0 +1 @@
+<%= partial "admin/pages/page-types-select", locals: { action: 'insert' } %>

data/views/admin/table_builder/smart-tree-table/_table_row.html.erb

@@ -1,10 +1,7 @@
 <tr
     data-id="<%= table_row.id %>" data-parent-id="<%= table_row.parent_id %>"
-    data-url-preview="<%= @lang %>-<%= table_row.id %>/preview"
-    data-url-edit="<%= @lang %>-<%= table_row.id %>/edit"
-    data-url-delete="<%= @lang %>-<%= table_row.id %>/delete"
-    data-url-append="<%= @lang %>-<%= table_row.id %>/append"
-    data-url-insert="<%= @lang %>-<%= table_row.id %>/insert"
+    data-type="<%= table_row.page_type.type %>"
+    data-allowed-children="<%= table_row.page_type.allowed_children.pluck(:type).join(',') %>"
 >
 <% table.columns.each do |col| %>
     <td <td <%= col.html_params %> >

data/views/layouts/_analytics.html.erb

@@ -0,0 +1 @@
+<!-- views/layouts/_analytics -->

data/views/layouts/application.html.erb

@@ -57,6 +57,8 @@
         </div>
     </div>
 
+<%= partial "layouts/analytics", cacheable: true %>
+
 </body>
 </html>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerogel-pages
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.16
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aerogel-core
@@ -113,12 +113,14 @@ files:
 - assets/stylesheets/admin-pages-edit/page.css.scss
 - assets/stylesheets/admin-pages-edit/tabs.css.scss
 - assets/stylesheets/admin-pages/_admin-pages-alert.css.scss
+- assets/stylesheets/admin-pages/_page-types-select.css.scss
 - assets/stylesheets/admin-pages/_pages-widget.css.scss
 - assets/stylesheets/admin-pages/_pane-tree.css.scss
 - assets/stylesheets/admin-pages/_preview.css.scss
 - assets/stylesheets/admin-pages/_two-pane-widget.css.scss
 - assets/stylesheets/aerogel-pages.css.scss
 - assets/stylesheets/controllers/admin-pages-edit.css.scss
+- assets/stylesheets/controllers/admin-pages-page-types-select.css.scss
 - assets/stylesheets/controllers/admin-pages.css.scss
 - assets/stylesheets/pages/_body.css.scss
 - assets/stylesheets/pages/_footer.css.scss
@@ -140,16 +142,13 @@ files:
 - db/model/pages/blocks/image.rb
 - db/model/pages/blocks/pages_list.rb
 - db/model/pages/blocks/text.rb
+- db/seed/01_page_types.seed
+- db/seed/02_root_page_node.seed
+- db/seed/03_root_pages.seed
 - db/seed/development/.keep
-- db/seed/development/01_page_types.seed
-- db/seed/development/02_root_page_node.seed
-- db/seed/development/03_root_pages.seed
-- db/seed/development/04_news_page_node.seed
-- db/seed/development/05_news_pages.seed
+- db/seed/development/01_news_page_node.seed
+- db/seed/development/02_news_pages.seed
 - db/seed/production/.keep
-- db/seed/production/01_page_types.seed
-- db/seed/production/02_root_page_node.seed
-- db/seed/production/03_root_pages.seed
 - db/seed/seed.template
 - lib/aerogel/pages.rb
 - lib/aerogel/pages/core.rb
@@ -159,6 +158,8 @@ files:
 - locales/actions.ru.yml
 - locales/admin.en.yml
 - locales/admin.ru.yml
+- locales/aerogel-pages.en.yml
+- locales/aerogel-pages.ru.yml
 - locales/models.en.yml
 - locales/models.ru.yml
 - locales/views.en.yml
@@ -166,8 +167,9 @@ files:
 - public/README.md
 - rake/README.md
 - views/admin/pages/_edit_form.html.erb
-- views/admin/pages/_page-DISABLED.html.erb
+- views/admin/pages/_page-types-select.html.erb
 - views/admin/pages/append.html.erb
+- views/admin/pages/append_select.html.erb
 - views/admin/pages/delete.html.erb
 - views/admin/pages/edit.html.erb
 - views/admin/pages/edit/_block.html.erb
@@ -189,6 +191,7 @@ files:
 - views/admin/pages/index/_pane_tree.html.erb
 - views/admin/pages/index/_pane_tree_tabs.html.erb
 - views/admin/pages/insert.html.erb
+- views/admin/pages/insert_select.html.erb
 - views/admin/pages/preview.html.erb
 - views/admin/pages/preview/_block.html.erb
 - views/admin/pages/preview/_breadcrumbs.html.erb
@@ -223,6 +226,7 @@ files:
 - views/form_builder/admin-pages-edit/field_textarea.erb
 - views/form_builder/admin-pages-edit/field_title.erb
 - views/form_builder/admin-pages-edit/fieldset.erb
+- views/layouts/_analytics.html.erb
 - views/layouts/admin/pages/preview.html.erb
 - views/layouts/application.html.erb
 - views/layouts/pages/_breadcrumbs.html.erb

data/db/seed/development/01_page_types.seed

@@ -1,8 +0,0 @@
-model PageType
-
-find_by :type
-
-seeds [
-{ type: :page, name: 'Page' }
-]
-

data/db/seed/development/02_root_page_node.seed

@@ -1,8 +0,0 @@
-page_type_simple = PageType.where( type: :page ).first
-
-model PageNode
-
-find_by :parent_id
-
-seeds [{ parent_id: nil, page_type: page_type_simple }]
-

data/db/seed/development/04_news_page_node.seed

@@ -1,15 +0,0 @@
-# Sub pages created here only if root has no children
-#
-page_type_simple = PageType.where( type: :page ).first
-page_node_root = PageNode.root
-
-model PageNode
-
-find_by :parent_id
-
-seeds [
-{
-  parent_id: page_node_root.id, page_type: page_type_simple
-}
-]
-

data/db/seed/production/01_page_types.seed

@@ -1,8 +0,0 @@
-model PageType
-
-find_by :type
-
-seeds [
-{ type: :page, name: 'Page' }
-]
-

data/db/seed/production/02_root_page_node.seed

@@ -1,8 +0,0 @@
-page_type_simple = PageType.where( type: :page ).first
-
-model PageNode
-
-find_by :parent_id
-
-seeds [{ parent_id: nil, page_type: page_type_simple }]
-

data/db/seed/production/03_root_pages.seed

@@ -1,10 +0,0 @@
-root_page_node = PageNode.root
-
-model Page
-
-find_by :page_node_id, :lang
-
-seeds [
-  { page_node_id: root_page_node.id, lang: :en, link: '', title: 'Home page' },
-  { page_node_id: root_page_node.id, lang: :ru, link: '', title: 'Главная страница' }
-]

data/views/admin/pages/_page-DISABLED.html.erb

@@ -1,5 +0,0 @@
-<tr data-id="<%= page.id %>" data-parent-id="<%= page.parent_id %>">
-  <td><div class="drag-handle"><%= icon 'fa-arrows-v' %></div></td>
-  <td></td>
-  <td><%= page.name %></td>
-</tr>