fix module collisions and missing namespaces all over the templates (wip)

.gitignore

@@ -36,4 +36,4 @@ doc/bushido
 *.swp
 .sass-cache/
 spec/dummy/tmp/
-spec/dummy/log/*
+spec/dummy/log/*.log

app/cells/locomotive/global_actions_cell.rb

@@ -24,7 +24,7 @@ class Locomotive::GlobalActionsCell < ::Locomotive::MenuCell
     end
 
     add :help, :url => '#', :class => 'tutorial', :id => 'help'
-    add :logout, :url => destroy_session_url, :confirm => t('locomotive.messages.confirm')
+    add :logout, :url => destroy_locomotive_account_session_url, :confirm => t('locomotive.messages.confirm')
   end
 
   def localize_label(label, options = {})

app/cells/locomotive/menu_cell.rb

@@ -1,6 +1,6 @@
 class Locomotive::MenuCell < Cell::Base
 
-  include ::Rails.application.routes.url_helpers
+  include ::Locomotive::Engine.routes.url_helpers
 
   delegate :sections, :to => :parent_controller
 

app/controllers/locomotive/base_controller.rb

@@ -20,7 +20,7 @@ module Locomotive
     helper_method :sections, :current_site_url, :site_url, :page_url, :current_ability
 
     # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
-    helper Locomotive::BaseHelper #, Locomotive::BoxHelper
+    helper Locomotive::BaseHelper, Locomotive::ContentTypesHelper #, Locomotive::BoxHelper
     # Dir[File.dirname(__FILE__) + "/../../helpers/**/*_helper.rb"].each do |file|
     #   helper "locomotive/#{File.basename(file, '.rb').gsub(/_helper$/, '')}"
     # end

app/helpers/locomotive/base_helper.rb

@@ -46,9 +46,10 @@ module Locomotive::BaseHelper
 
   def growl_message
     if not flash.empty?
+      first_key = flash.keys.first
       %{
         $(document).ready(function() {
-          $.growl("#{flash.keys.first}", "#{flash.values.first}");
+          $.growl("#{first_key}", "#{flash[first_key]}");
         });
       }.to_s
     end
@@ -56,13 +57,11 @@ module Locomotive::BaseHelper
 
   def flash_message
     if not flash.empty?
-      puts "flash = #{flash.inspect}"
       first_key = flash.keys.first
       content_tag :div, flash[first_key],
         :id => "flash-#{first_key}",
         :class => 'application-message'
     else
-      puts "empty :-("
       ''
     end
   end

app/views/locomotive/accounts/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 %p!= t('.help')
 
@@ -18,4 +18,4 @@
       = f.input :password, :input_html => { :autocomplete => "off" }
       = f.input :password_confirmation, :input_html => { :autocomplete => "off" }
 
-  = render 'admin/shared/form_actions', :back_url => edit_current_site_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => edit_current_site_url, :button_label => :create

app/views/locomotive/content_types/_form.html.haml

@@ -7,7 +7,7 @@
   = f.input :slug
   = f.input :description
 
-= render 'admin/custom_fields/index', :form => f, :collection_name => 'contents'
+= render 'locomotive/custom_fields/index', :form => f, :collection_name => 'contents'
 
 - unless f.object.new_record?
   = f.foldable_inputs :name => :presentation, :class => 'switchable' do

app/views/locomotive/content_types/edit.html.haml

@@ -1,10 +1,10 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
 
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
   = admin_button_tag :show_items, contents_url(@content_type.slug_was), :class => 'show'
@@ -16,6 +16,6 @@
 
   = render 'form', :f => f
 
-  = render 'admin/shared/form_actions', :back_url => contents_url(@content_type.slug_was), :button_label => :update
+  = render 'locomotive/shared/form_actions', :back_url => contents_url(@content_type.slug_was), :button_label => :update
 
-= render 'admin/custom_fields/edit_field', :content_type => @content_type
+= render 'locomotive/custom_fields/edit_field', :content_type => @content_type

app/views/locomotive/content_types/new.html.haml

@@ -1,10 +1,10 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
 
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
 %p!= t('.help')
 
@@ -12,6 +12,6 @@
 
   = render 'form', :f => f
 
-  = render 'admin/shared/form_actions', :back_url => pages_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => pages_url, :button_label => :create
 
