activa 0.0.8 → 0.0.9

data/app/models/activa/page.rb

@@ -3,7 +3,9 @@ require 'awesome_nested_set'
 # TODO Изменять slug только в том случае, когда он был изменен вручную
 module Activa
   class Page < ActiveRecord::Base
-    attr_accessible :title, :article, :slug, :parent_id, :show_neighbours
+    MENU_TYPES = %w(none neighbours children)
+
+    attr_accessible :title, :article, :menu_type, :slug, :parent_id
 
     # see https://github.com/collectiveidea/awesome_nested_set
     acts_as_nested_set
@@ -13,12 +15,15 @@ module Activa
                         :sync_url        => false, # we update this manually
                         :only_when_blank => true
 
-    validates :title,   :presence => true
-    validates :article, :presence => true
-    validates :slug,    :format   => { :with => /^[0-9a-z_-]+$/i }, :allow_blank => true
+    validates :title,     :presence  => true
+    validates :article,   :presence  => true
+    validates :slug,      :format    => { :with => /^[0-9a-z_-]+$/i }, :allow_blank => true
+    validates :menu_type, :inclusion => { :in => MENU_TYPES }
 
     default_scope order('lft')
 
+    before_save :set_default_values
+
     # Если создаётся страница без указанного родителя,
     # то автоматически назначаем родителем корневую страницу
     # Но только если текущая страница не корневая!
@@ -124,6 +129,10 @@ module Activa
       path.sub(/^\/+/, '')
     end
 
+    def to_s
+      title
+    end
+
   private
 
     # После переноса узла запускается этот метод и успешно
@@ -135,5 +144,8 @@ module Activa
       "/#{slices.join('/')}".gsub(/^\/+/, '/')
     end
 
+    def set_default_values
+      self.menu_type ||= 'none'
+    end
   end
 end

data/app/views/activa/pages/_form.html.erb

@@ -10,6 +10,11 @@
     <%= f.input :parent_id, :as => :pages_tree, :page => @page %>
   <% end %>
 
+  <%= f.input :menu_type,
+    :collection    => Activa::Page::MENU_TYPES.map {|menu_type| [t("simple_form.options.page.menu_type.#{menu_type}"), menu_type] },
+    :include_blank => false
+  %>
+
   <%= f.input :article, :as => :editor %>
   
   <div class="actions">

data/app/views/activa/pages/partials/_sidebar.html.erb

@@ -0,0 +1,11 @@
+<% unless page.menu_type == 'none' %>
+  <div class="tabbable tabs-right">
+    <ul id="pages-<%= page.menu_type %>" class="nav nav-tabs">
+      <% if page.menu_type == 'children' && page.inner_pages.any? %>
+        <%= render 'activa/pages/partials/sidebar_items', :page => page, :items => page.inner_pages %>
+      <% elsif page.menu_type == 'neighbours' && page.neighbours.any? %>
+        <%= render 'activa/pages/partials/sidebar_items', :page => page, :items => page.neighbours %>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/activa/pages/partials/_sidebar_items.html.erb

@@ -0,0 +1,5 @@
+<% items.each do |item| %>
+  <li class="<%= 'active' if item.uri == page.uri %>">
+    <%= link_to item, main_app.activa_page_path(item.path) %>
+  </li>
+<% end %>

data/app/views/activa/pages/show.html.erb

@@ -3,4 +3,4 @@
 <article id="article"><%= raw @page.article %></article>
 
 <%= render 'activa/pages/partials/menu/show', :page => @page %>
-<%= render 'activa/pages/partials/neighbours', :page => @page %>
+<%= render 'activa/pages/partials/sidebar', :page => @page %>

data/config/locales/en.yml

@@ -12,6 +12,13 @@ en:
         article: 'Page content'
         parent_id: 'Choose parent page'
         slug: 'Permalink'
+        menu_type: 'Sidebar view'
+    options:
+      page:
+        menu_type:
+          none: 'Do not show sidebar'
+          neighbours: 'Show neigbours pages'
+          children: 'Show children pages'
   helpers:
     submit:
       slug:

data/config/locales/ru.yml

