locomotive_cms 0.0.3.3 → 0.0.4.beta1

data/app/controllers/admin/my_accounts_controller.rb

@@ -1,23 +1,23 @@
 module Admin
   class MyAccountsController < BaseController
-    
+
     sections 'settings', 'account'
-    
+
     actions :edit, :update
-    
+
     respond_to :json, :only => :update
-    
+
     def update
       update! { edit_admin_my_account_url }
     end
-    
+
     protected
-    
+
     def resource
       @account = current_admin
     end
-    
+
     def begin_of_association_chain; nil; end # not related directly to current_site
-    
+
   end
-end
+end

data/app/controllers/admin/pages_controller.rb

@@ -1,31 +1,42 @@
 module Admin
   class PagesController < BaseController
-  
+
     sections 'contents'
-    
-    respond_to :json, :only => [:update, :sort]
-  
+
+    respond_to :json, :only => [:update, :sort, :get_path]
+
     def index
       @pages = current_site.pages.roots
     end
-  
+
     def new
       @page = current_site.pages.build
-      @page.parts << PagePart.build_body_part
     end
-    
+
+    def update
+      update! do |success, failure|
+        success.json do
+          render :json => {
+            :notice => t('flash.admin.pages.update.notice'),
+            :editable_elements => @page.template_changed ?
+              render_to_string(:partial => 'admin/pages/editable_elements.html.haml') : ''
+          }
+        end
+      end
+    end
+
     def sort
       @page = current_site.pages.find(params[:id])
       @page.sort_children!(params[:children])
-    
+
       respond_with @page
     end
-    
+
     def get_path
       page = current_site.pages.build(:parent => current_site.pages.find(params[:parent_id]), :slug => params[:slug].slugify)
-    
+
       render :json => { :url => page.url, :slug => page.slug }
     end
-    
+
   end
-end
+end

data/app/controllers/admin/passwords_controller.rb

@@ -1,13 +1,13 @@
 module Admin
   class PasswordsController < Devise::PasswordsController
-    
+
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/login'
-  
+    layout 'admin/box'
+
     before_filter :require_site
-    
+
     helper 'admin/base', 'admin/login'
-  
+
   end
-end
+end

data/app/controllers/admin/rendering_controller.rb

@@ -1,15 +1,15 @@
 module Admin
   class RenderingController < ActionController::Base
-  
+
     include Locomotive::Routing::SiteDispatcher
-  
+
     include Locomotive::Render
-  
+
     before_filter :require_site
-  
+
     def show
       render_locomotive_page
     end
-  
+
   end
-end
+end

data/app/controllers/admin/sessions_controller.rb

@@ -1,19 +1,19 @@
 module Admin
   class SessionsController < Devise::SessionsController
-    
+
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/login'
-  
+    layout 'admin/box'
+
     before_filter :require_site
-    
+
     helper 'admin/base', 'admin/login'
-  
+
     protected
-  
+
     def after_sign_in_path_for(resource)
       admin_pages_url
     end
-  
+
   end
-end
+end

data/app/controllers/admin/sitemaps_controller.rb

@@ -1,16 +1,16 @@
 module Admin
   class SitemapsController < ActionController::Base
-  
+
     include Locomotive::Routing::SiteDispatcher
-  
+
     before_filter :require_site
-  
+
     respond_to :xml
-    
+
     def show
       @pages = current_site.pages.published
       @host = request.host
     end
-  
+
   end
-end
+end

data/app/controllers/admin/sites_controller.rb

@@ -1,15 +1,15 @@
 module Admin
   class SitesController < BaseController
-  
+
     sections 'settings'
-  
+
     def create
       @site = Site.new(params[:site])
       @site.memberships.build :account => @current_admin, :admin => true
-      
+
       create! { edit_admin_my_account_url }
     end
-      
+
     def destroy
       @site = current_admin.sites.detect { |s| s._id == params[:id] }
 
@@ -18,13 +18,13 @@ module Admin
       else
         @site.errors.add(:base, 'Can not destroy the site you are logging in now')
       end
-    
+
       respond_with @site, :location => edit_admin_my_account_url
     end
-    
+
     protected
-    
+
     def begin_of_association_chain; nil; end # not related directly to current_site
-    
+
   end
-end
+end

data/app/controllers/admin/snippets_controller.rb

@@ -1,13 +1,15 @@
 module Admin
   class SnippetsController < BaseController
-  
-    sections 'settings'
-    
+
+    sections 'settings', 'theme_assets'
+
     respond_to :json, :only => :update
-  
-    def index
-      @snippets = current_site.snippets.order_by([[:name, :asc]])
+
+    def destroy
+      destroy! do |format|
+        format.html { redirect_to admin_theme_assets_url }
+      end
     end
-  
+
   end
-end
+end

data/app/controllers/admin/theme_assets_controller.rb

@@ -1,39 +1,50 @@
 module Admin
   class ThemeAssetsController < BaseController
 
+    include ActionView::Helpers::SanitizeHelper
+    extend ActionView::Helpers::SanitizeHelper::ClassMethods
     include ActionView::Helpers::TextHelper