-= render 'admin/custom_fields/edit_field', :content_type => @content_type
+= render 'locomotive/custom_fields/edit_field', :content_type => @content_type

app/views/locomotive/contents/_form.html.haml

@@ -2,7 +2,7 @@
   = include_javascripts :edit_custom_fields, :contents
   = include_stylesheets :fancybox
 
-= render 'admin/custom_fields/custom_form', :form => f, :title => :attributes, :parent => @content_type
+= render 'locomotive/custom_fields/custom_form', :form => f, :title => :attributes, :parent => @content_type
 
 = f.foldable_inputs :name => :advanced_options do
 

app/views/locomotive/contents/edit.html.haml

@@ -4,13 +4,13 @@
   - title t('.title.default', :type => @content_type.name.capitalize)
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
 
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
-  - if can?(:manage, ContentType)
+  - if can?(manage, Locomotive::ContentType)
     = admin_button_tag t('locomotive.contents.index.edit'), edit_content_type_url(@content_type), :class => 'edit'
 
   = admin_button_tag t('locomotive.contents.index.new'), new_content_url(@content_type.slug), :class => 'new'
@@ -21,4 +21,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => back_url, :button_label => :update
+  = render 'locomotive/shared/form_actions', :back_url => back_url, :button_label => :update

app/views/locomotive/contents/index.html.haml

@@ -1,16 +1,16 @@
 - title t('.title', :type => @content_type.name.capitalize)
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
 
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
 - content_for :head do
   = include_javascripts :contents
 
 - content_for :buttons do
-  - if can?(:manage, ContentType)
+  - if can?(manage, Locomotive::ContentType)
     = admin_button_tag :edit, edit_content_type_url(@content_type), :class => 'edit'
 
   = admin_button_tag :new, new_content_url(@content_type.slug), :class => 'new'
@@ -26,7 +26,7 @@
 - else
   = render 'list', :contents => @contents
 
-- if can?(:manage, ContentType)
+- if can?(manage, Locomotive::ContentType)
   #local-actions-bottom-bar
     %p.tleft
       = link_to(content_tag(:em, escape_once(' ')) + t('.destroy'), content_type_url(@content_type), :confirm => t('locomotive.messages.confirm'), :method => :delete, :class => 'button small remove')

app/views/locomotive/contents/new.html.haml

@@ -4,12 +4,12 @@
   - title t('.title.default', :type => @content_type.name.capitalize)
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
 
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
-- if can?(:manage, ContentType)
+- if can?(manage, Locomotive::ContentType)
   - content_for :buttons do
     = admin_button_tag t('locomotive.contents.index.edit'), edit_content_type_url(@content_type), :class => 'edit'
 
@@ -19,4 +19,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => back_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => back_url, :button_label => :create

app/views/locomotive/current_site/_form.html.haml

@@ -9,7 +9,7 @@
   = f.input :meta_keywords
   = f.input :meta_description
 
-- if can?(:point, Site)
+- if can?(point, Locomotive::Site)
   - if manage_subdomain_or_domains?
     = f.foldable_inputs :name => :access_points, :class => 'editable-list off' do
 
@@ -42,7 +42,7 @@
             %button{ :class => 'button light add', :type => 'button' }
               %span!= t('locomotive.buttons.new_item')
 
-- if can?(:index, Membership)
+- if can?(index, Locomotive::Membership)
 
   = f.foldable_inputs :name => :memberships, :class => 'memberships off' do
     = f.semantic_fields_for :memberships do |fm|

app/views/locomotive/current_site/edit.html.haml

@@ -1,13 +1,13 @@
 - title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', :rel => 'site_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 - content_for :buttons do
   - if can?(:manage, @site)
     = admin_button_tag :export, new_export_url, :class => 'new'
     = admin_button_tag :import, new_import_url, :class => 'new'
-  - if can?(:create, Account)
+  - if can?(create, Locomotive::Account)
     = admin_button_tag t('.new_membership'), new_membership_url, :class => 'new'
 
 %p!= t('.help')
@@ -16,4 +16,4 @@
 
   = render 'form', :f => f
 
-  = render 'admin/shared/form_actions', :button_label => :update
+  = render 'locomotive/shared/form_actions', :button_label => :update

app/views/locomotive/import/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 %p!= t('.help')
 
@@ -30,4 +30,4 @@
         %p.inline-hints= t('formtastic.hints.import.reset')
 
 
