lolita 3.0.3 → 3.0.4

data/Gemfile

@@ -1,24 +1,24 @@
-source "http://rubygems.org"
-
-# Thing how to seperate gems for Rails Enginge from those that are only for lolita
-gem "rails", "~>3.0"
-gem "will_paginate", "~> 3.0.pre2"
-gem "abstract"
-
-group :mongoid do
-  gem "mongo"
-  gem "mongoid", "~> 2.0.0.rc.7"
-  gem "bson_ext"
-end
-
-#gem 'cover_me', '>= 1.0.0.rc6', :group => :test
- gem "jeweler", "~> 1.5.2", :group=>:development
-group :test,:development do
-  gem "rspec", ">=2.2.0"
-  gem "rspec-rails"
-  gem "factory_girl"
-  gem 'ffaker' 
- # gem "rspec-cells"
-  #gem "sqlite3-ruby"
-  gem "ruby-debug19"
-end
+source "http://rubygems.org"
+
+# Thing how to seperate gems for Rails Enginge from those that are only for lolita
+gem "rails", "~>3.0"
+gem "will_paginate", "~> 3.0.pre2"
+gem "abstract"
+
+group :mongoid do
+  gem "mongo"
+  gem "mongoid", "~> 2.0.0.rc.7"
+  gem "bson_ext"
+end
+
+#gem 'cover_me', '>= 1.0.0.rc6', :group => :test
+ gem "jeweler", "~> 1.5.2", :group=>:development
+group :test,:development do
+  gem "rspec", ">=2.2.0"
+  gem "rspec-rails"
+  gem "factory_girl"
+  gem 'ffaker' 
+ # gem "rspec-cells"
+  #gem "sqlite3-ruby"
+  gem "ruby-debug19"
+end

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

data/app/controllers/lolita/rest_controller.rb

@@ -51,16 +51,18 @@ class Lolita::RestController < ApplicationController
 
   def show_form
     build_response_for(:tabs)
-    render :form
+    if request.xhr?
+      render :form, :layout => false
+    else
+      render :form
+    end
   end
   
   def save_and_redirect
     if self.resource.save
-      unless self.resource.errors.empty?
-        show_form
-      else
-        to_list
-      end
+      show_form
+    else
+      show_form #to_list
     end
   end
   

data/app/views/components/lolita/field/_text.html.erb

@@ -1,2 +1,25 @@
-<%= text_area resource_name, field.name %>
+<% content_for :script do %>
+  <%= javascript_include_tag "tinymce/jquery.tinymce" %>
+  <script>
+    function load_tinymce(){
+      $("textarea").tinymce({
+        script_url: "/javascripts/tinymce/tiny_mce.js",
+        theme: "advanced",
+        skin: "cirkuit",
+        mode: "textareas",
+        theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image",
+        theme_advanced_buttons2 : "",
+        theme_advanced_buttons3 : "",
+        theme_advanced_toolbar_location: "top",
+        theme_advanced_toolbar_align: "left",
+        // theme_advanced_statusbar_location : "bottom",
+        theme_advanced_resizing: true
+      });
+    }
+    $(function(){
+      load_tinymce(); 
+    })
+  </script>
+<% end %>
 
+<%= text_area resource_name, field.name %>

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

@@ -1,7 +1,9 @@
 <header>
   <h1>Lolita</h1>
-  <nav>
-    <a href="<%=send(:"edit_#{current_user.class.to_s.downcase}_password_path")%>" class="username"><%=current_user.email%></a>
-    <a href="<%=send(:"destroy_#{current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=I18n.t("lolita.shared.log_out")%></a>
-  </nav>
+  <% if lolita_current_user %>
+	  <nav>
+	    <a href="<%=send(:"edit_#{lolita_current_user.class.to_s.downcase}_password_path")%>" class="username"><%=lolita_current_user.email%></a>
+	    <a href="<%=send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=I18n.t("lolita.shared.log_out")%></a>
+	  </nav>
+  <% end %>
 </header>

data/app/views/components/lolita/tabs/_display.html.erb

@@ -1,32 +1,19 @@
 <% content_for :content_class do "with-secondary" end %>
 
-<% content_for :script do %>
-  <%= javascript_include_tag "tinymce/jquery.tinymce" %>
-  <script>
-    $(function(){
-      $("textarea").tinymce({
-        script_url: "/javascripts/tinymce/tiny_mce.js",
-        theme: "advanced",
-        skin: "cirkuit",
-        theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect",
-        theme_advanced_buttons2 : "",
-        theme_advanced_buttons3 : "",
-        theme_advanced_toolbar_location: "top",
-        theme_advanced_toolbar_align: "left",        
-        // theme_advanced_statusbar_location : "bottom",
-        theme_advanced_resizing: true
-      });
-    })
-  </script>
-<% end %>
+<%#= flash %>
 
-<div class="secondary">
+<div class="secondary"> <%#= right sidebar %>
   <div class="box">
     <div class="boxtitle black">
-      <h1><%= t "save" %></h1>
+      <h1><%= t "lolita.tabs.save" %></h1>
       <div class="arrow"></div>
     </div>
