lolita 3.1.12 → 3.1.13

data/History.rdoc

@@ -1,3 +1,11 @@
+=== Version 3.1.13 / 2011-08-16
+* Enhancements
+  * Color for Lolita-Alert popup changed
+  * #tab_form method added in lolita helpers
+* Bug fixes
+  * DBI for AR - method names fixed 
+  * Messages encoding bug fixed
+
 === Version 3.1.12 / 2011-07-15
 * Bug fixes
   * Time convertation from rails time_select fixed.

data/VERSION

@@ -1 +1 @@
-3.1.12
+3.1.13

data/app/controllers/lolita/rest_controller.rb

@@ -19,7 +19,6 @@ class Lolita::RestController < ApplicationController
   def create
     self.run(:before_create)
     build_resource
-    debugger
     save_and_redirect
   end
 
@@ -96,13 +95,13 @@ class Lolita::RestController < ApplicationController
   
   def respond_html_200
     response.headers["Validation"] = 'true'
-    response.headers["Lolita-Notice"] = ::I18n.t "lolita.shared.save_notice"
+    response.headers["Lolita-Notice"] = Base64.encode64(::I18n.t "lolita.shared.save_notice")
     show_form
   end
 
   def respond_html_400
     response.headers["Validation"] = 'false'
-    response.headers["Lolita-Alert"] = ::I18n.t "lolita.shared.save_alert"
+    response.headers["Lolita-Alert"] = Base64.encode64(::I18n.t "lolita.shared.save_alert")
     show_form
   end
 

data/app/views/components/lolita/configuration/field/array/habtm/_display.html.haml

@@ -0,0 +1,7 @@
+= hidden_field_tag "#{resource_name}[#{field.name.to_s.singularize}_ids][]",""
+- field.association_values.call.each do |value|
+  - editors = resource.send(:"#{field.name.to_s.singularize}_ids")
+  .habtm-container
+    = label_tag "#{resource_name}_#{field.name}_#{value.last}",value.first, :class => "habtm-label"
+    = check_box_tag "#{resource_name}[#{field.name.to_s.singularize}_ids][]", value.last, resource.send(field.name).include?(value.last), :id => "#{resource_name}_#{field.name}_#{value.last}", :class => "habtm-checkbox"
+.clear

data/app/views/components/lolita/configuration/field/array/select/_display.html.erb

@@ -1,5 +1,4 @@
-<%= select resource_name,
-            field.name,
+<%= tab_form.select field.name,
             (field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values),
             {:include_blank => field.include_blank},
             field.html_options || {} %>

data/app/views/components/lolita/configuration/tab/_fields.html.erb

@@ -1,7 +1,7 @@
 <% tab.fields_with_field_set do |fields_or_field,field_set| %>
   <% if field_set %>
     <%= render_component :"lolita/configuration/field_set", :display, :fields=>fields_or_field,:field_set=>field_set %>
-  <% else %>
+ <% else %>
     <%= render_component :"lolita/configuration/field", :display,:field=>fields_or_field %>
-  <% end %>
-<% end %>
+   <% end %>
+ <% end %>

data/app/views/components/lolita/configuration/tab/_nested_form.html.erb

@@ -0,0 +1,16 @@
+<div class = "nested-fields" >
+  <%= tab_form.fields_for field.nested_form.resource_name do |nested_form| %>
+    <% 
+      old_tab_form = tab_form
+      self.tab_form = nested_form
+    %>
+    <%- fields.each do |field| %>
+      <% if field.is_a?(Array) %>
+        <%# implement fieldset in nested form here%>
+      <% else %>
+        <%= render_component *field.build(field.nested_form.options) %>
+      <% end %>
+    <%- end %>
+    <% self.tab_form = old_tab_form %>
+  <% end %>
+</div>

data/app/views/components/lolita/configuration/tab/default/_display.html.erb

@@ -2,8 +2,10 @@
 # FIXME: move to /tab_types/
 #
 %>
