lolita 3.2.0.rc1 → 3.2.0.rc2

data/Gemfile

@@ -9,6 +9,7 @@ gem "builder", "~> 3.0"
 
 gem "haml", "~> 3.1.2"
 gem 'jquery-rails'
+gem 'tinymce-rails', :require => 'tinymce-rails'
 
 group :mongoid do
 	gem "mongo", "~> 1.3.0"
@@ -17,15 +18,21 @@ group :mongoid do
 end
 
 #gem 'cover_me', '>= 1.0.0.rc6', :group => :test
+group :assets do
+ 	gem 'sass-rails',   "~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
+end
+
 gem "jeweler", "~> 1.5.2", :group=>:development
 group :test,:development do
 	gem "rspec", "~>2.6.0"
-	gem "rspec-rails","~>2.6.0"
+	gem "rspec-rails","~>2.6.1"
 	gem "factory_girl"
 	gem 'ffaker'
 	gem "ruby-debug19"
-	gem "cucumber-rails"
-	gem "capybara"
+	# gem "cucumber-rails"
+	# gem "capybara"
 	gem "database_cleaner"
-	gem "akephalos"
+	# gem "akephalos"
 end

data/VERSION

@@ -1 +1 @@
-3.2.0.rc1
+3.2.0.rc2

data/app/assets/javascripts/lolita/application.js

@@ -1 +1,4 @@
-/* Use this file for you application specific javascript */
+//= require jquery
+//= require jquery_ujs
+//= require application_vendor_lolita
+//= require_tree .

data/app/assets/javascripts/lolita/tab.js

@@ -31,7 +31,7 @@ $(function(){
     save_all()
   })
   // All tabs are closable when clicked on tab title.
-  $(".tab.minimized .tab-title").live('click',function(){
-		$(this).parent().toggleClass("minimized", 200)
+  $(".tab .tab-title.grey").live('click',function(){
+		$(this).parent().toggleClass("minimized")
 	})
 })

data/app/assets/stylesheets/lolita/application.css

@@ -0,0 +1,5 @@
+/* 
+*= require_self
+*= require lolita/default
+*= require lolita/style
+*/

data/app/assets/stylesheets/lolita/{style.css → style.css.erb}

@@ -125,7 +125,7 @@ header nav .username {margin-right: 15px;}
   width: 100%; 
   padding: 25px 0; 
   background: #fff;
-  background: rgba(256,256,256,0.9);
+  background: rgba(255,255,255,0.9);
   font-size: 16px;
   text-align: center;
   cursor: pointer;
