constructor-pages 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baa75a956f52a976492a679c49f1b36566d6b94f
-  data.tar.gz: 9575cbe6a4c26392e95869b6fba08aebc187eadf
+  metadata.gz: a25115d3514e50b82a27b46727f053d4bbd3fe03
+  data.tar.gz: 32c4ed57db4bc38dfd1d32c52c8ce6d3d3a86e28
 SHA512:
-  metadata.gz: a671da2e4c0635d93a90127426adad549c19ad4e006b0f333d7b7a53c31ab491d695f5c7dcda7cbcc86dd2e3b3883bf7e3001ceedc4c6795ae10ad70b3c66933
-  data.tar.gz: 6b4ba210dfa15687fef2a58677611bc18747e818288954ffb9b9ab13e208d158accacb05666664b714686ad6cfb7f5b284b2797254b308be160eb21a5a1b4baa
+  metadata.gz: ef760c7c1200443e416d15865ce4e14068e06bacda13d673b3df0845e8be194ca45bef89acce163b4ff66d3e69c92f6ca3f0fd6b1eb4930807373b161e98a38c
+  data.tar.gz: 27976bf54f5ee5887de59a6b557a71cac6024b78ebcc1c0360ff2ba202f4ff0f32f0764db79e3d1734c2f0acb595a7c95d370436733ca8cb1a7e0ee16baf9a7e

data/app/assets/javascripts/constructor_pages/urlify.js

@@ -0,0 +1,75 @@
+var ru = {
+    'а':'a', 'б':'b', 'в':'v', 'г':'g', 'д':'d', 'е':'e', 'ё':'yo', 'ж':'zh',
+    'з':'z', 'и':'i', 'й':'y', 'к':'k', 'л':'l', 'м':'m', 'н':'n', 'о':'o',
+    'п':'p', 'р':'r', 'с':'s', 'т':'t', 'у':'u', 'ф':'f', 'х':'h', 'ц':'ts',
+    'ч':'ch', 'ш':'sh', 'щ':'sch', 'ъ':'', 'ы':'y', 'ь':'', 'э':'e', 'ю':'yu',
+    'я':'ya',
+    'А':'A', 'Б':'B', 'В':'V', 'Г':'G', 'Д':'D', 'Е':'E', 'Ё':'Yo', 'Ж':'Zh',
+    'З':'Z', 'И':'I', 'Й':'J', 'К':'K', 'Л':'L', 'М':'M', 'Н':'N', 'О':'O',
+    'П':'P', 'Р':'R', 'С':'S', 'Т':'T', 'У':'U', 'Ф':'F', 'Х':'H', 'Ц':'Ts',
+    'Ч':'Ch', 'Ш':'Sh', 'Щ':'Sch', 'Ъ':'', 'Ы':'Y', 'Ь':'', 'Э':'E', 'Ю':'Yu',
+    'Я':'Ya'
+}
+
+var ALL_DOWNCODE_MAPS=new Array()
+
+ALL_DOWNCODE_MAPS[0] = ru
+
+var Downcoder = new Object();
+Downcoder.Initialize = function()
+{
+    if (Downcoder.map) // already made
+        return ;
+    Downcoder.map ={}
+    Downcoder.chars = '' ;
+    for(var i in ALL_DOWNCODE_MAPS)
+    {
+        var lookup = ALL_DOWNCODE_MAPS[i]
+        for (var c in lookup)
+        {
+            Downcoder.map[c] = lookup[c] ;
+            Downcoder.chars += c ;
+        }
+     }
+    Downcoder.regex = new RegExp('[' + Downcoder.chars + ']|[^' + Downcoder.chars + ']+','g') ;
+}
+
+downcode= function( slug )
+{
+    Downcoder.Initialize() ;
+    var downcoded =""
+    var pieces = slug.match(Downcoder.regex);
+    if(pieces)
+    {
+        for (var i = 0 ; i < pieces.length ; i++)
+        {
+            if (pieces[i].length == 1)
+            {
+                var mapped = Downcoder.map[pieces[i]] ;
+                if (mapped != null)
+                {
+                    downcoded+=mapped;
+                    continue ;
+                }
+            }
+            downcoded+=pieces[i];
+        }
+    }
+    else
+    {
+        downcoded = slug;
+    }
+    return downcoded;
+}
+
+function URLify(s, num_chars) {
+    // changes, e.g., "Petty theft" to "petty_theft"
+    // remove all these words from the string before urlifying
+    s = downcode(s);
+    s = s.replace(/[^-\w\s]/g, '-');  // remove unneeded chars
+    s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
+    s = s.replace(/[-\s]+/g, '-');   // convert spaces to hyphens
+    s = s.toLowerCase();             // convert to lowercase
+    return s.substring(0, num_chars);// trim to first num_chars chars
+}
+

data/app/controllers/constructor_pages/fields_controller.rb

@@ -3,25 +3,27 @@
 module ConstructorPages
   class FieldsController < ApplicationController
     def new
-      @field = Field.new.tap {|f| f.template = Template.find(params[:template_id])}
+      @field = Field.new.tap {|f| @template = f.template = Template.find(params[:template_id])}
     end
 
     def edit
-      @field = Field.find(params[:id]).tap {|f| f.template = Template.find(params[:template_id])}
+      @field = Field.find(params[:id]).tap {|f| @template = f.template = Template.find(params[:template_id])}
     end
 
     def create
       @field = Field.new field_params
+      @template = @field.template
 
       if @field.save
-        redirect_to edit_template_path(@field.template_id), notice: t(:field_success_added, name: @field.name)
+        redirect_to edit_template_path(@template), notice: t(:field_success_added, name: @field.name)
       else
-        render action: :new, template_id: @field.template_id
+        render action: :new
       end
     end
 
     def update
       @field = Field.find params[:id]
+      @template = @field.template
 
       unless @field.type_value == params[:field][:type_value]
         @field.type_class.where(field_id: @field.id).each do |field|
@@ -35,7 +37,7 @@ module ConstructorPages
       end
 
       if @field.update field_params
-        redirect_to edit_template_url(@field.template.id), notice: t(:field_success_updated, name: @field.name)
+        redirect_to edit_template_path(@template.id), notice: t(:field_success_updated, name: @field.name)
       else
         render action: :edit
       end

data/app/controllers/constructor_pages/pages_controller.rb

@@ -6,32 +6,29 @@ module ConstructorPages
 
     movable :page
 
-    before_filter {@roots, @template_exists = Page.roots, Template.count > 0}
+    before_filter -> {@roots = Page.roots}, except: [:show, :create, :update, :destroy, :search]
 
     def index
-      flash.notice = 'Create at least one template' unless @template_exists
+      @template_exists = Template.count != 0
+      flash[:notice] = 'Create at least one template' unless @template_exists
     end
 
     def new
-      redirect_to pages_path and return unless @template_exists
-      @page, @template_id, @multipart = Page.new, Template.first.id, false
-      @template_id = @page.parent.template.child.id if params[:page] and (@page.parent = Page.find(params[:page]))
+      @page = Page.new
+    end
+
+    def new_child
+      @page, @parent_id = Page.new, params[:id]
+      @template_id = Page.find(@parent_id).try(:template).child.id
     end
 
     def show
       @page = Page.find_by_request_or_first("/#{params[:all]}")