-<%= form_tag "#",:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put do |form| %>
+<%= form_for resource, :url => "#",:html => {:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put} do |form| %>
+  <% self.tab_form = form %>
   <div class="tab-content">
-    <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
+    <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab, %>
   </div>
-<% end %>
+<% end %>
+<% self.tab_form = nil %>

data/app/views/components/lolita/shared/_flash.html.erb

@@ -1,4 +1,4 @@
-<div id="flash" style="display:block">
+<div id="flash" style="display:none">
   <% if local_assigns[:message] %>
     <%= message %>
   <% end %>

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

@@ -24,7 +24,7 @@
       }
     </script>
     <%= javascript_include_tag "modernizr-1.7.min" %>
-    <%= javascript_include_tag "rails","lolita/tab","lolita/main","lolita/application" %>
+    <%= javascript_include_tag "rails","lolita/tab","lolita/main","lolita/application", "lolita/base64" %>
     <%= yield :script %>
     <%= raw csrf_meta_tag %>
   </head>

data/lib/lolita.rb

@@ -16,6 +16,7 @@ puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""
 # end
 
 require 'abstract'
+require "base64"
 unless defined?(ActiveSupport)
   require 'active_support/core_ext/numeric/time'
   require 'active_support/core_ext/date_time/conversions'
@@ -69,6 +70,7 @@ module Lolita
     autoload :Page, 'lolita/configuration/page'
     autoload :Tabs, 'lolita/configuration/tabs'
     autoload :Filter, 'lolita/configuration/filter'
+    autoload :NestedForm, 'lolita/configuration/nested_form'
 
     module Field
       extend Lolita::Configuration::Factory

data/lib/lolita/adapter/active_record.rb

@@ -14,7 +14,7 @@ module Lolita
       end
 
       # Same as in mongoid
-      def associations_klass_names
+      def associations_class_names
         names=[]
         associations.each{|name,association|
           names << association.class_name

data/lib/lolita/configuration/field.rb

@@ -29,7 +29,7 @@ module Lolita
         include Lolita::Builder
 
         @@default_type="string"
-        lolita_accessor :name,:title,:field_set,:nested_for,:options, :html_options,:record,:association
+        lolita_accessor :name,:title,:field_set, :nested_form,:nested_for,:options, :html_options,:record,:association
         attr_reader :dbi,:nested_in
         
         def initialize dbi, *args, &block

data/lib/lolita/configuration/nested_form.rb

@@ -0,0 +1,26 @@
+module Lolita
+  module Configuration
+    class NestedForm
+       @@last_nested_form=0
+      
+      attr_reader :parent, :options
+      attr_accessor :name
+
+      def initialize parent,name=nil, options ={}
+        @parent=parent
+        @options = options
+        self.name=name || "nested_form_#{next_nested_form}"
+      end
+
+      def fields
+        self.parent.fields.reject{|f| f.nested_form!=self}
+      end
+
+      private
+
+      def next_nested_form
+        @@last_nested_form+=1
+      end
+    end
+  end
+end

data/lib/lolita/configuration/tab.rb

@@ -26,8 +26,8 @@ module Lolita
         @@available_types=[:content]
      
         lolita_accessor :title,:name,:type
-        attr_accessor :dbi,:current_fieldset,:current_dbi
-        attr_reader :field_sets,:nested_form
+        attr_accessor :dbi,:current_fieldset, :current_nested_form,:current_dbi
+        attr_reader :field_sets,:nested_forms
 
         # To create new tab the following parametrs need to be provided.
         # * <tt>dbi</tt> Lolita::DBI::Base object, that represents database.
@@ -35,7 +35,8 @@ module Lolita
         # * <tt>&block</tt> Block can be passed, anything in block will be evaled for current instance.
         def initialize dbi,*args,&block
           @fields=Lolita::Configuration::Fields.new
-          @field_sets=[]
+          @field_sets = []
+          @nested_forms = []
           self.dbi=dbi
           self.current_dbi=dbi
           self.set_attributes(*args)
@@ -49,11 +50,12 @@ module Lolita
         # Return field itself.
         def field *args, &block
           field=Lolita::Configuration::Field.add(self.current_dbi,*args,&block)
-          field.field_set=current_fieldset
+          field.field_set = current_fieldset
           if self.current_dbi!=self.dbi
             field.nested_in=self.dbi
+            field.nested_form = current_nested_form
           end
-          @fields<<field
+          @fields << field
           field
         end
 
@@ -88,11 +90,15 @@ module Lolita
 
         # Add tab nested fields for <em>class_or_name</em> and <em>&block</em>
         # that will be evaluted in current tab instance.
-        def nested_fields_for class_or_name,&block
+        def nested_fields_for class_or_name, options ={},&block
           current_class=get_class(class_or_name)
+          nested_form = Lolita::Configuration::NestedForm.new(self,current_class.to_s.downcase, options)
+          self.current_nested_form = nested_form
+          @nested_forms << nested_form
           self.current_dbi=Lolita::DBI::Base.new(current_class)
           self.instance_eval(&block)
           self.current_dbi=self.dbi
+          self.current_nested_form = nil
         end
 
         # Return nested field for given <em>class_or_name</em>
@@ -107,8 +113,8 @@ module Lolita
         # that will be evaluted in current tab instance.
         def field_set name,&block
           field_set=Lolita::Configuration::FieldSet.new(self,name)
-          self.current_fieldset=field_set
-          @field_sets<<field_set
+          self.current_fieldset = field_set
+          @field_sets << field_set
           self.instance_eval(&block)
           self.current_fieldset=nil
         end
@@ -126,11 +132,34 @@ module Lolita
             end
           }
         end