-  = render 'admin/shared/form_actions', :button_label => :send
+  = render 'locomotive/shared/form_actions', :button_label => :send

app/views/locomotive/import/show.html.haml

@@ -4,7 +4,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 %p!= t('.help')
 

app/views/locomotive/layouts/application.html.haml

@@ -2,13 +2,13 @@
 !!!
 %html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
   %head
-    = render 'admin/shared/head'
+    = render 'locomotive/shared/head'
   %body{ :class => sections }
     #wrapper
       .container
         #header
-          = render 'admin/shared/header'
-          = render_cell 'admin/main_menu', :show
+          = render 'locomotive/shared/header'
+          = render_cell 'locomotive/main_menu', :show
 
           #submenu
             %ul
@@ -29,4 +29,4 @@
             = yield
 
         #footer
-          = render 'admin/shared/footer'
+          = render 'locomotive/shared/footer'

app/views/locomotive/memberships/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 %p!= t('.help')
 
@@ -12,4 +12,4 @@
     = f.custom_input :email, { :css => 'string full', :with_label => false } do
       = f.text_field :email
 
-  = render 'admin/shared/form_actions', :back_url => edit_current_site_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => edit_current_site_url, :button_label => :create

app/views/locomotive/my_account/edit.html.haml

@@ -4,11 +4,11 @@
   = include_javascripts :account
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 - if multi_sites?
   - content_for :buttons do
-    = admin_button_tag t('.new_site'), new_site_url, :class => 'new' if can?(:create, Site)
+    = admin_button_tag t('.new_site'), new_site_url, :class => 'new' if can?(create, Locomotive::Site)
 
 %p= t('.help')
 
@@ -44,4 +44,4 @@
           /  
 
 
-  = render 'admin/shared/form_actions', :button_label => :update
+  = render 'locomotive/shared/form_actions', :button_label => :update

app/views/locomotive/pages/edit.html.haml

@@ -1,10 +1,10 @@
 - title link_to(@page.title.blank? ? @page.title_was : @page.title, '#', :rel => 'page_title', :title => t('.ask_for_title'), :class => 'editable')
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
   
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
   = admin_button_tag :show, "/#{@page.fullpath}", :class => 'show'
@@ -15,4 +15,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => pages_url, :button_label => :update
+  = render 'locomotive/shared/form_actions', :back_url => pages_url, :button_label => :update

app/views/locomotive/pages/index.html.haml

@@ -1,17 +1,18 @@
 - title t('.title')
 
-- content_for :head do
-  = include_javascripts :pages
+/ - content_for :head do
+/   = include_javascripts :pages
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
 
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
-- if can? :create, Page
+- if can? :create, Locomotive::Page
   - content_for :buttons do
-    = admin_button_tag :new, new_page_url, :class => 'new', :id => 'newpage'
+    = link_to t('.new'), new_page_url, :class => 'new', :id => 'newpage'
+    / = admin_button_tag :new, new_page_url, :class => 'new', :id => 'newpage'
 
 %p!= t('.help')
 

app/views/locomotive/pages/new.html.haml

@@ -1,10 +1,10 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render 'admin/shared/menu/contents'
+  = render 'locomotive/shared/menu/contents'
   
 - content_for :actions do
-  = render 'admin/shared/actions/contents'
+  = render 'locomotive/shared/actions/contents'
 
 %p!= t('.help')
 
@@ -12,4 +12,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => pages_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => pages_url, :button_label => :create

app/views/locomotive/shared/_head.html.haml

@@ -4,15 +4,18 @@
 
 %meta{ :name => 'locale', :content => I18n.locale }
 
-= stylesheet_link_tag    'locomotive', :media => 'screen'
-= javascript_include_tag 'locomotive'
+/ = stylesheet_link_tag    'locomotive', :media => 'screen'
+/ = javascript_include_tag 'locomotive'
+
+
+
 
 / = include_javascripts :common
 /
 / = include_stylesheets :common, :media => 'screen'
 
 / [if IE]
-  = include_stylesheets :ie, :media => 'screen'
+  / = include_stylesheets :ie, :media => 'screen'
 
 %script{ :type => 'text/javascript' }
   = find_and_preserve(growl_message)

app/views/locomotive/shared/_header.html.haml

@@ -1,7 +1,7 @@
 %h1
   = link_to current_site.name, pages_url, :class => 'single'
 