+    include ActionView::Helpers::NumberHelper
 
     sections 'settings', 'theme_assets'
-   
+
     respond_to :json, :only => [:create, :update]
-   
+
     def index
-      assets = current_site.theme_assets.all
-      @non_image_assets = assets.find_all { |a| a.stylesheet? || a.javascript? }
-      @image_assets = assets.find_all { |a| a.image? }
-      @flash_assets = assets.find_all { |a| a.movie? }
-      
+      @assets = current_site.theme_assets.visible(params[:all]).order_by([[:slug, :asc]])
+      @assets = @assets.group_by { |a| a.folder.split('/').first.to_sym }
+      @js_and_css_assets = (@assets[:javascripts] || []) + (@assets[:stylesheets] || [])
+
       if request.xhr?
+        @images = @assets[:images]
         render :action => 'images', :layout => false and return
+      else
+        @snippets = current_site.snippets.order_by([[:name, :asc]]).all.to_a
       end
     end
-    
+
+    def edit
+      resource.performing_plain_text = true if resource.stylesheet_or_javascript?
+      edit!
+    end
+
     def create
       params[:theme_asset] = { :source => params[:file] } if params[:file]
-      
+
       create! do |success, failure|
         success.json do
-          render :json => { 
-            :status => 'success', 
-            :name => truncate(@theme_asset.slug, :length => 22),
-            :url => @theme_asset.source.url,
-            :vignette_url => @theme_asset.vignette_url
+          render :json => {
+            :status       => 'success',
+            :url          => @theme_asset.source.url,
+            :local_path   => @theme_asset.local_path(true),
+            :size         => number_to_human_size(@theme_asset.size),
+            :date         => l(@theme_asset.updated_at, :format => :short)
           }
         end
         failure.json { render :json => { :status => 'error' } }
       end
     end
-        
+
   end
-  
-end
+
+end

data/app/controllers/application_controller.rb

@@ -1,3 +1,11 @@
-class ApplicationController < ActionController::Base  
+class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  protected
+
+  # rescue_from Exception, :with => :render_error
+  #
+  # def render_error
+  #   render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
+  # end
 end

data/app/controllers/home_controller.rb

@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
-  
+
   def show; end
-  
+
   def unknown; end
-  
-end
+
+end

data/app/helpers/admin/accounts_helper.rb

@@ -1,8 +1,8 @@
 module Admin::AccountsHelper
-  
+
   def admin_on?(site = current_site)
     site.memberships.detect { |a| a.admin? && a.account == current_admin }
   end
-  
+
 end
-  
+

data/app/helpers/admin/assets_helper.rb

@@ -1,15 +1,21 @@
 module Admin::AssetsHelper
-  
+
   def vignette_tag(asset)
     image_tag(asset.vignette_url)
   end
-    
+
   def image_dimensions_and_size(asset)
     content_tag(:small, "#{asset.width}px x #{asset.height}px | #{number_to_human_size(asset.size)}")
   end
-  
+
   def allow_plain_text_editing?(asset)
     asset.new_record? || asset.stylesheet? || asset.javascript?
   end
-  
-end
+
+  def image_picker_include_tags
+    html = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/scrollTo', 'admin/plugins/codemirror/codemirror', 'admin/plugins/fancybox', 'admin/plugins/plupload/plupload.full', 'admin/plugins/imagepicker'
+    html += stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
+    html
+  end
+
+end

data/app/helpers/admin/base_helper.rb

@@ -1,5 +1,5 @@
 module Admin::BaseHelper
-  
+
   def title(title = nil)
     if title.nil?
       @content_for_title
@@ -8,25 +8,25 @@ module Admin::BaseHelper
       ''
     end
   end
-    
+
   def admin_menu_item(name, url)
     label = content_tag(:em) + escape_once(' ') + t("admin.shared.menu.#{name}")
     content_tag(:li, link_to(label, url), :class => name.dasherize)
   end
-  
+
   def admin_button_tag(text, url, options = {})
     text = text.is_a?(Symbol) ? t(".#{text}") : text
     link_to(url, options) do
       content_tag(:em, escape_once(' ')) + text
     end
   end
-  
+
   def admin_submenu_item(name, url, options = {}, &block)
     default_options = { :i18n => true, :css => name.dasherize.downcase }
     default_options.merge!(options)
-        
+
     css = "#{'on' if name == sections(:sub)} #{'links' if block_given?} #{options[:css]}"
-    
+
     label_link = default_options[:i18n] ? t("admin.shared.menu.#{name}") : name
     if block_given?
       popup = content_tag(:div, capture(&block), :class => 'popup', :style => 'display: none')
@@ -36,7 +36,7 @@ module Admin::BaseHelper
       content_tag(:li, link_to(content_tag(:span, label_link), url), :class => css)
     end
   end
-  
+
   def growl_message
     if not flash.empty?
       %{
@@ -50,5 +50,5 @@ module Admin::BaseHelper
   def nocoffee_tag
     link_to 'noCoffee', 'http://www.nocoffee.fr', :id => 'nocoffee'
   end
-    
-end
+
+end

data/app/helpers/admin/custom_fields_helper.rb

@@ -1,36 +1,36 @@
 module Admin::CustomFieldsHelper
-    
-  def options_for_field_kind(selected = nil)
-    options = %w{String Text Category Boolean Date File}.map do |kind|
-      [t("admin.custom_fields.kind.#{kind.downcase}"), kind]
-    end    
+
+  def options_for_field_kind
+    options = %w{string text category boolean date file}.map do |kind|
+      [t("admin.custom_fields.kind.#{kind}"), kind]
+    end
   end
-  
+
   def options_for_order_by(content_type, collection_name)
     options = %w{updated_at _position_in_list}.map do |type|
       [t("admin.content_types.form.order_by.#{type.gsub(/^_/, '')}"), type]
     end
     options + options_for_highlighted_field(content_type, collection_name)
   end
-  
+
   def options_for_highlighted_field(content_type, collection_name)
     custom_fields_collection_name = "ordered_#{collection_name.singularize}_custom_fields".to_sym
     collection = content_type.send(custom_fields_collection_name)
     collection.delete_if { |f| f.label == 'field name' }
     collection.map { |field| [field.label, field._name] }
   end
-  
+
   def options_for_group_by_field(content_type, collection_name)
     custom_fields_collection_name = "ordered_#{collection_name.singularize}_custom_fields".to_sym
     collection = content_type.send(custom_fields_collection_name)
     collection.delete_if { |f| not f.category? }
     collection.map { |field| [field.label, field._name] }
   end
-  
+
   def options_for_text_formatting
     options = %w{none html}.map do |option|
       [t("admin.custom_fields.text_formatting.#{option}"), option]
     end
   end
-  
-end
+
+end

data/app/helpers/admin/login_helper.rb

@@ -1,17 +1,17 @@
 module Admin::LoginHelper
-  
+
   def login_flash_message
     if not flash.empty?
-      content_tag :div, flash.values.first, 
-        :id => "flash-#{flash.keys.first}", 
+      content_tag :div, flash.values.first,
+        :id => "flash-#{flash.keys.first}",
         :class => 'application-message'
     else
       ''
-    end   
+    end
   end
-  
+
   def login_button_tag(label)
     content_tag(:button, content_tag(:span, label), :type => 'submit', :class => 'button')
   end
-  
-end
+
+end

data/app/helpers/admin/pages_helper.rb

@@ -1,41 +1,45 @@
 module Admin::PagesHelper
-  
-  def page_main_url(page)
-    url = '' 
-    
-    if page.site.domains.empty? 
+
+  def page_main_url(page, content = nil)
+    url = ''
+
+    if page.site.domains.empty?
       url = main_site_url(page.site)
     else
       url = "http://#{current_site.domains.first}"
       url += ":#{request.port}" if request.port != 80
     end
-    
-    File.join(url, page.fullpath)
-  end  
-  
+
+    if content.nil?
+      File.join(url, page.fullpath)
+    else
+      File.join(url, page.fullpath.gsub('/content_type_template', ''), content._slug)
+    end
+  end
+
   def parent_pages_options
     roots = current_site.pages.roots.where(:slug.ne => '404').and(:_id.ne => @page.id)
-    
-    returning [] do |list|
+
+    [].tap do |list|
       roots.each do |page|
         list = add_children_to_options(page, list)
       end
     end
   end
-  
+
   def add_children_to_options(page, list)
     return list if page.path.include?(@page.id) || page == @page
-    
+
     offset = '- ' * (page.depth || 0) * 2
-        
+
     list << ["#{offset}#{page.title}", page.id]
     page.children.each { |child| add_children_to_options(child, list) }
     list
   end
-  
+
   def options_for_page_cache_strategy
     [
-      [t('.cache_strategy.none'), 'none'],  
+      [t('.cache_strategy.none'), 'none'],
       [t('.cache_strategy.simple'), 'simple'],
       [t('.cache_strategy.hour'), 1.hour.to_s],
       [t('.cache_strategy.day'), 1.day.to_s],
@@ -43,5 +47,5 @@ module Admin::PagesHelper
       [t('.cache_strategy.month'), 1.month.to_s]
     ]
   end
-  
-end
+
+end

data/app/helpers/admin/sites_helper.rb

@@ -1,18 +1,18 @@
 module Admin::SitesHelper
-  
+
   def application_domain
     domain = Locomotive.config.default_domain
     domain += ":#{request.port}" if request.port != 80
     domain
   end
-  
+
   def main_site_url(site = current_site, options = {})
     url = "http://#{site.subdomain}.#{Locomotive.config.default_domain}"
     url += ":#{request.port}" if request.port != 80
     url = File.join(url, controller.request.fullpath) if options.has_key?(:uri) && options[:uri]
     url
   end
-    
+
   def error_on_domain(site, name)
     if (error = (site.errors[:domains] || []).detect { |n| n.include?(name) })
       content_tag(:span, error, :class => 'inline-errors')
@@ -20,5 +20,5 @@ module Admin::SitesHelper
       ''
     end
   end
-  
-end
+
+end