+
         # tab.field do
         #  tab.fields_with_fieldset do |field,fieldset|
         #    =field
         #  end
 
+        def fields_by_forms
+          forms = []
+          current_form = nil
+          content = forms
+          self.fields.each do |field|
+            if field.nested_form 
+              if current_form != field.nested_form
+                form_fields = []
+                forms << form_fields
+                content = form_fields
+              end
+              content << field
+            end
+          end
+          if block_given?
+            forms.each do |form_or_field|
+              yield form_or_field
+            end
+          else
+            forms
+          end
+        end
 
         # Set attributes from given <em>*args</em>.
         # First element of args is used as <i>type</i> other interpreted as options.

data/lib/lolita/controllers/component_helpers.rb

@@ -32,7 +32,7 @@ module Lolita
         will_use_component name 
         component_name=File.join(name.to_s,state ? state.to_s : nil)
         partial_name=File.join("/components",component_name)
-        output=output_component(partial_name,component_name,:format=>format,:locals=>options)
+        output=output_component(partial_name,component_name,:format=>format ,:locals=>options)
         self.respond_to?(:raw) ? raw(output) : output
       end
       

data/lib/lolita/controllers/internal_helpers.rb

@@ -6,7 +6,7 @@ module Lolita
         helper LolitaHelper
         #TODO pārnest helperus uz lolitu vai arī uz lolita app nevis likt iekš controllers iekš lolitas
         helpers = %w(resource resource_name
-                     resource_class lolita_mapping show_response)
+                     resource_class lolita_mapping show_response tab_form tab_form=)
         hide_action *helpers
        
         helper_method *helpers
@@ -31,6 +31,14 @@ module Lolita
       def lolita_mapping
         @lolita_mapping||=request.env["lolita.mapping"]
       end
+
+      def tab_form=(form)
+        @tab_form = form
+      end
+
+      def tab_form
+        @tab_form
+      end
       
       protected
 

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.12"
+  s.version = "3.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["ITHouse (Latvia) and Arturs Meisters"]
-  s.date = %q{2011-07-15}
+  s.authors = [%q{ITHouse (Latvia) and Arturs Meisters}]
+  s.date = %q{2011-08-17}
   s.description = %q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/field/_object.html.erb",
     "app/views/components/lolita/configuration/field/array/_display.html.erb",
     "app/views/components/lolita/configuration/field/array/filter/_display.html.erb",