-      error_404 and return if @page.nil? or !@page.active?
+      error_404 and return unless @page.try(:published?)
       redirect_to @page.link if @page.redirect?
-      _code_name = @page.template.code_name.to_s
+      _code_name = @page.template.code_name
       instance_variable_set('@'+_code_name, @page)
-      respond_to do |format|
-        format.html { render template: "html_templates/#{_code_name}" }
-        format.json {
-          _template = render_to_string partial: "json_templates/#{_code_name}.json.erb", layout: false, locals: {_code_name.to_sym => @page, page: @page}
-          _js = render_to_string partial: "js_partials/#{_code_name}.js"
-          render json: @page, self_and_ancestors: @page.self_and_ancestors.map(&:id), template: _template.gsub(/\n/, '\\\\n'), js: _js
-        }
-      end
+      render template: "templates/#{_code_name}"
     end
 
     def search
@@ -39,29 +36,27 @@ module ConstructorPages
 
       _params = request.query_parameters
       _params.each_pair {|k,v| v || (_params.delete(k); next)
-        _params[k] = v.numeric? ? v.to_f : (v.to_bool if v.boolean?)}
+        _params[k] = v.numeric? ? v.to_f : (v.to_boolean if v.boolean?)}
 
       @pages = Page.in(@page).by(_params).search(params[:what_search])
 
-      instance_variable_set('@'+@page.template.code_name.pluralize, @pages)
-      instance_variable_set('@'+@page.template.code_name.singularize, @page)
-      render :template => "html_templates/#{@page.template.code_name}_search"
+      @page.template.code_name.tap {|c| [c.pluralize, c.singularize].each {|name|
+        instance_variable_set('@'+name, @pages)}
+        render template: "templates/#{c}_search"}
     end
 
     def edit
       @page = Page.find(params[:id])
-      @page.template ||= Template.first
-      @template_id = @page.template.id
-      @multipart = @page.fields.map{|f| f.type_value == 'image'}.include?(true) ? true : false
+      @parent_id, @template_id = @page.parent.try(:id), @page.template.id
     end
 
     def create
       @page = Page.new page_params
 
       if @page.save
-        redirect_to pages.pages_url, notice: t(:page_success_added, name: @page.name)
+        redirect_to pages_path, notice: t(:page_success_added, name: @page.name)
       else
-        render action: :new
+        render :new
       end
     end
 
@@ -76,17 +71,15 @@ module ConstructorPages
         @page.create_fields_values if _template_changed
         @page.update_fields_values params[:fields]
 
-        redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)
+        redirect_to pages_path, notice: t(:page_success_updated, name: @page.name)
       else
-        render action: :edit
+        render :edit
       end
     end
 
     def destroy
-      @page = Page.find(params[:id])
-      _name = @page.name
-      @page.destroy
-      redirect_to pages_url, notice: t(:page_success_removed, name: _name)
+      @page = Page.find(params[:id]).destroy
+      redirect_to pages_path, notice: t(:page_success_removed, name: @page.name)
     end
 
     private
@@ -110,7 +103,7 @@ module ConstructorPages
     end
 
     def error_404
-      render file: "#{Rails.root}/public/404", layout: false, status: 404
+      render file: "#{Rails.root}/public/404", layout: false, status: :not_found
     end
   end
 end

data/app/controllers/constructor_pages/templates_controller.rb

@@ -22,7 +22,7 @@ module ConstructorPages
       if @template.save
         redirect_to templates_url, notice: t(:template_success_added, name: @template.name)
       else
-        render action: :new
+        render :new
       end
     end
 
@@ -32,7 +32,7 @@ module ConstructorPages
       if @template.update template_params
         redirect_to templates_url, notice: t(:template_success_updated, name: @template.name)
       else
-        render action: :edit
+        render :edit
       end
     end
 

data/app/helpers/constructor_pages/treeview_helper.rb

@@ -29,5 +29,19 @@ module ConstructorPages
 
       output.html_safe
     end
+
+    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
   end
 end

data/app/models/constructor_pages/page.rb

@@ -3,6 +3,8 @@
 module ConstructorPages
   # Page model. Pages are core for company websites, blogs etc.
   class Page < ActiveRecord::Base
