locomotive_cms 0.0.2.9 → 0.0.3.1

data/app/controllers/admin/memberships_controller.rb

@@ -3,36 +3,23 @@ module Admin
     
     sections 'settings'
     
-    def new
-      @membership = current_site.memberships.build
-    end
-
     def create
       @membership = current_site.memberships.build(params[:membership])
 
-      case @membership.action_to_take
+      case @membership.process!
       when :create_account
         redirect_to new_admin_account_url(:email => @membership.email)
       when :save_it
-        current_site.save
-        flash_success!
-        redirect_to edit_admin_site_url
+        respond_with @membership, :location => edit_admin_current_site_url
       when :error
-        flash_error! :now => true
-        render :action => 'new'
+        respond_with @membership, :flash => true
       when :nothing
-        flash[:error] = translate_flash_msg(:already_saved)
-        redirect_to edit_admin_site_url
+        respond_with @membership, :alert => t('flash.admin.memberships.create.already_created'), :location => edit_admin_current_site_url
       end
     end
 
     def destroy
-      current_site.memberships.find(params[:id]).destroy
-      current_site.save
-
-      flash_success!
-
-      redirect_to edit_admin_site_url
+      destroy! { edit_admin_current_site_url }
     end
   
   end

data/app/controllers/admin/my_accounts_controller.rb

@@ -3,19 +3,21 @@ module Admin
     
     sections 'settings', 'account'
     
-    def edit
-      @account = current_admin
-    end
+    actions :edit, :update
+    
+    respond_to :json, :only => :update
     
     def update
+      update! { edit_admin_my_account_url }
+    end
+    
+    protected
+    
+    def resource
       @account = current_admin
-      if @account.update_attributes(params[:account])
-        flash_success!      
-        redirect_to edit_admin_my_account_url
-      else
-        render :action => :edit
-      end
     end
     
+    def begin_of_association_chain; nil; end # not related directly to current_site
+    
   end
 end

data/app/controllers/admin/pages_controller.rb

@@ -2,6 +2,8 @@ module Admin
   class PagesController < BaseController
   
     sections 'contents'
+    
+    respond_to :json, :only => [:update, :sort]
   
     def index
       @pages = current_site.pages.roots
@@ -11,60 +13,19 @@ module Admin
       @page = current_site.pages.build
       @page.parts << PagePart.build_body_part
     end
-  
-    def edit
-      @page = current_site.pages.find(params[:id])  
-    end
-  
-    def create
-      @page = current_site.pages.build(params[:page])
-
-      if @page.save
-        flash_success!
-        redirect_to edit_admin_page_url(@page)
-      else
-        flash_error!
-        render :action => 'new'
-      end
-    end
-  
-    def update
-      @page = current_site.pages.find(params[:id])
-      
-      if @page.update_attributes(params[:page])
-        flash_success!
-        redirect_to edit_admin_page_url(@page)
-      else
-        flash_error!
-        render :action => "edit"
-      end
-    end
-  
+    
     def sort
       @page = current_site.pages.find(params[:id])
       @page.sort_children!(params[:children])
     
-      render :json => { :message => translate_flash_msg(:successful) }
+      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
-  
-    def destroy
-      @page = current_site.pages.find(params[:id])
-
-      begin
-        @page.destroy
-        flash_success!
-      rescue Exception => e
-        flash[:error] = e.to_s
-      end
-
-      redirect_to admin_pages_url
-    end
-  
+    
   end
 end

data/app/controllers/admin/sitemaps_controller.rb

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

data/app/controllers/admin/sites_controller.rb

@@ -3,35 +3,28 @@ module Admin
   
     sections 'settings'
   
-    def new
-      @site = Site.new
-    end
-    
     def create
       @site = Site.new(params[:site])
-
-      if @site.save
-        @site.memberships.create :account => @current_admin, :admin => true
-        flash_success!
-        redirect_to edit_admin_my_account_url
-      else
-        flash_error!
-        render :action => 'new'
-      end
+      @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] }
-    
+
       if @site != current_site
         @site.destroy
-        flash_success!
       else
-        flash_error!
+        @site.errors.add(:base, 'Can not destroy the site you are logging in now')
       end
     
-      redirect_to edit_admin_my_account_url
+      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

data/app/controllers/admin/snippets_controller.rb

@@ -2,55 +2,12 @@ module Admin
   class SnippetsController < BaseController
   
     sections 'settings'
+    
+    respond_to :json, :only => :update
   
     def index
       @snippets = current_site.snippets.order_by([[:name, :asc]])
     end
   
-    def new
-      @snippet = current_site.snippets.build
-    end
-  
-    def edit
-      @snippet = current_site.snippets.find(params[:id])
-    end
-  
-    def create
-      @snippet = current_site.snippets.build(params[:snippet])
-
-      if @snippet.save
-        flash_success!
-        redirect_to edit_admin_snippet_url(@snippet)
-      else
-        flash_error!
-        render :action => 'new'
-      end
-    end
-  
-    def update
-      @snippet = current_site.snippets.find(params[:id])
-      
-      if @snippet.update_attributes(params[:snippet])
-        flash_success!
-        redirect_to edit_admin_snippet_url(@snippet)
-      else
-        flash_error!
-        render :action => "edit"
-      end
-    end
-  
-    def destroy
-      @snippet = current_site.snippets.find(params[:id])
-
-      begin
-        @snippet.destroy
-        flash_success!
-      rescue Exception => e
-        flash[:error] = e.to_s
-      end
-
-      redirect_to admin_snippets_url
-    end
-  
   end
 end