-= render_cell 'admin/global_actions', :show, :current_locomotive_account => current_locomotive_account, :current_site_url => current_site_url
+= render_cell 'locomotive/global_actions', :show, :current_locomotive_account => current_locomotive_account, :current_site_url => current_site_url
 
 - if multi_sites? && current_locomotive_account.sites.size > 1
   #sites-picker{ :style => 'display: none' }
@@ -11,6 +11,6 @@
           %li
             = link_to site.name, new_cross_domain_session_url(:target_id => site._id)
 
-    - if can?(:manage, Site)
+    - if can?(manage, Locomotive::Site)
       %p.action
         = link_to t('locomotive.sites_picker.new'), new_site_url

app/views/locomotive/shared/actions/_contents.html.haml

@@ -1,2 +1,2 @@
-- if can? :manage, ContentType
+- if can? :manage, Locomotive::ContentType
   = link_to content_tag(:em) + content_tag(:span, t('locomotive.content_types.index.new')), new_content_type_url

app/views/locomotive/snippets/edit.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 - content_for :buttons do
   = admin_button_tag t('locomotive.snippets.index.new'), new_snippet_url, :class => 'new'
@@ -12,4 +12,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => theme_assets_url, :button_label => :update
+  = render 'locomotive/shared/form_actions', :back_url => theme_assets_url, :button_label => :update

app/views/locomotive/snippets/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 %p!= t('.help')
 
@@ -9,4 +9,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => theme_assets_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => theme_assets_url, :button_label => :create

app/views/locomotive/theme_assets/edit.html.haml

@@ -1,9 +1,9 @@
 - title t('.title', :file => @theme_asset.source_filename)
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
-- if can?(:manage, ThemeAsset)
+- if can?(manage, Locomotive::ThemeAsset)
   - content_for :buttons do
     = admin_button_tag t('locomotive.theme_assets.index.new'), new_theme_asset_url, :class => 'new'
 
@@ -18,4 +18,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => theme_assets_url, :button_label => :update
+  = render 'locomotive/shared/form_actions', :back_url => theme_assets_url, :button_label => :update

app/views/locomotive/theme_assets/index.html.haml

@@ -1,15 +1,15 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 - content_for :buttons do
-  = admin_button_tag t('locomotive.snippets.index.new'), new_snippet_url, :class => 'new' if can?(:manage, Snippet)
-  = admin_button_tag :new, new_theme_asset_url, :class => 'new' if can?(:manage, ThemeAsset)
+  = admin_button_tag t('locomotive.snippets.index.new'), new_snippet_url, :class => 'new' if can?(manage, Locomotive::Snippet)
+  = admin_button_tag :new, new_theme_asset_url, :class => 'new' if can?(manage, Locomotive::ThemeAsset)
 
 %p!= t('.help')
 
-- if can?(:manage, Snippet)
+- if can?(manage, Locomotive::Snippet)
   %h3!= t('.snippets')
   - if @snippets.empty?
     %p.no-items!= t('locomotive.snippets.index.no_items', :url => new_snippet_url)
@@ -19,7 +19,7 @@
 
   %br
 
-- if can?(:manage, ThemeAsset)
+- if can?(manage, Locomotive::ThemeAsset)
   %h3!= t('.css_and_js')
   - if @js_and_css_assets.empty?
     %p.no-items!= t('.no_items', :url => new_theme_asset_url)
@@ -36,7 +36,7 @@
   %ul.list.theme-assets
     = render :partial => 'asset', :collection => @assets[:images]
 
-- if can?(:manage, ThemeAsset)
+- if can?(manage, Locomotive::ThemeAsset)
   - if @assets[:fonts]
     %br
 

app/views/locomotive/theme_assets/new.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :submenu do
-  = render_cell 'admin/settings_menu', :show
+  = render_cell 'locomotive/settings_menu', :show
 
 %p!= t('.help')
 
@@ -9,4 +9,4 @@
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => theme_assets_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', :back_url => theme_assets_url, :button_label => :create

spec/dummy/log/development.log

@@ -1,3 +0,0 @@
-MongoDB logging. Please note that logging negatively impacts performance and should be disabled for high-performance production apps.
-MONGODB admin['$cmd'].find({:ismaster=>1})
-MONGODB admin['$cmd'].find({:ismaster=>1})