-    "app/views/components/lolita/configuration/field/array/habtm/_display.html.erb",
+    "app/views/components/lolita/configuration/field/array/habtm/_display.html.haml",
     "app/views/components/lolita/configuration/field/array/select/_display.html.erb",
     "app/views/components/lolita/configuration/field/big_decimal/_display.html.erb",
     "app/views/components/lolita/configuration/field/boolean/_display.html.erb",
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/list/_title.html.erb",
     "app/views/components/lolita/configuration/tab/_display.html.erb",
     "app/views/components/lolita/configuration/tab/_fields.html.erb",
+    "app/views/components/lolita/configuration/tab/_nested_form.html.erb",
     "app/views/components/lolita/configuration/tab/content/_display.html.erb",
     "app/views/components/lolita/configuration/tab/default/_display.html.erb",
     "app/views/components/lolita/configuration/tabs/_display.html.erb",
@@ -120,6 +121,7 @@ Gem::Specification.new do |s|
     "lib/lolita/configuration/fields.rb",
     "lib/lolita/configuration/filter.rb",
     "lib/lolita/configuration/list.rb",
+    "lib/lolita/configuration/nested_form.rb",
     "lib/lolita/configuration/page.rb",
     "lib/lolita/configuration/tab.rb",
     "lib/lolita/configuration/tab/content.rb",
@@ -153,6 +155,7 @@ Gem::Specification.new do |s|
     "public/javascripts/jquery-1.6.min.js",
     "public/javascripts/jquery-ui-1.8.13.min.js",
     "public/javascripts/lolita/application.js",
+    "public/javascripts/lolita/base64.js",
     "public/javascripts/lolita/main.js",
     "public/javascripts/lolita/tab.js",
     "public/javascripts/modernizr-1.7.min.js",
@@ -326,9 +329,9 @@ Gem::Specification.new do |s|
     "spec/support/formatter_spec.rb"
   ]
   s.homepage = %q{http://github.com/ithouse/lolita}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{Great Rails CMS.}
   s.test_files = [
     "spec/adapter_helper.rb",

data/public/javascripts/lolita/base64.js

@@ -0,0 +1 @@
+var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(c){var a="";var k,h,f,j,g,e,d;var b=0;c=Base64._utf8_encode(c);while(b<c.length){k=c.charCodeAt(b++);h=c.charCodeAt(b++);f=c.charCodeAt(b++);j=k>>2;g=((k&3)<<4)|(h>>4);e=((h&15)<<2)|(f>>6);d=f&63;if(isNaN(h)){e=d=64}else{if(isNaN(f)){d=64}}a=a+this._keyStr.charAt(j)+this._keyStr.charAt(g)+this._keyStr.charAt(e)+this._keyStr.charAt(d)}return a},decode:function(c){var a="";var k,h,f;var j,g,e,d;var b=0;c=c.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(b<c.length){j=this._keyStr.indexOf(c.charAt(b++));g=this._keyStr.indexOf(c.charAt(b++));e=this._keyStr.indexOf(c.charAt(b++));d=this._keyStr.indexOf(c.charAt(b++));k=(j<<2)|(g>>4);h=((g&15)<<4)|(e>>2);f=((e&3)<<6)|d;a=a+String.fromCharCode(k);if(e!=64){a=a+String.fromCharCode(h)}if(d!=64){a=a+String.fromCharCode(f)}}a=Base64._utf8_decode(a);return a},_utf8_encode:function(b){b=b.replace(/\r\n/g,"\n");var a="";for(var e=0;e<b.length;e++){var d=b.charCodeAt(e);if(d<128){a+=String.fromCharCode(d)}else{if((d>127)&&(d<2048)){a+=String.fromCharCode((d>>6)|192);a+=String.fromCharCode((d&63)|128)}else{a+=String.fromCharCode((d>>12)|224);a+=String.fromCharCode(((d>>6)&63)|128);a+=String.fromCharCode((d&63)|128)}}}return a},_utf8_decode:function(a){var b="";var d=0;var e=c1=c2=0;while(d<a.length){e=a.charCodeAt(d);if(e<128){b+=String.fromCharCode(e);d++}else{if((e>191)&&(e<224)){c2=a.charCodeAt(d+1);b+=String.fromCharCode(((e&31)<<6)|(c2&63));d+=2}else{c2=a.charCodeAt(d+1);c3=a.charCodeAt(d+2);b+=String.fromCharCode(((e&15)<<12)|((c2&63)<<6)|(c3&63));d+=3}}}return b}};

data/public/javascripts/lolita/main.js

@@ -5,7 +5,7 @@ $(function(){
       "lolita_xhr": "true"
     }
   })