+    include ActiveSupport::Inflector
+
     # Adding has_many for all field types
     Field::TYPES.each do |t|
       class_eval %{has_many :#{t}_types,  dependent: :destroy, class_name: 'Types::#{t.titleize}Type'}
@@ -114,9 +116,13 @@ module ConstructorPages
 
     alias_method :find_pages_in_branch, :find_page_in_branch
 
-    def published?; active end
+    def published?; active? end
 
-    alias_method :active?, :published?
+    # Return true if there is a file upload field in page
+    def multipart?
+      fields.each {|f| return true if f.type_value == 'image'}
+      false
+    end
 
     # Returns page hash attributes with fields.
     #
@@ -147,13 +153,9 @@ module ConstructorPages
 
     # if url has been changed by manually or url is empty
     def friendly_url
-      self.url = ((auto_url || url.empty?) ? translit(name) : url).parameterize
+      self.url = ((auto_url || url.empty?) ? transliterate(name, '') : url).parameterize
     end
 
-    # TODO: add more languages
-    # translit to english
-    def translit(str); Russian.translit(str) end
-
     # Page is not valid if there is no template
     def template_check; errors.add_on_empty(:template_id) if Template.count == 0 end
 

data/app/models/constructor_pages/template.rb

@@ -23,7 +23,16 @@ module ConstructorPages
 
     # Return child corresponding child_id or children first
     def child
-      !child_id && !leaf? ? children.first : self.class.find(child_id)
+      if child_id
+        self.class.find(child_id)
+      else
+        children.first if !leaf?
+      end
+    end
+
+    # Convert name to accusative
+    def to_accusative
+      self.name.mb_chars.downcase.to_s.accusative
     end
 
     private

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

@@ -0,0 +1,11 @@
+.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

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

@@ -1,4 +1,4 @@
-= form_for @field do |f|
+= form_for [@template, @field] do |f|
   - if @field.errors.any?
     .alert.alert-error.fade.in.span12
       = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
@@ -13,7 +13,7 @@
     .control-group
       = f.label :code_name, class: 'control-label'
       .controls= f.text_field :code_name, class: 'span4'
-      = f.hidden_field :template_id, value: @field.template.id, class: 'span4'
+      = f.hidden_field :template_id, value: @template.id, class: 'span4'
 
     - unless @field.type_value == 'image'
       .control-group
@@ -25,5 +25,5 @@
       .span12
         .form-actions
           = f.submit class: 'btn btn-primary'
-          = link_to t(:cancel), edit_template_url(@field.template), class: 'btn'
-          = link_to t(:delete_field), @field, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @field.new_record?
+          = 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?

data/app/views/constructor_pages/fields/types/_float.haml

@@ -1 +1 @@
-= text_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: 'span2'

data/app/views/constructor_pages/fields/types/_integer.haml

@@ -1 +1 @@
-= text_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: 'span2'

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

@@ -0,0 +1,4 @@
+.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

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

@@ -1,4 +1,4 @@
-= form_for @page, html: {multipart: @multipart} do |f|
+= form_for @page, html: {multipart: @page.multipart?} do |f|
   - if @page.errors.any?
     .row-fluid
       .alert.alert-error.fade.in.span12
@@ -24,18 +24,13 @@
       = f.label :url, class: 'control-label'
       .controls
         .full_url
-          %span.path>= @page.parent.full_url unless @page.parent.nil?
+          %span.path>= @page.parent.full_url if @page.parent
           \/
           %span.address>= @page.url
         = f.text_field :url, class: 'span3'
         %i.address_icon.icon-pencil
 
-    - unless @page.new_record?
-      - @page.template.fields.each do |field|
-        .control-group
-          = label_tag "fields[#{field.code_name}]", field.name, class: 'control-label'
-          .controls
-            = render :partial => "constructor_pages/fields/types/#{field.type_value}", locals: {field: field, page: @page}
+    = render partial: 'field', collection: @page.fields
 
     .accordion
       .accordion-group
@@ -46,7 +41,7 @@
             .control-group
               = f.label :parent_id, class: 'control-label'
               .controls
-                = f.select :parent_id, options_for_select(for_select(@roots), selected: @page.parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
+                = f.select :parent_id, options_for_select(for_select(@roots), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
 
             .control-group
               = f.label :template_id, :class => 'control-label'

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

@@ -17,26 +17,19 @@
         %button.btn.disabled= page.name
 
       .b-tree__buttons
-        = render partial: 'constructor_pages/partials/arrow_buttons', locals: {item: page}
+        = arrow_buttons_for(page)
 
         = link_to edit_page_path(page), class: 'btn btn-primary btn-mini' do
           %i.icon-pencil
           =t :edit
-          = page.template.name.downcase
+          = page.template.to_accusative
 
-        - unless page.template.nil?
-          - if page.template.child_id.nil?
-            - if !page.template.leaf?
-              = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
-                %i.icon-chevron-down
-                =t :add
-                = page.template.descendants.first.name.downcase
-          - else
-            = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
-              %i.icon-chevron-down
-              =t :add
-              = ConstructorPages::Template.find(page.template.child_id).name.downcase
+        - if page.template.child
+          = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
+            %i.icon-chevron-down
+            =t :add
+            = page.template.child.to_accusative
 
-        = link_to page_path(page), method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
+        = 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

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

@@ -0,0 +1,5 @@
+- content_for :page_title do
+  =t :new_page
+
+%section.span12
+  = render 'form'

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

@@ -28,22 +28,11 @@
     - unless @template.new_record?
       .control-group
         .controls
-          = link_to new_field_path(@template.id), class: 'btn btn-mini btn-link' do
+          = link_to new_template_field_path(@template), class: 'btn btn-mini btn-link' do
             %i.icon-plus
             =t :new_field
 
-    - @template.fields.each do |field|
-      .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_field_path(field, field.template), class: 'btn btn-mini btn-primary' do
-            %i.icon-pencil
-          = link_to field_path(field), method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-mini btn-danger' do
-            %i.icon-remove
+    = render @template.fields
 
     .row-fluid
       .span12

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

@@ -12,13 +12,13 @@
     %button.btn.btn-link.disabled= template.name
 
     .b-tree__buttons
-      = render partial: 'constructor_pages/partials/arrow_buttons', locals: {item: template}
+      = arrow_buttons_for(template)
 
       = link_to edit_template_path(template), class: 'btn btn-primary btn-mini' do
         %i.icon-pencil
         =t :edit
-        = t(:template).downcase
+        = t(:template).mb_chars.downcase
 
-      = link_to template_path(template), method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
+      = 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

data/config/locales/ru.yml

@@ -34,6 +34,7 @@ ru:
   image: Изображение
   help: Помощь
   edit: Редактировать
+  add:  Добавить
 
   page_not_found: Страница не найдена
 
@@ -92,9 +93,78 @@ ru:
               blank: "не может быть пустой"
         constructor_pages/template:
           attributes:
+            code_name:
+              taken: уже используется
             base:
               code_name_already_in_use: Такое кодовое имя уже используется
         constructor_pages/field:
           attributes:
+            code_name:
+              taken: уже используется
             base:
-              code_name_already_in_use: Такое кодовое имя уже используется
+              code_name_already_in_use: Такое кодовое имя уже используется
+  i18n:
+    transliterate:
+      rule:
+        а: 'a'
+        б: 'b'
+        в: 'v'
+        г: 'g'
+        д: 'd'
+        е: 'e'
+        ё: 'yo'
+        ж: 'zh'
+        з: 'z'
+        и: 'i'
+        й: 'y'
+        к: 'k'
+        л: 'l'
+        м: 'm'
+        н: 'n'
+        о: 'o'
+        п: 'p'
+        р: 'r'
+        с: 's'
+        т: 't'
+        у: 'u'
+        ф: 'f'
+        х: 'h'
+        ц: 'ts'
+        ч: 'ch'
+        ш: 'sh'
+        щ: 'sch'
+        ы: 'y'
+        э: 'e'
+        ю: 'yu'
+        я: 'ya'
+        А: 'A'
+        Б: 'B'
+        В: 'V'
+        Г: 'G'
+        Д: 'D'
+        Е: 'E'
+        Ё: 'Yo'
+        Ж: 'Zh'
+        З: 'Z'
+        И: 'I'
+        Й: 'J'
+        К: 'K'
+        Л: 'L'
+        М: 'M'
+        Н: 'N'
+        О: 'O'
+        П: 'P'
+        Р: 'R'
+        С: 'S'
+        Т: 'T'
+        У: 'U'
+        Ф: 'F'
+        Х: 'H'
+        Ц: 'Ts'
+        Ч: 'Ch'
+        Ш: 'Sh'
+        Щ: 'Sch'
+        Ы: 'Y'
+        Э: 'E'
+        Ю: 'Yu'
+        Я: 'Ya'

data/config/routes.rb

@@ -1,21 +1,18 @@
 ConstructorPages::Engine.routes.draw do
   scope '/admin' do
-    resources :pages, except: [:show]
-    resources :templates, except: [:show]
-    resources :fields, except: [:show, :new, :edit]
+    resources :pages, except: [:show] do
+      get :new_child, on: :member
+    end
+
+    resources :templates, except: [:show] do
+      resources :fields, except: [:show, :index]
+    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}"
       end
     end
-
-    scope '/fields' do
-      get ':template_id/new/' => 'fields#new', as: :new_field
-      get ':id/:template_id/edit/' => 'fields#edit', as: :edit_field
-    end
-
-    get '/pages/:page/new' => 'pages#new', as: :new_child_page
   end
 
   root :to => 'pages#show'

data/constructor-pages.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'awesome_nested_set'
   s.add_dependency 'haml-rails'
   s.add_dependency 'acts_as_list'
-  s.add_dependency 'russian'
 
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara'

data/lib/constructor-pages.rb

@@ -2,5 +2,4 @@ require 'awesome_nested_set'
 require 'haml-rails'
 require 'constructor_pages/engine'
 require 'rack/cache'
-require 'acts_as_list'
-require 'russian'
+require 'acts_as_list'

data/spec/features/constructor_pages/fields_spec.rb

@@ -38,14 +38,14 @@ module ConstructorPages
 
       it 'should has edit field link' do
         visit pages.edit_template_path(@template)
-        find("a[href='#{pages.edit_field_path(@content_field, @template)}']").should be_true
-        find("a[href='#{pages.edit_field_path(@price_field, @template)}']").should be_true
+        find("a[href='#{pages.edit_template_field_path(@template, @content_field)}']").should be_true
+        find("a[href='#{pages.edit_template_field_path(@template, @price_field)}']").should be_true
       end
 
       it 'should has delete field link' do
         visit pages.edit_template_path(@template)
-        find("a[href='#{pages.field_path(@content_field)}']").should be_true
-        find("a[href='#{pages.field_path(@price_field)}']").should be_true
+        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
@@ -62,14 +62,14 @@ module ConstructorPages
 
       context 'Access' do
         it 'should be accessed by new_field_path if loggen in' do
-          visit pages.new_field_path(@template)
-          current_path.should == pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
+          current_path.should == pages.new_template_field_path(@template)
           status_code.should == 200
         end
 
         it 'should not be accessed by new_field_path if not loggen in' do
           logout
-          visit pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
           current_path.should == '/'
         end
       end
@@ -81,33 +81,33 @@ module ConstructorPages
         end
 
         it 'should has name field' do
-          visit pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
           page.should have_field 'Name'
         end
 
         it 'should has code name field' do
-          visit pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
           page.should have_field 'Code name'
         end
 
         it 'should has select type' do
-          visit pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
           page.should have_select 'Type value'
         end
 
         it 'should has no delete link' do
-          visit pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
           page.should_not have_link 'Delete'
         end
 
         it 'should has Create Field button' do
-          visit pages.new_field_path(@template)
+          visit pages.new_template_field_path(@template)
           page.should have_button 'Create Field'
         end
       end
 
       it 'should create new field' do
-        visit pages.new_field_path(@template)
+        visit pages.new_template_field_path(@template)
         fill_in 'Name', with: 'Amount'
         fill_in 'Code name', with: 'amount'
         select 'Integer', from: 'Type value'
@@ -124,22 +124,33 @@ module ConstructorPages
       end
 
       it 'should validate uniqueness of code_name' do
-        visit pages.new_field_path(@template)
+        visit pages.new_template_field_path(@template)
         fill_in 'Name', with: 'Hello'
         fill_in 'Code name', with: 'get_field_value'
         Field.count.should == 0
         click_button 'Create Field'
         Field.count.should == 0
-        current_path.should == pages.fields_path
+        current_path.should == pages.template_fields_path(@template)
         page.should have_text 'Code name has already been taken'
 
-        visit pages.new_field_path(@template)
+        visit pages.new_template_field_path(@template)
         fill_in 'Name', with: 'Hello'
         fill_in 'Code name', with: 'brand'
         Field.count.should == 0
         click_button 'Create Field'
         Field.count.should == 0
-        current_path.should == pages.fields_path
+        current_path.should == pages.template_fields_path(@template)
+        page.should have_text 'Code name has already been taken'
+
+        _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+
+        visit pages.edit_template_field_path(@template, _field)
+        fill_in 'Name', with: 'Hello'
+        fill_in 'Code name', with: 'brand'
+        Field.count.should == 1
+        click_button 'Update Field'
+        Field.count.should == 1
+        current_path.should == pages.template_field_path(@template, _field)
         page.should have_text 'Code name has already been taken'
       end
     end
@@ -152,30 +163,30 @@ module ConstructorPages
 
       context 'Access' do
         it 'should be accessed by edit_field_path if loggen in' do
-          visit pages.edit_field_path(@field_content, @template)
-          current_path.should == pages.edit_field_path(@field_content, @template)
+          visit pages.edit_template_field_path(@template, @field_content)
+          current_path.should == pages.edit_template_field_path(@template, @field_content)
           status_code.should == 200
         end
 
         it 'should not be accessed by new_field_path if not loggen in' do
           logout
-          visit pages.edit_field_path(@field_content, @template)
+          visit pages.edit_template_field_path(@template, @field_content)
           current_path.should == '/'
         end
       end
 
       it 'should has delete link' do
-        visit pages.edit_field_path(@field_content, @template)
-        page.should have_link 'Delete', pages.field_path(@field_content)
+        visit pages.edit_template_field_path(@template, @field_content)
+        page.should have_link 'Delete', pages.template_field_path(@template, @field_content)
       end
 
       it 'should has Update Field button' do
-        visit pages.edit_field_path(@field_content, @template)
+        visit pages.edit_template_field_path(@template, @field_content)
         page.should have_button 'Update Field'
       end
 
       it 'should edit field' do
-        visit pages.edit_field_path(@field_content, @template)
+        visit pages.edit_template_field_path(@template, @field_content)
         fill_in 'Name', with: 'Long content'
         fill_in 'Code name', with: 'long_content'
         select 'HTML', from: 'Type value'
@@ -198,14 +209,14 @@ module ConstructorPages
       it 'should delete field from template edit' do
         visit pages.edit_template_path(@template)
         Field.count.should == 1
-        find("a[href='#{pages.field_path(@field_content)}']").click
+        find("a[href='#{pages.template_field_path(@template, @field_content)}']").click
         Field.count.should == 0
         current_path.should == pages.edit_template_path(@template)
         page.should have_text 'removed successfully'
       end
 
       it 'should delete from field edit' do
-        visit pages.edit_field_path(@field_content, @template)
+        visit pages.edit_template_field_path(@template, @field_content)
         Field.count.should == 1
         click_link 'Delete'
         Field.count.should == 0

data/spec/features/constructor_pages/pages_spec.rb

@@ -79,7 +79,13 @@ module ConstructorPages
         _template = Template.create name: 'Child', code_name: 'child_page', parent: @template
         _page = Page.create name: 'Zanussi', template: @template
         visit pages.pages_path
-        page.should have_link 'Add child', pages.new_child_page_path(_page)
+        page.should have_link 'Add child', pages.new_page_path(_page)
+      end
+
+      it 'should not has if child not exists' do
+        _page = Page.create name: 'Zanussi', template: @template
+        visit pages.pages_path
+        page.should have_no_link 'Add'
       end
     end
 
@@ -185,13 +191,6 @@ module ConstructorPages
         current_path.should == pages.pages_path
         page.should have_text 'added successfully'
       end
-
-      it 'should redirect to back if no template exists' do
-        Template.delete_all
-        visit pages.new_page_path
-        current_path.should == pages.pages_path
-        page.should have_text 'Create at least one template'
-      end
     end
 
     describe 'Edit page' do

data/spec/features/constructor_pages/templates_spec.rb

@@ -214,7 +214,7 @@ module ConstructorPages
 
       it 'should has new field link' do
         visit pages.edit_template_path(@template)
-        page.should have_link 'New field', pages.new_field_path(@template)
+        page.should have_link 'New field', pages.new_template_field_path(@template)
       end
 
       it 'should has update template button' do

data/spec/models/constructor_pages/page_spec.rb

@@ -239,6 +239,19 @@ module ConstructorPages
         end
       end
 
+      describe '#multipart?' do
+        it 'should return true if there is file upload in page fields' do
+          Field.create name: 'Photo', code_name: 'photo', template: @template, type_value: 'image'
+          _page = Page.create name: 'Product', template: @template
+          _page.multipart?.should be_true
+        end
+
+        it 'should return false if there is no file upload in page fields' do
+          _page = Page.create name: 'Product', template: @template
+          _page.multipart?.should be_false
+        end
+      end
+
       describe '#as_json' do
         context 'should return page hash attributes with fields' do
           before :each do
@@ -312,11 +325,13 @@ module ConstructorPages
           end
 
           it 'should translit utf-8' do
+            I18n.locale = :ru
             page = Page.create name: 'Проверка'
             page.full_url.should == '/proverka'
 
             page_two = Page.create name: 'Тест', parent: page
             page_two.full_url.should == '/proverka/test'
+            I18n.locale = :en
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 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.7.7
+        version: 0.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.8
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: russian
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -147,8 +133,9 @@ files:
 - app/assets/images/constructor_pages/information.png
 - app/assets/images/constructor_pages/page_white_edit.png
 - app/assets/images/constructor_pages/photos.png
-- app/assets/javascripts/constructor_pages/ajax_pages.js
-- app/assets/javascripts/constructor_pages/jquery.history.js
+- 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
@@ -169,6 +156,7 @@ files:
 - app/models/constructor_pages/types/integer_type.rb
 - app/models/constructor_pages/types/string_type.rb
 - app/models/constructor_pages/types/text_type.rb
+- app/views/constructor_pages/fields/_field.haml
 - app/views/constructor_pages/fields/_form.haml
 - app/views/constructor_pages/fields/edit.haml
 - app/views/constructor_pages/fields/new.haml
@@ -181,14 +169,12 @@ files:
 - app/views/constructor_pages/fields/types/_string.haml
 - app/views/constructor_pages/fields/types/_text.haml
 - app/views/constructor_pages/pages/_breadcrumbs.haml
+- app/views/constructor_pages/pages/_field.haml
 - app/views/constructor_pages/pages/_form.haml
-- app/views/constructor_pages/pages/_menu.haml
-- app/views/constructor_pages/pages/_submenu.haml
 - app/views/constructor_pages/pages/edit.haml
 - app/views/constructor_pages/pages/index.haml
 - app/views/constructor_pages/pages/new.haml
-- app/views/constructor_pages/pages/show.haml
-- app/views/constructor_pages/partials/_arrow_buttons.haml
+- app/views/constructor_pages/pages/new_child.haml
 - app/views/constructor_pages/templates/_form.haml
 - app/views/constructor_pages/templates/edit.haml
 - app/views/constructor_pages/templates/index.haml
@@ -267,4 +253,3 @@ test_files:
 - spec/models/constructor_pages/types/string_type_spec.rb
 - spec/models/constructor_pages/types/text_type_spec.rb
 - spec/routing/constructor_pages/.keep
-has_rdoc: 

data/app/assets/javascripts/constructor_pages/ajax_pages.js

@@ -1,61 +0,0 @@
-//= require constructor_pages/jquery.history.js
-
-$(document).ready(function() {
-    $page = {};
-
-    var History = window.History;
-
-    if ( !History.enabled ) { return false }
-
-    History.Adapter.bind(window,'statechange',function(){
-        update_page(History.getState().url);
-    });
-
-
-    update_pages();
-});
-
-function update_pages(){
-    $('.b-page-json').each(function(index, el){
-        var _href = $(el).attr('href');
-
-        $(el).unbind('click');
-
-        $(el).click(function(event){
-            event.preventDefault();
-            History.pushState(null, null, _href);
-        });
-    });
-}
-
-function update_page(href) {
-
-    $.get(href+'.json', function(page){
-        $page = page;
-
-        $('title').html(page.title || page.name);
-
-        var partials = JSON.parse(page.template);
-        var names = Object.keys(partials);
-
-        for (i in names) {
-            var name = names[i];
-
-            $('.b-page-part__'+name).html(partials[name]);
-        }
-
-        $("[class*='b-page-json__id-']").removeClass('active');
-
-        for (var i in $page.self_and_ancestors) {
-            $('.b-page-json__id-'+$page.self_and_ancestors[i]).addClass('active');
-        }
-
-        update_pages();
-
-        if (typeof Retina != 'undefined') {
-            Retina.update();
-        }
-
-        eval(page.js);
-    });
-}

data/app/assets/javascripts/constructor_pages/jquery.history.js

@@ -1 +0,0 @@
-window.JSON||(window.JSON={}),function(){function f(a){return a<10?"0"+a:a}function quote(a){return escapable.lastIndex=0,escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b=="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function str(a,b){var c,d,e,f,g=gap,h,i=b[a];i&&typeof i=="object"&&typeof i.toJSON=="function"&&(i=i.toJSON(a)),typeof rep=="function"&&(i=rep.call(b,a,i));switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";gap+=indent,h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1)h[c]=str(c,i)||"null";return e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]",gap=g,e}if(rep&&typeof rep=="object"){f=rep.length;for(c=0;c<f;c+=1)d=rep[c],typeof d=="string"&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e))}else for(d in i)Object.hasOwnProperty.call(i,d)&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e));return e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}",gap=g,e}}"use strict",typeof Date.prototype.toJSON!="function"&&(Date.prototype.toJSON=function(a){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()});var JSON=window.JSON,cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;typeof JSON.stringify!="function"&&(JSON.stringify=function(a,b,c){var d;gap="",indent="";if(typeof c=="number")for(d=0;d<c;d+=1)indent+=" ";else typeof c=="string"&&(indent=c);rep=b;if(!b||typeof b=="function"||typeof b=="object"&&typeof b.length=="number")return str("",{"":a});throw new Error("JSON.stringify")}),typeof JSON.parse!="function"&&(JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e=="object")for(c in e)Object.hasOwnProperty.call(e,c)&&(d=walk(e,c),d!==undefined?e[c]=d:delete e[c]);return reviver.call(a,b,e)}var j;text=String(text),cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return j=eval("("+text+")"),typeof reviver=="function"?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}(),function(a,b){"use strict";var c=a.History=a.History||{},d=a.jQuery;if(typeof c.Adapter!="undefined")throw new Error("History.js Adapter has already been loaded...");c.Adapter={bind:function(a,b,c){d(a).bind(b,c)},trigger:function(a,b,c){d(a).trigger(b,c)},extractEventData:function(a,c,d){var e=c&&c.originalEvent&&c.originalEvent[a]||d&&d[a]||b;return e},onDomLoad:function(a){d(a)}},typeof c.init!="undefined"&&c.init()}(window),function(a,b){"use strict";var c=a.document,d=a.setTimeout||d,e=a.clearTimeout||e,f=a.setInterval||f,g=a.History=a.History||{};if(typeof g.initHtml4!="undefined")throw new Error("History.js HTML4 Support has already been loaded...");g.initHtml4=function(){if(typeof g.initHtml4.initialized!="undefined")return!1;g.initHtml4.initialized=!0,g.enabled=!0,g.savedHashes=[],g.isLastHash=function(a){var b=g.getHashByIndex(),c;return c=a===b,c},g.saveHash=function(a){return g.isLastHash(a)?!1:(g.savedHashes.push(a),!0)},g.getHashByIndex=function(a){var b=null;return typeof a=="undefined"?b=g.savedHashes[g.savedHashes.length-1]:a<0?b=g.savedHashes[g.savedHashes.length+a]:b=g.savedHashes[a],b},g.discardedHashes={},g.discardedStates={},g.discardState=function(a,b,c){var d=g.getHashByState(a),e;return e={discardedState:a,backState:c,forwardState:b},g.discardedStates[d]=e,!0},g.discardHash=function(a,b,c){var d={discardedHash:a,backState:c,forwardState:b};return g.discardedHashes[a]=d,!0},g.discardedState=function(a){var b=g.getHashByState(a),c;return c=g.discardedStates[b]||!1,c},g.discardedHash=function(a){var b=g.discardedHashes[a]||!1;return b},g.recycleState=function(a){var b=g.getHashByState(a);return g.discardedState(a)&&delete g.discardedStates[b],!0},g.emulated.hashChange&&(g.hashChangeInit=function(){g.checkerFunction=null;var b="",d,e,h,i;return g.isInternetExplorer()?(d="historyjs-iframe",e=c.createElement("iframe"),e.setAttribute("id",d),e.style.display="none",c.body.appendChild(e),e.contentWindow.document.open(),e.contentWindow.document.close(),h="",i=!1,g.checkerFunction=function(){if(i)return!1;i=!0;var c=g.getHash()||"",d=g.unescapeHash(e.contentWindow.document.location.hash)||"";return c!==b?(b=c,d!==c&&(h=d=c,e.contentWindow.document.open(),e.contentWindow.document.close(),e.contentWindow.document.location.hash=g.escapeHash(c)),g.Adapter.trigger(a,"hashchange")):d!==h&&(h=d,g.setHash(d,!1)),i=!1,!0}):g.checkerFunction=function(){var c=g.getHash();return c!==b&&(b=c,g.Adapter.trigger(a,"hashchange")),!0},g.intervalList.push(f(g.checkerFunction,g.options.hashChangeInterval)),!0},g.Adapter.onDomLoad(g.hashChangeInit)),g.emulated.pushState&&(g.onHashChange=function(b){var d=b&&b.newURL||c.location.href,e=g.getHashByUrl(d),f=null,h=null,i=null,j;return g.isLastHash(e)?(g.busy(!1),!1):(g.doubleCheckComplete(),g.saveHash(e),e&&g.isTraditionalAnchor(e)?(g.Adapter.trigger(a,"anchorchange"),g.busy(!1),!1):(f=g.extractState(g.getFullUrl(e||c.location.href,!1),!0),g.isLastSavedState(f)?(g.busy(!1),!1):(h=g.getHashByState(f),j=g.discardedState(f),j?(g.getHashByIndex(-2)===g.getHashByState(j.forwardState)?g.back(!1):g.forward(!1),!1):(g.pushState(f.data,f.title,f.url,!1),!0))))},g.Adapter.bind(a,"hashchange",g.onHashChange),g.pushState=function(b,d,e,f){if(g.getHashByUrl(e))throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(f!==!1&&g.busy())return g.pushQueue({scope:g,callback:g.pushState,args:arguments,queue:f}),!1;g.busy(!0);var h=g.createStateObject(b,d,e),i=g.getHashByState(h),j=g.getState(!1),k=g.getHashByState(j),l=g.getHash();return g.storeState(h),g.expectedStateId=h.id,g.recycleState(h),g.setTitle(h),i===k?(g.busy(!1),!1):i!==l&&i!==g.getShortUrl(c.location.href)?(g.setHash(i,!1),!1):(g.saveState(h),g.Adapter.trigger(a,"statechange"),g.busy(!1),!0)},g.replaceState=function(a,b,c,d){if(g.getHashByUrl(c))throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(d!==!1&&g.busy())return g.pushQueue({scope:g,callback:g.replaceState,args:arguments,queue:d}),!1;g.busy(!0);var e=g.createStateObject(a,b,c),f=g.getState(!1),h=g.getStateByIndex(-2);return g.discardState(f,e,h),g.pushState(e.data,e.title,e.url,!1),!0}),g.emulated.pushState&&g.getHash()&&!g.emulated.hashChange&&g.Adapter.onDomLoad(function(){g.Adapter.trigger(a,"hashchange")})},typeof g.init!="undefined"&&g.init()}(window),function(a,b){"use strict";var c=a.console||b,d=a.document,e=a.navigator,f=a.sessionStorage||!1,g=a.setTimeout,h=a.clearTimeout,i=a.setInterval,j=a.clearInterval,k=a.JSON,l=a.alert,m=a.History=a.History||{},n=a.history;k.stringify=k.stringify||k.encode,k.parse=k.parse||k.decode;if(typeof m.init!="undefined")throw new Error("History.js Core has already been loaded...");m.init=function(){return typeof m.Adapter=="undefined"?!1:(typeof m.initCore!="undefined"&&m.initCore(),typeof m.initHtml4!="undefined"&&m.initHtml4(),!0)},m.initCore=function(){if(typeof m.initCore.initialized!="undefined")return!1;m.initCore.initialized=!0,m.options=m.options||{},m.options.hashChangeInterval=m.options.hashChangeInterval||100,m.options.safariPollInterval=m.options.safariPollInterval||500,m.options.doubleCheckInterval=m.options.doubleCheckInterval||500,m.options.storeInterval=m.options.storeInterval||1e3,m.options.busyDelay=m.options.busyDelay||250,m.options.debug=m.options.debug||!1,m.options.initialTitle=m.options.initialTitle||d.title,m.intervalList=[],m.clearAllIntervals=function(){var a,b=m.intervalList;if(typeof b!="undefined"&&b!==null){for(a=0;a<b.length;a++)j(b[a]);m.intervalList=null}},m.debug=function(){(m.options.debug||!1)&&m.log.apply(m,arguments)},m.log=function(){var a=typeof c!="undefined"&&typeof c.log!="undefined"&&typeof c.log.apply!="undefined",b=d.getElementById("log"),e,f,g,h,i;a?(h=Array.prototype.slice.call(arguments),e=h.shift(),typeof c.debug!="undefined"?c.debug.apply(c,[e,h]):c.log.apply(c,[e,h])):e="\n"+arguments[0]+"\n";for(f=1,g=arguments.length;f<g;++f){i=arguments[f];if(typeof i=="object"&&typeof k!="undefined")try{i=k.stringify(i)}catch(j){}e+="\n"+i+"\n"}return b?(b.value+=e+"\n-----\n",b.scrollTop=b.scrollHeight-b.clientHeight):a||l(e),!0},m.getInternetExplorerMajorVersion=function(){var a=m.getInternetExplorerMajorVersion.cached=typeof m.getInternetExplorerMajorVersion.cached!="undefined"?m.getInternetExplorerMajorVersion.cached:function(){var a=3,b=d.createElement("div"),c=b.getElementsByTagName("i");while((b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]-->")&&c[0]);return a>4?a:!1}();return a},m.isInternetExplorer=function(){var a=m.isInternetExplorer.cached=typeof m.isInternetExplorer.cached!="undefined"?m.isInternetExplorer.cached:Boolean(m.getInternetExplorerMajorVersion());return a},m.emulated={pushState:!Boolean(a.history&&a.history.pushState&&a.history.replaceState&&!/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i.test(e.userAgent)&&!/AppleWebKit\/5([0-2]|3[0-2])/i.test(e.userAgent)),hashChange:Boolean(!("onhashchange"in a||"onhashchange"in d)||m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8)},m.enabled=!m.emulated.pushState,m.bugs={setHash:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),safariPoll:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),ieDoubleCheck:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8),hashEscape:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<7)},m.isEmptyObject=function(a){for(var b in a)return!1;return!0},m.cloneObject=function(a){var b,c;return a?(b=k.stringify(a),c=k.parse(b)):c={},c},m.getRootUrl=function(){var a=d.location.protocol+"//"+(d.location.hostname||d.location.host);if(d.location.port||!1)a+=":"+d.location.port;return a+="/",a},m.getBaseHref=function(){var a=d.getElementsByTagName("base"),b=null,c="";return a.length===1&&(b=a[0],c=b.href.replace(/[^\/]+$/,"")),c=c.replace(/\/+$/,""),c&&(c+="/"),c},m.getBaseUrl=function(){var a=m.getBaseHref()||m.getBasePageUrl()||m.getRootUrl();return a},m.getPageUrl=function(){var a=m.getState(!1,!1),b=(a||{}).url||d.location.href,c;return c=b.replace(/\/+$/,"").replace(/[^\/]+$/,function(a,b,c){return/\./.test(a)?a:a+"/"}),c},m.getBasePageUrl=function(){var a=d.location.href.replace(/[#\?].*/,"").replace(/[^\/]+$/,function(a,b,c){return/[^\/]$/.test(a)?"":a}).replace(/\/+$/,"")+"/";return a},m.getFullUrl=function(a,b){var c=a,d=a.substring(0,1);return b=typeof b=="undefined"?!0:b,/[a-z]+\:\/\//.test(a)||(d==="/"?c=m.getRootUrl()+a.replace(/^\/+/,""):d==="#"?c=m.getPageUrl().replace(/#.*/,"")+a:d==="?"?c=m.getPageUrl().replace(/[\?#].*/,"")+a:b?c=m.getBaseUrl()+a.replace(/^(\.\/)+/,""):c=m.getBasePageUrl()+a.replace(/^(\.\/)+/,"")),c.replace(/\#$/,"")},m.getShortUrl=function(a){var b=a,c=m.getBaseUrl(),d=m.getRootUrl();return m.emulated.pushState&&(b=b.replace(c,"")),b=b.replace(d,"/"),m.isTraditionalAnchor(b)&&(b="./"+b),b=b.replace(/^(\.\/)+/g,"./").replace(/\#$/,""),b},m.store={},m.idToState=m.idToState||{},m.stateToId=m.stateToId||{},m.urlToId=m.urlToId||{},m.storedStates=m.storedStates||[],m.savedStates=m.savedStates||[],m.normalizeStore=function(){m.store.idToState=m.store.idToState||{},m.store.urlToId=m.store.urlToId||{},m.store.stateToId=m.store.stateToId||{}},m.getState=function(a,b){typeof a=="undefined"&&(a=!0),typeof b=="undefined"&&(b=!0);var c=m.getLastSavedState();return!c&&b&&(c=m.createStateObject()),a&&(c=m.cloneObject(c),c.url=c.cleanUrl||c.url),c},m.getIdByState=function(a){var b=m.extractId(a.url),c;if(!b){c=m.getStateString(a);if(typeof m.stateToId[c]!="undefined")b=m.stateToId[c];else if(typeof m.store.stateToId[c]!="undefined")b=m.store.stateToId[c];else{for(;;){b=(new Date).getTime()+String(Math.random()).replace(/\D/g,"");if(typeof m.idToState[b]=="undefined"&&typeof m.store.idToState[b]=="undefined")break}m.stateToId[c]=b,m.idToState[b]=a}}return b},m.normalizeState=function(a){var b,c;if(!a||typeof a!="object")a={};if(typeof a.normalized!="undefined")return a;if(!a.data||typeof a.data!="object")a.data={};b={},b.normalized=!0,b.title=a.title||"",b.url=m.getFullUrl(m.unescapeString(a.url||d.location.href)),b.hash=m.getShortUrl(b.url),b.data=m.cloneObject(a.data),b.id=m.getIdByState(b),b.cleanUrl=b.url.replace(/\??\&_suid.*/,""),b.url=b.cleanUrl,c=!m.isEmptyObject(b.data);if(b.title||c)b.hash=m.getShortUrl(b.url).replace(/\??\&_suid.*/,""),/\?/.test(b.hash)||(b.hash+="?"),b.hash+="&_suid="+b.id;return b.hashedUrl=m.getFullUrl(b.hash),(m.emulated.pushState||m.bugs.safariPoll)&&m.hasUrlDuplicate(b)&&(b.url=b.hashedUrl),b},m.createStateObject=function(a,b,c){var d={data:a,title:b,url:c};return d=m.normalizeState(d),d},m.getStateById=function(a){a=String(a);var c=m.idToState[a]||m.store.idToState[a]||b;return c},m.getStateString=function(a){var b,c,d;return b=m.normalizeState(a),c={data:b.data,title:a.title,url:a.url},d=k.stringify(c),d},m.getStateId=function(a){var b,c;return b=m.normalizeState(a),c=b.id,c},m.getHashByState=function(a){var b,c;return b=m.normalizeState(a),c=b.hash,c},m.extractId=function(a){var b,c,d;return c=/(.*)\&_suid=([0-9]+)$/.exec(a),d=c?c[1]||a:a,b=c?String(c[2]||""):"",b||!1},m.isTraditionalAnchor=function(a){var b=!/[\/\?\.]/.test(a);return b},m.extractState=function(a,b){var c=null,d,e;return b=b||!1,d=m.extractId(a),d&&(c=m.getStateById(d)),c||(e=m.getFullUrl(a),d=m.getIdByUrl(e)||!1,d&&(c=m.getStateById(d)),!c&&b&&!m.isTraditionalAnchor(a)&&(c=m.createStateObject(null,null,e))),c},m.getIdByUrl=function(a){var c=m.urlToId[a]||m.store.urlToId[a]||b;return c},m.getLastSavedState=function(){return m.savedStates[m.savedStates.length-1]||b},m.getLastStoredState=function(){return m.storedStates[m.storedStates.length-1]||b},m.hasUrlDuplicate=function(a){var b=!1,c;return c=m.extractState(a.url),b=c&&c.id!==a.id,b},m.storeState=function(a){return m.urlToId[a.url]=a.id,m.storedStates.push(m.cloneObject(a)),a},m.isLastSavedState=function(a){var b=!1,c,d,e;return m.savedStates.length&&(c=a.id,d=m.getLastSavedState(),e=d.id,b=c===e),b},m.saveState=function(a){return m.isLastSavedState(a)?!1:(m.savedStates.push(m.cloneObject(a)),!0)},m.getStateByIndex=function(a){var b=null;return typeof a=="undefined"?b=m.savedStates[m.savedStates.length-1]:a<0?b=m.savedStates[m.savedStates.length+a]:b=m.savedStates[a],b},m.getHash=function(){var a=m.unescapeHash(d.location.hash);return a},m.unescapeString=function(b){var c=b,d;for(;;){d=a.unescape(c);if(d===c)break;c=d}return c},m.unescapeHash=function(a){var b=m.normalizeHash(a);return b=m.unescapeString(b),b},m.normalizeHash=function(a){var b=a.replace(/[^#]*#/,"").replace(/#.*/,"");return b},m.setHash=function(a,b){var c,e,f;return b!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.setHash,args:arguments,queue:b}),!1):(c=m.escapeHash(a),m.busy(!0),e=m.extractState(a,!0),e&&!m.emulated.pushState?m.pushState(e.data,e.title,e.url,!1):d.location.hash!==c&&(m.bugs.setHash?(f=m.getPageUrl(),m.pushState(null,null,f+"#"+c,!1)):d.location.hash=c),m)},m.escapeHash=function(b){var c=m.normalizeHash(b);return c=a.escape(c),m.bugs.hashEscape||(c=c.replace(/\%21/g,"!").replace(/\%26/g,"&").replace(/\%3D/g,"=").replace(/\%3F/g,"?")),c},m.getHashByUrl=function(a){var b=String(a).replace(/([^#]*)#?([^#]*)#?(.*)/,"$2");return b=m.unescapeHash(b),b},m.setTitle=function(a){var b=a.title,c;b||(c=m.getStateByIndex(0),c&&c.url===a.url&&(b=c.title||m.options.initialTitle));try{d.getElementsByTagName("title")[0].innerHTML=b.replace("<","&lt;").replace(">","&gt;").replace(" & "," &amp; ")}catch(e){}return d.title=b,m},m.queues=[],m.busy=function(a){typeof a!="undefined"?m.busy.flag=a:typeof m.busy.flag=="undefined"&&(m.busy.flag=!1);if(!m.busy.flag){h(m.busy.timeout);var b=function(){var a,c,d;if(m.busy.flag)return;for(a=m.queues.length-1;a>=0;--a){c=m.queues[a];if(c.length===0)continue;d=c.shift(),m.fireQueueItem(d),m.busy.timeout=g(b,m.options.busyDelay)}};m.busy.timeout=g(b,m.options.busyDelay)}return m.busy.flag},m.busy.flag=!1,m.fireQueueItem=function(a){return a.callback.apply(a.scope||m,a.args||[])},m.pushQueue=function(a){return m.queues[a.queue||0]=m.queues[a.queue||0]||[],m.queues[a.queue||0].push(a),m},m.queue=function(a,b){return typeof a=="function"&&(a={callback:a}),typeof b!="undefined"&&(a.queue=b),m.busy()?m.pushQueue(a):m.fireQueueItem(a),m},m.clearQueue=function(){return m.busy.flag=!1,m.queues=[],m},m.stateChanged=!1,m.doubleChecker=!1,m.doubleCheckComplete=function(){return m.stateChanged=!0,m.doubleCheckClear(),m},m.doubleCheckClear=function(){return m.doubleChecker&&(h(m.doubleChecker),m.doubleChecker=!1),m},m.doubleCheck=function(a){return m.stateChanged=!1,m.doubleCheckClear(),m.bugs.ieDoubleCheck&&(m.doubleChecker=g(function(){return m.doubleCheckClear(),m.stateChanged||a(),!0},m.options.doubleCheckInterval)),m},m.safariStatePoll=function(){var b=m.extractState(d.location.href),c;if(!m.isLastSavedState(b))c=b;else return;return c||(c=m.createStateObject()),m.Adapter.trigger(a,"popstate"),m},m.back=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.back,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.back(!1)}),n.go(-1),!0)},m.forward=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.forward,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.forward(!1)}),n.go(1),!0)},m.go=function(a,b){var c;if(a>0)for(c=1;c<=a;++c)m.forward(b);else{if(!(a<0))throw new Error("History.go: History.go requires a positive or negative integer passed.");for(c=-1;c>=a;--c)m.back(b)}return m};if(m.emulated.pushState){var o=function(){};m.pushState=m.pushState||o,m.replaceState=m.replaceState||o}else m.onPopState=function(b,c){var e=!1,f=!1,g,h;return m.doubleCheckComplete(),g=m.getHash(),g?(h=m.extractState(g||d.location.href,!0),h?m.replaceState(h.data,h.title,h.url,!1):(m.Adapter.trigger(a,"anchorchange"),m.busy(!1)),m.expectedStateId=!1,!1):(e=m.Adapter.extractEventData("state",b,c)||!1,e?f=m.getStateById(e):m.expectedStateId?f=m.getStateById(m.expectedStateId):f=m.extractState(d.location.href),f||(f=m.createStateObject(null,null,d.location.href)),m.expectedStateId=!1,m.isLastSavedState(f)?(m.busy(!1),!1):(m.storeState(f),m.saveState(f),m.setTitle(f),m.Adapter.trigger(a,"statechange"),m.busy(!1),!0))},m.Adapter.bind(a,"popstate",m.onPopState),m.pushState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.pushState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.pushState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0},m.replaceState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.replaceState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.replaceState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0};if(f){try{m.store=k.parse(f.getItem("History.store"))||{}}catch(p){m.store={}}m.normalizeStore()}else m.store={},m.normalizeStore();m.Adapter.bind(a,"beforeunload",m.clearAllIntervals),m.Adapter.bind(a,"unload",m.clearAllIntervals),m.saveState(m.storeState(m.extractState(d.location.href,!0))),f&&(m.onUnload=function(){var a,b;try{a=k.parse(f.getItem("History.store"))||{}}catch(c){a={}}a.idToState=a.idToState||{},a.urlToId=a.urlToId||{},a.stateToId=a.stateToId||{};for(b in m.idToState){if(!m.idToState.hasOwnProperty(b))continue;a.idToState[b]=m.idToState[b]}for(b in m.urlToId){if(!m.urlToId.hasOwnProperty(b))continue;a.urlToId[b]=m.urlToId[b]}for(b in m.stateToId){if(!m.stateToId.hasOwnProperty(b))continue;a.stateToId[b]=m.stateToId[b]}m.store=a,m.normalizeStore(),f.setItem("History.store",k.stringify(a))},m.intervalList.push(i(m.onUnload,m.options.storeInterval)),m.Adapter.bind(a,"beforeunload",m.onUnload),m.Adapter.bind(a,"unload",m.onUnload));if(!m.emulated.pushState){m.bugs.safariPoll&&m.intervalList.push(i(m.safariStatePoll,m.options.safariPollInterval));if(e.vendor==="Apple Computer, Inc."||(e.appCodeName||"")==="Mozilla")m.Adapter.bind(a,"hashchange",function(){m.Adapter.trigger(a,"popstate")}),m.getHash()&&m.Adapter.onDomLoad(function(){m.Adapter.trigger(a,"hashchange")})}},m.init()}(window)

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

@@ -1,8 +0,0 @@
-- @roots.each do |page|
-  - if page.in_menu
-    - if @request == page.url || page.descendants.map{|child| child.url}.include?(@request)
-      %li.active= link_to page.title, page.full_url
-    - else
-      %li= link_to page.title, page.full_url
-
-    

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

@@ -1,6 +0,0 @@
-- @children_of_current_root.each do |page|
-  - if page.full_url == @request
-    %li.active
-      = link_to page.title, page.full_url 
-  - else
-    %li= link_to page.title, page.full_url 

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

@@ -1,5 +0,0 @@
-.b_breadcrumbs= render :partial => "breadcrumbs"
-
-.b-main__h1= @page.name
-
-= @page.content.html_safe

data/app/views/constructor_pages/partials/_arrow_buttons.haml

@@ -1,6 +0,0 @@
-.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)
-      = link_to "/admin/#{item.class.to_s.demodulize.downcase.pluralize}/move/#{a}/#{item.id}", class: 'btn btn-mini' do
-        %i{class: "icon-arrow-#{a}"}