locomotive_cms 0.0.4.beta12 → 0.0.4

data/app/models/extensions/page/tree.rb

@@ -27,65 +27,11 @@ module Models
           alias :descendants :hacked_descendants
         end
 
-        module ClassMethods
-
-          # Warning: used only in read-only
-          def quick_tree(site)
-            pages = site.pages.minimal_attributes.order_by([[:depth, :asc], [:position, :asc]]).to_a
-
-            tmp = []
-
-            while !pages.empty?
-              tmp << _quick_tree(pages.delete_at(0), pages)
-            end
-
-            tmp
-          end
-
-          def _quick_tree(current_page, pages)
-            i, children = 0, []
-
-            while !pages.empty?
-              page = pages[i]
-
-              break if page.nil?
-
-              if page.parent_id == current_page.id
-                page = pages.delete_at(i)
-
-                children << _quick_tree(page, pages)
-              else
-                i += 1
-              end
-            end
-
-            current_page.instance_eval do
-              def children=(list); @children = list; end
-              def children; @children || []; end
-            end
-
-            current_page.children = children
-
-            current_page
-          end
-
-        end
-
         module InstanceMethods
 
-          def children?
-            self.class.where(self.parent_id_field => self.id).count
-          end
-
-          def children_with_minimal_attributes
-            self.class.where(self.parent_id_field => self.id).
-              order_by(self.tree_order).
-              minimal_attributes
-          end
-
           def sort_children!(ids)
             ids.each_with_index do |id, position|
-              child = self.children.detect { |p| p._id == BSON::ObjectId(id) }
+              child = self.children.detect { |p| p._id == id }
               child.position = position
               child.save
             end
@@ -98,7 +44,10 @@ module Models
           end
 
           def hacked_descendants
-            return [] if new_record?
+            # workorund for mongoid unexpected behavior
+            _new_record_var = self.instance_variable_get(:@new_record)
+            _new_record = _new_record_var != false
+            return [] if _new_record
             self.class.all_in(path_field => [self._id]).order_by tree_order
          end
 
@@ -107,12 +56,7 @@ module Models
           def change_parent
             if self.parent_id_changed?
               self.fix_position(false)
-
-              unless self.parent_id_was.nil?
-                self.position = nil # make it move to bottom
-                self.add_to_list_bottom
-              end
-
+              self.add_to_list_bottom
               self.instance_variable_set :@_will_move, true
             end
           end
@@ -137,7 +81,7 @@ module Models
           end
 
           def add_to_list_bottom
-            self.position ||= (::Page.where(:_id.ne => self._id).and(:parent_id => self.parent_id).max(:position) || 0) + 1
+            self.position = (::Page.where(:_id.ne => self._id).and(:parent_id => self.parent_id).max(:position) || 0) + 1
           end
 
           def remove_from_list

data/app/models/page.rb

@@ -40,8 +40,6 @@ class Page
   scope :index, :where => { :slug => 'index', :depth => 0 }
   scope :not_found, :where => { :slug => '404', :depth => 0 }
   scope :published, :where => { :published => true }
-  scope :fullpath, lambda { |fullpath| { :where => { :fullpath => fullpath } } }
-  scope :minimal_attributes, :only => %w(title slug fullpath position depth published templatized parent_id created_at updated_at)
 
   ## methods ##
 

data/app/models/site.rb

@@ -40,14 +40,6 @@ class Site
 
   ## methods ##
 
-  def all_pages_in_once
-    Page.quick_tree(self)
-  end
-
-  def domains=(array)
-    array = [] if array.blank?; super(array)
-  end
-
   def accounts
     Account.criteria.in(:_id => self.memberships.collect(&:account_id))
   end
@@ -58,19 +50,15 @@ class Site
 
   def add_subdomain_to_domains
     self.domains ||= []
-    (self.domains << self.full_subdomain).uniq!
+    (self.domains << "#{self.subdomain}.#{Locomotive.config.default_domain}").uniq!
   end
 
   def domains_without_subdomain
-    (self.domains || []) - [self.full_subdomain]
+    (self.domains || []) - ["#{self.subdomain}.#{Locomotive.config.default_domain}"]
   end
 
   def domains_with_subdomain
-    ((self.domains || []) + [self.full_subdomain]).uniq
-  end
-
-  def full_subdomain
-    "#{self.subdomain}.#{Locomotive.config.default_domain}"
+    ((self.domains || []) + ["#{self.subdomain}.#{Locomotive.config.default_domain}"]).uniq
   end
 
   def to_liquid

data/app/uploaders/asset_uploader.rb