-    <button class="save-all"><%=I18n.t("lolita.tabs.save_all")%></button>
+    <div class="save black">
+      <div class="last-save">
+        <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.updated_at %>
+      </div>
+      <button class="save-all"><%=I18n.t("lolita.tabs.save")%></button>
+    </div>
   </div>
 </div>
 

data/config/locales/en.yml

@@ -1,9 +1,11 @@
-en:
-  lolita:
-    shared:
-      log_out: Log out
-    tabs:
-      save_all: Save all
-    list:
-      add_new: Add new %{name}
+en:
+  lolita:
+    shared:
+      log_out: Log out
+    tabs:
+      last_save: Last saved
+      save: Save
+      save_all: Save all
+    list:
+      add_new: Add new %{name}
       confirm: Are you sure you want to delete record?

data/lib/lolita.rb

@@ -4,6 +4,7 @@ $:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
 
 require 'abstract' #FIXME remove from gem
 require 'active_support/core_ext/numeric/time'
+require 'active_support/concern'
 require 'active_support/callbacks'
 require 'active_support/dependencies'
 require 'lolita/errors'
@@ -46,12 +47,18 @@ module Lolita
     autoload :Tab, 'lolita/configuration/tab'
     autoload :Tabs, 'lolita/configuration/tabs'
 
+     Dir["#{File.dirname(__FILE__)}/lolita/configuration/tab/**/*.*"].each do |path|
+        base_name=File.basename(path,".rb")
+        autoload :"#{base_name.capitalize}Tab", "lolita/configuration/tab/#{base_name}"
+     end
+
     module FieldExtensions
       Dir["#{File.dirname(__FILE__)}/lolita/configuration/field_extensions/**/*.*"].each do |path|
         base_name=File.basename(path,".rb")
         autoload base_name.capitalize.to_sym, "lolita/configuration/field_extensions/#{base_name}"
       end
     end
+
     
     def self.included(base)
       base.class_eval do
@@ -81,6 +88,7 @@ module Lolita
     autoload :UserHelpers, 'lolita/controllers/user_helpers'
     autoload :UrlHelpers, 'lolita/controllers/url_helpers'
     autoload :ComponentHelpers, 'lolita/controllers/component_helpers'
+    autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
   end
 
   @@scopes={}
@@ -122,4 +130,5 @@ if defined?(Rails)
 end
 
 puts "Lolita engine started in #{Time.at(Time.now-engine_time).strftime("%M:%S.%3N")}"
+
 puts "Lolita started in #{Time.at(Time.now-main_time).strftime("%M:%S.%3N")}"

data/lib/lolita/configuration/base.rb

@@ -60,7 +60,7 @@ module Lolita
       # Tabs should not be defined in lolita block to create onew or more Lolita::Configuration::Tab
       # See Lolita::Configuration::Tab for details of defination.
       def tab *args, &block
-        self.tabs<<Lolita::Configuration::Tab.new(@dbi,*args,&block)
+        self.tabs<<Lolita::Configuration::Tab.add(@dbi,*args,&block)
       end
       
       # Call all supported instance metods to set needed variables and initialize object with them.

data/lib/lolita/configuration/tab.rb

@@ -15,9 +15,29 @@ module Lolita
     # To define tab in ORM model, through lolita configuration do the following
     # ====Example
     #     lolita do
-    #       tab
+    #       tab(:files)
+    #     end
     class Tab
 
+      class << self
+      
+        def add(dbi,*args,&block)
+          type=args.first if args
+          unless type
+            temp_tab=self.new(dbi,*args,&block).type 
+            type=temp_tab.type
+          end
+          unless type==:default
+            begin
+              "Lolita::Configuration::#{type.to_s.camelize}Tab".constantize.new(dbi,*args,&block)
+            rescue NameError
+              raise Lolita::TabNotFoundError, "Lolita::Configuration::#{type.to_s.camelize}Tab not found. Add it in /lolita/configuration/tab/#{type}.rb"
+            end
+          else
+            temp
+          end
+        end
+      end
       # For different types there are different builders(cells)
       @@available_types=[:content]
    
@@ -39,6 +59,7 @@ module Lolita
         validate
       end
 
+    
       # Field setter method, accpet <i>*args</i> and <i>&block</i> to be passed.
       # For details how to pass args and block see Lolita::Configuration::Field.
       # Return field itself.
@@ -150,9 +171,7 @@ module Lolita
       private
 
       def set_default_fields
-        if @type==:content && @fields.empty?
-          default_fields
-        end
+        default_fields if @type!=:default && @fields.empty?
       end
 
       def set_default_attributes

data/lib/lolita/configuration/tab/content.rb

@@ -0,0 +1,15 @@
+module Lolita
+  module Configuration
+  	class ContentTab < Lolita::Configuration::Tab
+
+  	  def initialize(dbi,*args,&block)
+        @type=:content
+  	  	super
+  	  	set_default_fields
+  	  end
+
+  	  private 
+
+  	end
+  end
+end

data/lib/lolita/configuration/tabs.rb