data/app/controllers/admin/theme_assets_controller.rb

@@ -5,6 +5,8 @@ module Admin
 
     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? }
@@ -12,69 +14,26 @@ module Admin
       @flash_assets = assets.find_all { |a| a.movie? }
       
       if request.xhr?
-        render :action => 'images', :layout => false
+        render :action => 'images', :layout => false and return
       end
     end
     
-    def new
-      @asset = current_site.theme_assets.build
-    end
-    
-    def edit
-      @asset = current_site.theme_assets.find(params[:id])
-    end
-    
     def create
       params[:theme_asset] = { :source => params[:file] } if params[:file]
       
-      @asset = current_site.theme_assets.build(params[:theme_asset])
-      
-      respond_to do |format|
-        if @asset.save
-          format.html do
-            flash_success!
-            redirect_to edit_admin_theme_asset_url(@asset)
-          end
-          format.json do
-            render :json => { 
-              :status => 'success', 
-              :name => truncate(@asset.slug, :length => 22),
-              :url => @asset.source.url,
-              :vignette_url => @asset.vignette_url
-            }
-          end
-        else
-          format.html do
-            flash_error!
-            render :action => 'new'
-          end
-          format.json do
-            render :json => { :status => 'error' }
-          end
+      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
+          }
         end
+        failure.json { render :json => { :status => 'error' } }
       end
     end
-    
-    def update
-      @asset = current_site.theme_assets.find(params[:id])
-
-      if @asset.update_attributes(params[:theme_asset])
-        flash_success!
-        redirect_to edit_admin_theme_asset_url(@asset)
-      else
-        flash_error!
-        render :action => 'edit'
-      end
-    end
-    
-    def destroy
-      @asset = current_site.theme_assets.find(params[:id])
-      @asset.destroy
-
-      flash_success!
-      redirect_to admin_theme_assets_url
-    end
-    
+        
   end
   
 end

data/app/helpers/admin/assets_helper.rb

@@ -5,7 +5,7 @@ module Admin::AssetsHelper
   end
     
   def image_dimensions_and_size(asset)
-    content_tag(:small, "#{asset.width}px x #{@asset.height}px | #{number_to_human_size(asset.size)}")
+    content_tag(:small, "#{asset.width}px x #{asset.height}px | #{number_to_human_size(asset.size)}")
   end
   
   def allow_plain_text_editing?(asset)

data/app/helpers/admin/base_helper.rb

@@ -17,7 +17,7 @@ module Admin::BaseHelper
   def admin_button_tag(text, url, options = {})
     text = text.is_a?(Symbol) ? t(".#{text}") : text
     link_to(url, options) do
-      content_tag(:span, text)
+      content_tag(:em, escape_once(' ')) + text
     end
   end
   
@@ -50,5 +50,5 @@ module Admin::BaseHelper
   def nocoffee_tag
     link_to 'noCoffee', 'http://www.nocoffee.fr', :id => 'nocoffee'
   end
-  
+    
 end

data/app/helpers/admin/pages_helper.rb

@@ -1,5 +1,18 @@
 module Admin::PagesHelper
   
+  def page_main_url(page)
+    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  
+  
   def parent_pages_options
     roots = current_site.pages.roots.where(:slug.ne => '404').and(:_id.ne => @page.id)
     

data/app/models/membership.rb

@@ -21,14 +21,17 @@ class Membership
     self.account = Account.where(:email => email).first
   end
   
-  def action_to_take
+  def process!
     if @email.blank?
+      self.errors.add_on_blank(:email)
       :error
     elsif self.account.nil?
       :create_account
     elsif self.site.memberships.find_all { |m| m.account_id == self.account_id }.size > 1
+      self.errors.add(:base, 'Already created')
       :nothing
     else
+      self.save
       :save_it
     end
   end

data/app/models/page.rb

@@ -33,6 +33,7 @@ class Page
   named_scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.lastest_items_nb
   named_scope :index, :where => { :slug => 'index', :depth => 0, :published => true }
   named_scope :not_found, :where => { :slug => '404', :depth => 0, :published => true }
+  named_scope :published, :where => { :published => true }
   
   ## behaviours ##
   liquify_template :joined_parts
@@ -47,6 +48,10 @@ class Page
     self.slug == '404' && self.depth.to_i == 0
   end
   
+  def index_or_not_found?
+    self.index? || self.not_found?
+  end
+  
   def fullpath(force = false)
     if read_attribute(:fullpath).present? && !force
       return read_attribute(:fullpath)
@@ -79,8 +84,10 @@ class Page
     return if (self.site rescue nil).nil?
     
     if self.index? || self.not_found?
-      raise I18n.t('errors.messages.protected_page')
+      self.errors[:base] << I18n.t('errors.messages.protected_page')
     end
+    
+    self.errors.empty?
   end
       
   def normalize_slug