@@ -60,7 +60,7 @@ class AssetUploader < CarrierWave::Uploader::Base
 
   def self.content_types
     {
-      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg', 'image/x-icon'],
+      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'],
       :video      => [/^video/, 'application/x-shockwave-flash', 'application/x-swf'],
       :audio      => [/^audio/, 'application/ogg', 'application/x-mp3'],
       :pdf        => ['application/pdf', 'application/x-pdf'],

data/app/uploaders/theme_asset_uploader.rb

@@ -15,18 +15,7 @@ class ThemeAssetUploader < AssetUploader
   end
 
   def extension_white_list
-    %w(jpg jpeg gif png css js swf flv eot svg ttf woff otf ico)
-  end
-
-  def self.url_for(site, path)
-    build(site, path).url
-  end
-
-  def self.build(site, path)
-    asset = ThemeAsset.new(:site => site, :folder => File.dirname(path))
-    uploader = ThemeAssetUploader.new(asset)
-    uploader.retrieve_from_store!(File.basename(path))
-    uploader
+    %w(jpg jpeg gif png css js swf flv eot svg ttf woff)
   end
 
 end

data/app/views/admin/asset_collections/edit.html.haml

@@ -1,8 +1,8 @@
 - title link_to(@asset_collection.name.blank? ? @asset_collection.name_was : @asset_collection.name, '#', :rel => 'asset_collection_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :head do
-  = include_javascripts :asset_collections
-  = include_stylesheets :fancybox
+  = javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
 
 - content_for :submenu do
   = render 'admin/shared/menu/assets'

data/app/views/admin/asset_collections/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :head do
-  = include_javascripts :asset_collections
+  = javascript_include_tag 'admin/asset_collections.js'
 
 - content_for :submenu do
   = render 'admin/shared/menu/assets'

data/app/views/admin/assets/_form.html.haml

@@ -1,6 +1,6 @@
 - content_for :head do
-  = include_javascripts :edit_custom_fields, :assets
-  = include_stylesheets :custom_fields
+  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/assets'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
 
 = f.inputs :name => :information do
   = f.input :name

data/app/views/admin/content_types/_form.html.haml

@@ -1,6 +1,6 @@
 - content_for :head do
-  = include_javascripts :custom_fields
-  = include_stylesheets :fancybox
+  = javascript_include_tag 'admin/plugins/fancybox', 'admin/custom_fields'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
 
 = f.inputs :name => :information do
   = f.input :name

data/app/views/admin/content_types/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :head do
-  = include_javascripts :content_types
+  = javascript_include_tag 'admin/content_types.js'
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'

data/app/views/admin/contents/_form.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = include_javascripts :edit_custom_fields, :contents
-  = include_stylesheets :fancybox
+  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/contents'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
 
 = render 'admin/custom_fields/custom_form', :form => f, :title => :attributes, :parent => @content_type

data/app/views/admin/contents/index.html.haml

@@ -4,7 +4,7 @@
   = render 'admin/shared/menu/contents'
 
 - content_for :head do
-  = include_javascripts :contents
+  = javascript_include_tag 'admin/contents'
 
 - content_for :buttons do
   = admin_button_tag :edit, edit_admin_content_type_url(@content_type), :class => 'edit'

data/app/views/admin/cross_domain_sessions/new.html.haml

@@ -8,7 +8,7 @@
     %p.notice= t('.notice')
 
   .footer
-    = box_button_tag t('admin.buttons.switch_to_site')
+    = login_button_tag t('admin.buttons.switch_to_site')
 
 :javascript
   $(document).ready(function() { $('form').submit(); });

data/app/views/admin/current_sites/_form.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = include_javascripts :site
+  = javascript_include_tag 'admin/site'
 
 = f.foldable_inputs :name => :information, :style => "#{'display: none' unless @site.new_record?}" do
   = f.input :name, :required => false
@@ -23,7 +23,7 @@
     %li{ :class => "item added #{'last' if index == @site.domains.size - 1}"}
       %em
         http://
-      = text_field_tag 'site[domains][]', name, :class => 'string label void domain'
+      = text_field_tag 'current_site[domains][]', name
        
       = error_on_domain(@site, name)
       %span.actions
@@ -32,7 +32,7 @@
   %li.item.template
     %em
       http://
-    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void domain'
+    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void'
      
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')

data/app/views/admin/current_sites/edit.html.haml

@@ -9,7 +9,7 @@
 
 %p!= t('.help')
 
-= semantic_form_for @site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
+= semantic_form_for @site, :as => :current_site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
 
   = render 'form', :f => f
 

data/app/views/admin/imports/new.html.haml

@@ -18,15 +18,4 @@
           %p.inline-errors= @error
         %p.inline-hints= t('formtastic.hints.import.source')
 
-      %li.input.toggle
-        = label_tag 'samples', t('formtastic.labels.import.new.samples')
-        = check_box_tag 'samples'
-        %p.inline-hints= t('formtastic.hints.import.samples')
-
-      %li.input.toggle
-        = label_tag 'reset', t('formtastic.labels.import.new.reset')
-        = check_box_tag 'reset'
-        %p.inline-hints= t('formtastic.hints.import.reset')
-
-
   = render 'admin/shared/form_actions', :button_label => :send

data/app/views/admin/imports/show.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = include_javascripts :import
+  = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/smartupdater', 'admin/import'
 
 - title t('.title')
 

data/app/views/admin/my_accounts/edit.html.haml

@@ -1,7 +1,7 @@
 - title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', :rel => 'my_account_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :head do
-  = include_javascripts :account
+  = javascript_include_tag 'admin/account'
 
 - content_for :submenu do
   = render 'admin/shared/menu/settings'

data/app/views/admin/pages/_form.html.haml

@@ -1,6 +1,7 @@
 - content_for :head do
-  = include_javascripts :image_picker, :edit_page
-  = include_stylesheets :editable_elements, :fancybox
+  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/codemirror/codemirror', 'admin/pages', 'admin/editable_elements'
+  = stylesheet_link_tag 'admin/editable_elements'
+  = image_picker_include_tags
 
 = f.foldable_inputs :name => :information do
 

data/app/views/admin/pages/_page.html.haml

@@ -1,7 +1,5 @@
 %li{ :id => "item-#{page.id}", :class => "#{'not-found' if page.not_found? } #{'templatized' if page.templatized?}"}
-  - with_children = !page.children.empty?
-
-  - if not page.index? and with_children
+  - if not page.index? and not page.children.empty?
     = image_tag 'admin/list/icons/node_closed.png', :class => 'toggler'
   %em
   %strong= link_to truncate(page.title, :length => 80), edit_admin_page_url(page)
@@ -13,6 +11,6 @@
     - if not page.index? and not page.not_found?
       = link_to image_tag('admin/list/icons/trash.png'), admin_page_url(page), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete
 
-  - if with_children
+  - if not page.children.empty?
     %ul{ :id => "folder-#{page._id}", :class => "folder depth-#{(page.depth || 0) + 1}", :data_url => sort_admin_page_url(page), :style => "display: #{cookies["folder-#{page._id}"] || 'block'}" }
       = render page.children

data/app/views/admin/pages/index.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :head do
-  = include_javascripts :pages
+  = javascript_include_tag 'admin/pages'
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'

data/app/views/admin/passwords/edit.html.haml

@@ -5,7 +5,7 @@
   = f.hidden_field :reset_password_token
 
   .inner
-    = box_flash_message
+    = login_flash_message
 
     = f.inputs do
       = f.input :password, :label => t('.password'), :required => false
@@ -15,4 +15,4 @@
       = link_to preserve(t('.link')), new_admin_session_path
 
   .footer
-    = box_button_tag t('admin.buttons.change_password')
+    = login_button_tag t('admin.buttons.change_password')

data/app/views/admin/passwords/new.html.haml

@@ -5,7 +5,7 @@
   = f.hidden_field :reset_password_token
 
   .inner
-    = box_flash_message
+    = login_flash_message
 
     = f.inputs do
       = f.input :email, :label => t('.email'), :required => false
@@ -14,4 +14,4 @@
       = link_to preserve(t('.link')), new_admin_session_path
 
   .footer
-    = box_button_tag t('admin.buttons.send_password')
+    = login_button_tag t('admin.buttons.send_password')

data/app/views/admin/sessions/new.html.haml

@@ -4,7 +4,7 @@
   = f.hidden_field :remember_me, :value => 'true'
 
   .inner
-    = box_flash_message
+    = login_flash_message
 
     = f.inputs do
       = f.input :email, :label => t('.email'), :required => false
@@ -14,4 +14,4 @@
       = link_to t('.link'), new_admin_password_path
 
   .footer
-    = box_button_tag t('admin.buttons.login')
+    = login_button_tag t('admin.buttons.login')

data/app/views/admin/shared/_head.html.haml

@@ -4,12 +4,13 @@
 
 %meta{ :name => 'locale', :content => I18n.locale }
 
-= include_javascripts :common
+= stylesheet_link_tag 'admin/blueprint/screen', :media => 'screen'
+/ [if IE]
+  = stylesheet_link_tag 'admin/blueprint/ie', :media => 'screen'
 
-= include_stylesheets :common, :media => 'screen'
+= stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/plugins/selectmenu', 'admin/menu', 'admin/plugins/toggle','admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
 
-/ [if IE]
-  = include_stylesheets :ie, :media => 'screen'
+= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/plugins/selectmenu', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
 
 %script{ :type => 'text/javascript' }
   = find_and_preserve(growl_message)

data/app/views/admin/shared/menu/_contents.html.haml

@@ -5,7 +5,7 @@
     .inner
       %h2!= t('admin.pages.index.lastest_items')
       %ul
-        - current_site.pages.latest_updated.minimal_attributes.each do |page|
+        - current_site.pages.latest_updated.each do |page|
           %li
             = link_to truncate(page.title, :length => 25), edit_admin_page_url(page)
             %span= time_ago_in_words(page.updated_at)

data/app/views/admin/sites/_form.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = include_javascripts :site
+  = javascript_include_tag 'admin/site'
 
 = f.foldable_inputs :name => :information, :style => "#{'display: none' unless @site.new_record?}" do
   = f.input :name, :required => false
@@ -18,7 +18,7 @@
     %li{ :class => "item added #{'last' if index == @site.domains.size - 1}"}
       %em
         http://
-      = text_field_tag 'site[domains][]', name, :class => 'string label void domain'
+      = text_field_tag 'site[domains][]', name
        
       = error_on_domain(@site, name)
       %span.actions
@@ -27,7 +27,7 @@
   %li.item.template
     %em
       http://
-    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void domain'
+    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void'
      
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')