@@ -12,6 +12,13 @@ ru:
         article: 'Содержимое'
         parent_id: 'Родительская страница'
         slug: 'Постоянная ссылка'
+        menu_type: 'Вид бокового меню'
+    options:
+      page:
+        menu_type:
+          none: 'Не показывать боковое меню'
+          neighbours: 'Показывать соседние страницы'
+          children: 'Показывать дочерние страницы'
   helpers:
     submit:
       slug:

data/db/migrate/20120530231335_add_menu_type_to_pages.rb

@@ -0,0 +1,6 @@
+class AddMenuTypeToPages < ActiveRecord::Migration
+  def change
+    add_column :activa_pages, :menu_type, :string, :default => 'none', :null => false
+    remove_column :activa_pages, :show_neighbours
+  end
+end

data/lib/activa/version.rb

@@ -1,3 +1,3 @@
 module Activa
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activa
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &84693200 !ruby/object:Gem::Requirement
+  requirement: &85564360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *84693200
+  version_requirements: *85564360
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &84692990 !ruby/object:Gem::Requirement
+  requirement: &85564150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84692990
+  version_requirements: *85564150
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &84692760 !ruby/object:Gem::Requirement
+  requirement: &85563920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84692760
+  version_requirements: *85563920
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &84692550 !ruby/object:Gem::Requirement
+  requirement: &85563710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84692550
+  version_requirements: *85563710
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &84692340 !ruby/object:Gem::Requirement
+  requirement: &85563500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84692340
+  version_requirements: *85563500
 - !ruby/object:Gem::Dependency
   name: compass-rails
-  requirement: &84692130 !ruby/object:Gem::Requirement
+  requirement: &85563290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84692130
+  version_requirements: *85563290
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84691920 !ruby/object:Gem::Requirement
+  requirement: &85563080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84691920
+  version_requirements: *85563080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &84691710 !ruby/object:Gem::Requirement
+  requirement: &85562870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84691710
+  version_requirements: *85562870
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &84691500 !ruby/object:Gem::Requirement
+  requirement: &85562660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84691500
+  version_requirements: *85562660
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &84691290 !ruby/object:Gem::Requirement
+  requirement: &85562450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84691290
+  version_requirements: *85562450
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &84691080 !ruby/object:Gem::Requirement
+  requirement: &85562240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84691080
+  version_requirements: *85562240
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &84690870 !ruby/object:Gem::Requirement
+  requirement: &85562030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84690870
+  version_requirements: *85562030
 description: Rails 3.1+ dynamic page management
 email:
 - demerest@gmail.com
@@ -568,7 +568,8 @@ files:
 - app/views/activa/pages/_form.html.erb
 - app/views/activa/pages/index.html.erb
 - app/views/activa/pages/edit.html.erb
-- app/views/activa/pages/partials/_neighbours.html.erb
+- app/views/activa/pages/partials/_sidebar.html.erb
+- app/views/activa/pages/partials/_sidebar_items.html.erb
 - app/views/activa/pages/partials/menu/_index.html.erb
 - app/views/activa/pages/partials/menu/_show.html.erb
 - app/views/activa/pages/_page.html.erb
@@ -577,6 +578,7 @@ files:
 - config/locales/en.yml
 - config/initializers/simple_form.rb
 - config/routes.rb
+- db/migrate/20120530231335_add_menu_type_to_pages.rb
 - db/migrate/20110520121037_create_activa_pages.rb
 - db/migrate/20120519124034_add_show_neighbours_to_activa_pages.rb
 - lib/activa.rb

data/app/views/activa/pages/partials/_neighbours.html.erb

@@ -1,11 +0,0 @@
-<ul id="pages-neighbours">
-  <% if page.inner_pages.any? %>
-    <% page.inner_pages.each do |page| %>
-      <li><%= link_to page.title, main_app.activa_page_path(page.path) %></li>
-    <% end %>
-  <% elsif page.neighbours.any? %>
-    <% page.neighbours.each do |page| %>
-      <li><%= link_to_unless_current page.title, main_app.activa_page_path(page.path) %></li>
-    <% end %>
-  <% end %>
-</ul>