-  $("#flash").slideUp("fast");
+  //$("#flash").slideUp("fast");
   $("#flash").live("click", function(){
     $(this).slideUp("fast");
   })
@@ -15,13 +15,13 @@ $(function(){
     var error=request.getResponseHeader("Lolita-Error");
     var alert_msg=request.getResponseHeader("Lolita-Alert");
     if(notice){
-      show_flash("<span style='color:green'>"+notice+"</span>");
+      show_flash("<span style='color:green'>"+Base64.decode(notice)+"</span>");
     }else{
       if(error){
-        show_flash("<span style='color:red'>"+error+"</span>");
+        show_flash("<span style='color:red'>"+Base64.decode(error)+"</span>");
       }else{
         if(alert_msg){
-          show_flash("<span style='color:yellow'>"+alert_msg+"</span>");
+          show_flash("<span style='color:#ea7c15'>"+Base64.decode(alert_msg)+"</span>");
         }
       }
     }

data/public/stylesheets/lolita/style.css

@@ -247,7 +247,23 @@ a.create {
   -webkit-box-sizing: border-box;
   box-sizing: border-box; /* IE7 does not support it, IE8 does */
 }
-
+.habtm-container{
+  float:left;
+  margin-bottom: 3px;
+}
+.habtm-container label{
+  float:right;
+  color: #666 !important;
+  width: 150px;
+}
+.habtm-container input{
+  width:30px !important;
+  float:left;
+  margin-right: 5px;
+}
+.clear{
+  clear:both;
+}
 /* --------------------------------------------- */
 
 

data/spec/configuration/tab_spec.rb

@@ -161,5 +161,16 @@ describe Lolita::Configuration::Tab do
     tab.fields.by_name(:title).name.should == :title
   end
 
+  it "should have nested forms" do
+    tab = tab_class.new(@dbi) do
+      default_fields
+      nested_fields_for("Comment") do
+        default_fields
+      end
+    end
+    tab.nested_forms.should have(1).item
+    tab.nested_forms[0].fields.size.should > 0
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 +03:00
-default_executable: 
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72922150 !ruby/object:Gem::Requirement
+  requirement: &79171940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *72922150
+  version_requirements: *79171940
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &72921600 !ruby/object:Gem::Requirement
+  requirement: &79170900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *72921600
+  version_requirements: *79170900
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &72921100 !ruby/object:Gem::Requirement
+  requirement: &79170290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72921100
+  version_requirements: *79170290
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &72920340 !ruby/object:Gem::Requirement
+  requirement: &79169580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *72920340
+  version_requirements: *79169580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72919750 !ruby/object:Gem::Requirement
+  requirement: &79168890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *72919750
+  version_requirements: *79168890
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72918790 !ruby/object:Gem::Requirement
+  requirement: &79168020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *72918790
+  version_requirements: *79168020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &72917910 !ruby/object:Gem::Requirement
+  requirement: &79166460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *72917910
+  version_requirements: *79166460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &72917250 !ruby/object:Gem::Requirement
+  requirement: &79162390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72917250
+  version_requirements: *79162390
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &72916470 !ruby/object:Gem::Requirement
+  requirement: &79160600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72916470
+  version_requirements: *79160600
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &72891220 !ruby/object:Gem::Requirement
+  requirement: &79158890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72891220
+  version_requirements: *79158890
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &72890530 !ruby/object:Gem::Requirement
+  requirement: &79157700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72890530
+  version_requirements: *79157700
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &72889460 !ruby/object:Gem::Requirement
+  requirement: &79157020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72889460
+  version_requirements: *79157020
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &72888620 !ruby/object:Gem::Requirement
+  requirement: &79154350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72888620
+  version_requirements: *79154350
 - !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &72887860 !ruby/object:Gem::Requirement
+  requirement: &79153460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72887860
+  version_requirements: *79153460
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -204,7 +203,7 @@ files:
 - app/views/components/lolita/configuration/field/_object.html.erb
 - app/views/components/lolita/configuration/field/array/_display.html.erb
 - app/views/components/lolita/configuration/field/array/filter/_display.html.erb
-- app/views/components/lolita/configuration/field/array/habtm/_display.html.erb
+- app/views/components/lolita/configuration/field/array/habtm/_display.html.haml
 - app/views/components/lolita/configuration/field/array/select/_display.html.erb
 - app/views/components/lolita/configuration/field/big_decimal/_display.html.erb
 - app/views/components/lolita/configuration/field/boolean/_display.html.erb
@@ -228,6 +227,7 @@ files:
 - app/views/components/lolita/configuration/list/_title.html.erb
 - app/views/components/lolita/configuration/tab/_display.html.erb
 - app/views/components/lolita/configuration/tab/_fields.html.erb
+- app/views/components/lolita/configuration/tab/_nested_form.html.erb
 - app/views/components/lolita/configuration/tab/content/_display.html.erb
 - app/views/components/lolita/configuration/tab/default/_display.html.erb
 - app/views/components/lolita/configuration/tabs/_display.html.erb
@@ -278,6 +278,7 @@ files:
 - lib/lolita/configuration/fields.rb
 - lib/lolita/configuration/filter.rb
 - lib/lolita/configuration/list.rb
+- lib/lolita/configuration/nested_form.rb
 - lib/lolita/configuration/page.rb
 - lib/lolita/configuration/tab.rb
 - lib/lolita/configuration/tab/content.rb
@@ -311,6 +312,7 @@ files:
 - public/javascripts/jquery-1.6.min.js
 - public/javascripts/jquery-ui-1.8.13.min.js
 - public/javascripts/lolita/application.js
+- public/javascripts/lolita/base64.js
 - public/javascripts/lolita/main.js
 - public/javascripts/lolita/tab.js
 - public/javascripts/modernizr-1.7.min.js
@@ -482,7 +484,6 @@ files:
 - spec/support/factories/post.rb
 - spec/support/factories/tag.rb
 - spec/support/formatter_spec.rb
-has_rdoc: true
 homepage: http://github.com/ithouse/lolita
 licenses:
 - MIT
@@ -498,7 +499,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 598416093
+      hash: 641694611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -507,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Great Rails CMS.

data/app/views/components/lolita/configuration/field/array/habtm/_display.html.erb

@@ -1,26 +0,0 @@
-<% options = field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>
-<% values = self.instance_variable_get("@#{resource_name}").send("#{field.name}") %>
-<% subject_habtm_fieldname = "#{field.name.to_s.singularize}_ids" %>
-<% values.each{|value|%>
-  <%
-  option_tags = options.collect{|option|
-    option_tag_attributes = {:value=>option[1]}
-    option_tag_attributes[:selected] = "selected" if option[1] == value.id
-    content_tag :option, option[0], option_tag_attributes
-  }.join("").html_safe
-  %>
-  <div style="height:30px;">
-    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
-  </div>
-<%  } %>
-<% empty_fields = (values.size < 5) ? (5 - values.size) : 0 %>
-<%
-option_tags = options.collect{|option|
-  content_tag :option, option[0], {:value=>option[1]}
-}.join("").html_safe
-%>
-<% empty_fields.times{ %>
-  <div style="height:30px;">
-    <%= select_tag "#{resource_name}[#{subject_habtm_fieldname}][]", option_tags ,{:include_blank=>true} %>
-  </div>
-<% } %>