@@ -35,7 +35,7 @@ module Lolita
       end
 
       def tab *args,&block
-        self<<Lolita::Configuration::Tab.new(@dbi,*args,&block)
+        self<<Lolita::Configuration::Tab.add(@dbi,*args,&block)
       end
 
       def exclude=(values)

data/lib/lolita/controllers/view_user_helpers.rb

@@ -0,0 +1,13 @@
+module Lolita
+  module Controllers
+    module ViewUserHelpers
+    	 def lolita_current_user
+	        if self.respond_to?(:"current_#{Lolita.user_classes.first.to_s.downcase}")
+	          send(:"current_#{Lolita.user_classes.first.to_s.downcase}")
+	        else
+	          false
+	        end
+         end
+    end
+  end
+end

data/lib/lolita/errors.rb

@@ -7,4 +7,5 @@ module Lolita
   class FieldTypeError < ArgumentError; end
   class ModuleNotFound < ArgumentError; end
   class NotFound < ArgumentError; end
+  class TabNotFoundError < NameError; end
 end

data/lib/lolita/modules/rest.rb

@@ -6,4 +6,5 @@ module ActionDispatch::Routing
         :controller=>controllers[:rest],:module=>mapping.module
     end
   end
-end
+end
+

data/lib/lolita/rails.rb

@@ -1,10 +1,12 @@
 require 'lolita/rails/routes'
 
 ActiveSupport.on_load(:action_controller) {
+	include Lolita::Controllers::ViewUserHelpers
 	include Lolita::Controllers::UrlHelpers
 	include Lolita::Controllers::ComponentHelpers
 }
 ActiveSupport.on_load(:action_view) {
+	include Lolita::Controllers::ViewUserHelpers
 	include Lolita::Controllers::UrlHelpers
 	include Lolita::Controllers::ComponentHelpers
 }

data/lolita.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.0.3"
+  s.version = "3.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
@@ -86,11 +86,13 @@ Gem::Specification.new do |s|
     "lib/lolita/configuration/list.rb",
     "lib/lolita/configuration/page.rb",
     "lib/lolita/configuration/tab.rb",
+    "lib/lolita/configuration/tab/content.rb",
     "lib/lolita/configuration/tabs.rb",
     "lib/lolita/controllers/component_helpers.rb",
     "lib/lolita/controllers/internal_helpers.rb",
     "lib/lolita/controllers/url_helpers.rb",
     "lib/lolita/controllers/user_helpers.rb",
+    "lib/lolita/controllers/view_user_helpers.rb",
     "lib/lolita/dbi/base.rb",
     "lib/lolita/errors.rb",
     "lib/lolita/hooks/base.rb",

data/public/javascripts/lolita/tab.js

@@ -1,37 +1,38 @@
-$(function(){
-    // Send ajax request with all forms data for given tabs block.
-    function save_tab(tabs){
-        var data=""
-        tabs.find("form").each(function(){
-            data=data+$(this).serialize()
-        })
-        alert(data)
-        $.ajax({
-            url:tabs.attr("data-tabs-url"),
-            dataType:"html",
-            type:tabs.attr("data-method"),
-            data:data,
-            success:function(data){
-                $("#right-side").html(data)
-            }
-        })
-    }
-    // Submit all forms through Ajax when Save All button clicked.
-    $("button.save-all").live('click',function(){
-        //var tab=$(this).parents("div[data-tabs-url]")
-        var tab = $("#content").children("div[data-tabs-url]")
-        save_tab(tab)
-    })
-    // All tabs are closable when clicked on tab title.
-    $(".tab .tab-title").live('click',function(){
-        var tab_title=$(this)
-        var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
-        if(closed){
-            tab_title.parents(".tab").find(".tab-content").show("fast")
-        }else{
-            tab_title.parents(".tab").find(".tab-content").hide("fast")
-        }
-        tab_title.data("closed",!closed)
-    })
-})
-
+$(function(){
+    // Send ajax request with all forms data for given tabs block.
+    function save_tab(tabs){
+        var data=""
+        tabs.find("form").each(function(){
+            data=data+$(this).serialize()
+        })
+        //alert(data)
+        $.ajax({
+            url:tabs.attr("data-tabs-url"),
+            dataType:"html",
+            type:tabs.attr("data-method"),
+            data:data,
+            success:function(data){
+                $("#content").html(data);
+                load_tinymce();
+            }
+        })
+    }
+    // Submit all forms through Ajax when Save All button clicked.
+    $("button.save-all").live('click',function(){
+        //var tab=$(this).parents("div[data-tabs-url]")
+        var tab = $("#content").children("div[data-tabs-url]")
+        save_tab(tab)
+    })
+    // All tabs are closable when clicked on tab title.
+    $(".tab .tab-title").live('click',function(){
+        var tab_title=$(this)
+        var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
+        if(closed){
+            tab_title.parents(".tab").find(".tab-content").show("fast")
+        }else{
+            tab_title.parents(".tab").find(".tab-content").hide("fast")
+        }
+        tab_title.data("closed",!closed)
+    })
+})
+