fix a bug with IR only when Locomotive is used an engine + fix minor stuff

app/controllers/admin/base_controller.rb

@@ -1,7 +1,4 @@
-require 'locomotive/admin_responder'
-
 module Admin
-  # class BaseController < ::ApplicationController
   class BaseController < InheritedResources::Base
     
     include Locomotive::Routing::SiteDispatcher

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

@@ -1,4 +1,4 @@
-- title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', :rel => 'site_name', :title => t('.ask_for_name'), :class => 'editable')
+- title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', :rel => 'current_site_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
@@ -8,7 +8,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
       

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

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

doc/TODO

@@ -2,6 +2,7 @@ BOARD:
 
 - refactor slugify method (use parameterize + create a module)
 - send email when new content added thru api
+- publish event when saving form in ajax (for instance, in order to update account name or site name)
     
 BACKLOG:
 

lib/locomotive.rb

@@ -8,7 +8,12 @@ require 'locomotive/heroku'
 require 'locomotive/custom_fields'
 require 'locomotive/httparty'
 require 'locomotive/inherited_resources'
+require 'locomotive/admin_responder'
 
+require 'redcloth'
+require 'inherited_resources'
+require 'inherited_resources/responder'
+require 'inherited_resources/actions' # required otherwise actions won't be included in Admin base controller
 require 'mongo_session_store/mongoid'
 
 module Locomotive

lib/locomotive/admin_responder.rb

@@ -1,7 +1,9 @@
+require 'responders'
+
 module Locomotive
   class AdminResponder < ::ActionController::Responder
     
-    include Responders::FlashResponder
+    include ::Responders::FlashResponder
     
     def api_behavior(error)
       raise error unless resourceful?

public/stylesheets/admin/formtastic_changes.css

@@ -13,7 +13,6 @@ form.formtastic legend {
 	margin: 0;
 	float: left;
 	white-space: normal;
-	*margin-left: -7px;
 	position: relative;
 }
 
@@ -289,7 +288,7 @@ form.formtastic fieldset.editable-list ol li.added input {
 	color: #17171D;
 	font-size: 0.9em;
 	font-weight: bold;
-	cursor: normal;
+	cursor: pointer;
 }
 
 form.formtastic fieldset.editable-list ol li.added input:hover {

public/stylesheets/admin/layout.css

@@ -122,8 +122,6 @@ body {
 	-webkit-border-radius: 10px;
 }
 
-#content #local-actions-bar a:hover { text-decoration: underline; }
-
 #content #local-actions-bar a em {
 	position: absolute;
 	display: block;	
@@ -134,11 +132,17 @@ body {
 	background: transparent url(/images/admin/icons/actions.png) no-repeat 0 0;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	#content #local-actions-bar a em { top: 4px; }
+}
+
 #content #local-actions-bar a.show em { background-position: 0 0; }
 #content #local-actions-bar a.edit em { background-position: 0 -16px; top: 2px; left: 12px; }
 #content #local-actions-bar a.download em { background-position: 0 -32px; }
 #content #local-actions-bar a.new em { background-position: 0 -48px; left: 13px; }
 
+#content #local-actions-bar a:hover { text-decoration: none; color: #333; }
+
 /* ___ footer ___ */
 
 #footer {