@@ -423,7 +423,7 @@ a.create {
 .ie7 a.create img {top: 0;}
 .ie7 header nav a.username {position: relative; top: -4px;}
 .ie7 .black {-pie-background: linear-gradient(top, #686868, #2f2f2f);}
-.ie7 #flash {-pie-background: rgba(256,256,256,0.9);}
+.ie7 #flash {-pie-background: rgba(255,255,255,0.9);}
 /* ----------------------------------------------*/
 
 /* IE8 fixes */
@@ -439,5 +439,5 @@ a.create {
 .ie8 #main .box form .field-value textarea
 {position: relative;}
 .ie8 .black {-pie-background: linear-gradient(top, #686868, #2f2f2f);}
-.ie8 #flash {-pie-background: rgba(256,256,256,0.9);}
+.ie8 #flash {-pie-background: rgba(255,255,255,0.9);}
 /* ----------------------------------------------*/

data/app/views/components/lolita/configuration/field/string/text/_display.html.erb

@@ -1,10 +1,3 @@
-<% if @textarea_component_include_tinymce_once.nil? %>
-  <% content_for :script do %>
-    <%= javascript_include_tag "tinymce/jquery.tinymce" %>
-		<%= javascript_include_tag "tinymce_config.js" %>
-  <% end %>
-<% end %>
-
 <%= tab_form.text_area field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
 <% if @textarea_component_include_tinymce_once.nil? %>
   <script type="text/javascript">

data/app/views/layouts/lolita/application.html.erb

@@ -12,19 +12,9 @@
     <title>Lolita</title><meta name="description" content=""><meta name="author" content="">
     <link rel="shortcut icon" href="/favicon.ico">
 
-    <%= stylesheet_link_tag "lolita/default","lolita/style" %>
+    <%= stylesheet_link_tag "lolita/application.css" %>
     <%= yield :style %>
-    
-     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
-     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
-    <script>
-      if(!window.jQuery){
-        document.write('<script src="/javascripts/jquery-1.6.2.min.js">\x3C/script>');
-        document.write('<script src="/javascripts/jquery-ui-1.8.13.min.js">\x3C/script>');
-      }
-    </script>
-    <%= javascript_include_tag "modernizr-1.7.min" %>
-    <%= javascript_include_tag "lolita/tab","lolita/main","lolita/application", "lolita/base64" %>
+    <%= javascript_include_tag "lolita/application.js" %>
     <%= yield :script %>
     <%= raw csrf_meta_tag %>
   </head>

data/lib/lolita.rb

@@ -1,7 +1,10 @@
 
 $:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
 LOLITA_VERSION=File.read(File.expand_path("../../VERSION",__FILE__)).gsub(/[^.\w]/,"")
-puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""}"
+FRAMEWORK = if defined?(Rails)
+  " with Rails #{::Rails::VERSION::STRING}"
+end
+puts "=> Lolita #{LOLITA_VERSION} starting#{FRAMEWORK}"
 
 # TODO should allow run lolita seperated
 # unless (["-d","--debug"] & ARGV).empty?
@@ -16,8 +19,6 @@ puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""
 # end
 require "rubygems"
 require 'abstract'
-require "base64"
-require 'kaminari'
 unless defined?(ActiveSupport)
   require 'active_support/core_ext/numeric/time'
   require 'active_support/core_ext/date_time/conversions'
@@ -189,5 +190,9 @@ module Lolita
 end
 
 if Lolita.rails3?
+  require "base64"
+  require 'kaminari'
+  require 'tinymce-rails'
+  require 'jquery-rails'
   require 'lolita/rails/all'
 end

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita"
-  s.version = "3.2.0.rc1"
+  s.version = "3.2.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia) and Arturs Meisters"]
-  s.date = "2011-09-05"
+  s.date = "2011-09-06"
   s.description = "Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. "
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -33,8 +33,9 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/lolita/tab.js",
     "app/assets/stylesheets/lolita/PIE-custom.htc",
     "app/assets/stylesheets/lolita/PIE.htc",
-    "app/assets/stylesheets/lolita/default.css",
-    "app/assets/stylesheets/lolita/style.css",
+    "app/assets/stylesheets/lolita/application.css",
+    "app/assets/stylesheets/lolita/default.css.erb",
+    "app/assets/stylesheets/lolita/style.css.erb",
     "app/controllers/lolita/info_controller.rb",
     "app/controllers/lolita/rest_controller.rb",
     "app/helpers/components/lolita/configuration/list_component.rb",
@@ -287,41 +288,9 @@ Gem::Specification.new do |s|
     "spec/support/factories/post.rb",
     "spec/support/factories/tag.rb",
     "spec/support/formatter_spec.rb",
-    "vendor/assets/javascripts/jquery-1.6.2.min.js",
+    "vendor/assets/javascripts/application_vendor_lolita.js",
     "vendor/assets/javascripts/jquery-ui-1.8.13.min.js",
-    "vendor/assets/javascripts/modernizr-1.7.min.js",
-    "vendor/assets/javascripts/tinymce/jquery.tinymce.js",
-    "vendor/assets/javascripts/tinymce/langs/en.js",
-    "vendor/assets/javascripts/tinymce/license.txt",
-    "vendor/assets/javascripts/tinymce/themes/advanced/about.htm",
-    "vendor/assets/javascripts/tinymce/themes/advanced/anchor.htm",
-    "vendor/assets/javascripts/tinymce/themes/advanced/charmap.htm",
-    "vendor/assets/javascripts/tinymce/themes/advanced/color_picker.htm",
-    "vendor/assets/javascripts/tinymce/themes/advanced/editor_template.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/editor_template_src.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/image.htm",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/colorpicker.jpg",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/flash.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/icons.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/iframe.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/pagebreak.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/quicktime.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/realmedia.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/shockwave.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/trans.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/video.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/img/windowsmedia.gif",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/about.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/anchor.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/charmap.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/color_picker.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/image.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/link.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/js/source_editor.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/langs/en.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/langs/en_dlg.js",
-    "vendor/assets/javascripts/tinymce/themes/advanced/link.htm",
-    "vendor/assets/javascripts/tinymce/themes/advanced/shortcuts.htm",
+    "vendor/assets/javascripts/modernizr_1_7_min.js",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/butt2.png",
@@ -337,13 +306,6 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/tabs.gif",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/toolbarbg.png",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css",
-    "vendor/assets/javascripts/tinymce/themes/advanced/source_editor.htm",
-    "vendor/assets/javascripts/tinymce/tiny_mce.js",
-    "vendor/assets/javascripts/tinymce/tiny_mce_popup.js",
-    "vendor/assets/javascripts/tinymce/utils/editable_selects.js",
-    "vendor/assets/javascripts/tinymce/utils/form_utils.js",
-    "vendor/assets/javascripts/tinymce/utils/mctabs.js",
-    "vendor/assets/javascripts/tinymce/utils/validate.js",
     "vendor/assets/javascripts/tinymce_config.js"
   ]
   s.homepage = "http://github.com/ithouse/lolita"
@@ -414,16 +376,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, ["~> 3.0"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.1.2"])
       s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<tinymce-rails>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.1"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
       s.add_development_dependency(%q<ffaker>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_development_dependency(%q<cucumber-rails>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<akephalos>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
@@ -431,16 +391,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<builder>, ["~> 3.0"])
       s.add_dependency(%q<haml>, ["~> 3.1.2"])
       s.add_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_dependency(%q<tinymce-rails>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
       s.add_dependency(%q<ffaker>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_dependency(%q<cucumber-rails>, [">= 0"])
-      s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<akephalos>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.1.0"])
@@ -449,16 +407,14 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, ["~> 3.0"])
     s.add_dependency(%q<haml>, ["~> 3.1.2"])
     s.add_dependency(%q<jquery-rails>, [">= 0"])
+    s.add_dependency(%q<tinymce-rails>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
     s.add_dependency(%q<factory_girl>, [">= 0"])
     s.add_dependency(%q<ffaker>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
-    s.add_dependency(%q<cucumber-rails>, [">= 0"])
-    s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<akephalos>, [">= 0"])
   end
 end
 

data/spec/rails_app/config/application.rb

@@ -3,9 +3,10 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
 require "rails/test_unit/railtie"
+require "sprockets/railtie"
 
 Bundler.require(:default, LOLITA_ORM, Rails.env) if defined?(Bundler)
-#require 'cells'
+
 require 'lolita'
 require "lolita/rails/all"
 require 'kaminari'
@@ -22,5 +23,15 @@ module RailsApp
 		config.filter_parameters << :password
 
 		config.action_mailer.default_url_options = { :host => "localhost:3000" }
+		 config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
 	end
 end

data/spec/rails_app/config/environments/development.rb

@@ -1,6 +1,10 @@
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
-
+# Do not compress assets
+config.assets.compress = false
+ 
+# Expands the lines which load the assets
+config.assets.debug = true
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
@@ -11,7 +15,7 @@ RailsApp::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+ 
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/spec/rails_app/config/environments/production.rb

@@ -1,6 +1,10 @@
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
-
+# Do not compress assets
+config.assets.compress = false
+ 
+# Expands the lines which load the assets
+config.assets.debug = true
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true

data/spec/rails_app/config/environments/test.rb

@@ -1,6 +1,10 @@
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
-
+# Do not compress assets
+config.assets.compress = false
+ 
+# Expands the lines which load the assets
+config.assets.debug = true
   # The test environment is used exclusively to run your application's
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped

data/vendor/assets/javascripts/application_vendor_lolita.js

@@ -0,0 +1,6 @@
+//
+//= require tinymce-jquery
+//= require jquery-ui-1.8.13.min
+//= require modernizr_1_7_min
+//= require tinymce_config
+//= require_self

data/vendor/assets/javascripts/tinymce_config.js

@@ -1,6 +1,5 @@
 function load_tinymce(){
 	$("textarea[data-simple!=true]").tinymce({
-		script_url: "/assets/tinymce/tiny_mce.js",
 		theme: "advanced",
 		skin: "cirkuit",
 		mode: "textareas",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
+  version: 3.2.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-09-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &78344290 !ruby/object:Gem::Requirement
+  requirement: &73543310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *78344290
+  version_requirements: *73543310
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &78343650 !ruby/object:Gem::Requirement
+  requirement: &73535470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *78343650
+  version_requirements: *73535470
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &78343080 !ruby/object:Gem::Requirement
+  requirement: &73533920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78343080
+  version_requirements: *73533920
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &78336800 !ruby/object:Gem::Requirement
+  requirement: &73533120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *78336800
+  version_requirements: *73533120
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &78335630 !ruby/object:Gem::Requirement
+  requirement: &73531590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *78335630
+  version_requirements: *73531590
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &78334710 !ruby/object:Gem::Requirement
+  requirement: &73529420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78334710
+  version_requirements: *73529420
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails
+  requirement: &73528050 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *73528050
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78333930 !ruby/object:Gem::Requirement
+  requirement: &73519800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *78333930
+  version_requirements: *73519800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78332960 !ruby/object:Gem::Requirement
+  requirement: &73518770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,21 +109,21 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *78332960
+  version_requirements: *73518770
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &78332000 !ruby/object:Gem::Requirement
+  requirement: &73517900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *78332000
+  version_requirements: *73517900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &78331220 !ruby/object:Gem::Requirement
+  requirement: &73516930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78331220
+  version_requirements: *73516930
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &78330310 !ruby/object:Gem::Requirement
+  requirement: &73514800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,21 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78330310
+  version_requirements: *73514800
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &78328980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *78328980
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: &78266870 !ruby/object:Gem::Requirement
+  requirement: &73514200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,32 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78266870
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &78265970 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *78265970
+  version_requirements: *73514200
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &78264590 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *78264590
-- !ruby/object:Gem::Dependency
-  name: akephalos
-  requirement: &78263590 !ruby/object:Gem::Requirement
+  requirement: &73513560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78263590
+  version_requirements: *73513560
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -212,8 +190,9 @@ files:
 - app/assets/javascripts/lolita/tab.js
 - app/assets/stylesheets/lolita/PIE-custom.htc
 - app/assets/stylesheets/lolita/PIE.htc
-- app/assets/stylesheets/lolita/default.css
-- app/assets/stylesheets/lolita/style.css
+- app/assets/stylesheets/lolita/application.css
+- app/assets/stylesheets/lolita/default.css.erb
+- app/assets/stylesheets/lolita/style.css.erb
 - app/controllers/lolita/info_controller.rb
 - app/controllers/lolita/rest_controller.rb
 - app/helpers/components/lolita/configuration/list_component.rb
@@ -466,41 +445,9 @@ files:
 - spec/support/factories/post.rb
 - spec/support/factories/tag.rb
 - spec/support/formatter_spec.rb
-- vendor/assets/javascripts/jquery-1.6.2.min.js
+- vendor/assets/javascripts/application_vendor_lolita.js
 - vendor/assets/javascripts/jquery-ui-1.8.13.min.js
-- vendor/assets/javascripts/modernizr-1.7.min.js
-- vendor/assets/javascripts/tinymce/jquery.tinymce.js
-- vendor/assets/javascripts/tinymce/langs/en.js
-- vendor/assets/javascripts/tinymce/license.txt
-- vendor/assets/javascripts/tinymce/themes/advanced/about.htm
-- vendor/assets/javascripts/tinymce/themes/advanced/anchor.htm
-- vendor/assets/javascripts/tinymce/themes/advanced/charmap.htm
-- vendor/assets/javascripts/tinymce/themes/advanced/color_picker.htm
-- vendor/assets/javascripts/tinymce/themes/advanced/editor_template.js
-- vendor/assets/javascripts/tinymce/themes/advanced/editor_template_src.js
-- vendor/assets/javascripts/tinymce/themes/advanced/image.htm
-- vendor/assets/javascripts/tinymce/themes/advanced/img/colorpicker.jpg
-- vendor/assets/javascripts/tinymce/themes/advanced/img/flash.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/icons.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/iframe.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/pagebreak.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/quicktime.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/realmedia.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/shockwave.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/trans.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/video.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/img/windowsmedia.gif
-- vendor/assets/javascripts/tinymce/themes/advanced/js/about.js
-- vendor/assets/javascripts/tinymce/themes/advanced/js/anchor.js
-- vendor/assets/javascripts/tinymce/themes/advanced/js/charmap.js
-- vendor/assets/javascripts/tinymce/themes/advanced/js/color_picker.js
-- vendor/assets/javascripts/tinymce/themes/advanced/js/image.js
-- vendor/assets/javascripts/tinymce/themes/advanced/js/link.js
-- vendor/assets/javascripts/tinymce/themes/advanced/js/source_editor.js
-- vendor/assets/javascripts/tinymce/themes/advanced/langs/en.js
-- vendor/assets/javascripts/tinymce/themes/advanced/langs/en_dlg.js
-- vendor/assets/javascripts/tinymce/themes/advanced/link.htm
-- vendor/assets/javascripts/tinymce/themes/advanced/shortcuts.htm
+- vendor/assets/javascripts/modernizr_1_7_min.js
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/butt2.png
@@ -516,13 +463,6 @@ files:
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/tabs.gif
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/toolbarbg.png
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css
-- vendor/assets/javascripts/tinymce/themes/advanced/source_editor.htm
-- vendor/assets/javascripts/tinymce/tiny_mce.js
-- vendor/assets/javascripts/tinymce/tiny_mce_popup.js
-- vendor/assets/javascripts/tinymce/utils/editable_selects.js
-- vendor/assets/javascripts/tinymce/utils/form_utils.js
-- vendor/assets/javascripts/tinymce/utils/mctabs.js
-- vendor/assets/javascripts/tinymce/utils/validate.js
 - vendor/assets/javascripts/tinymce_config.js
 homepage: http://github.com/ithouse/lolita
 licenses:
@@ -539,7 +479,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -665335473
+      hash: -500179811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: