typus 3.0.12 → 3.1.0.rc1

data/Gemfile

@@ -1,18 +1,20 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.0.rc1'
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'sqlite3'
+gem 'jquery-rails'
 
 # Specify your gem's dependencies in typus.gemspec
 gemspec
 
-# Yes, some dependencies are in typus.gemspec, but it's a little bit difficult
-# to mantain the above code there. I'll keep here for the moment ...
-
+# And this stuff needed for the demo application.
 gem 'acts_as_list'
 gem 'acts_as_tree'
 gem 'dragonfly', '~> 0.9'
 gem 'factory_girl'
 gem 'paperclip'
 gem 'rack-cache', :require => 'rack/cache'
-gem 'rails', '~> 3.0'
 
 group :test do
   gem 'shoulda-context'
@@ -32,25 +34,16 @@ group :development, :test do
   end
 
   platforms :ruby do
-    gem 'mysql2', '0.2.7'
+    gem 'mysql2'
     gem 'pg'
     gem 'sqlite3'
   end
 
 end
 
-# MongoDB support is still in "beta" mode, so I'm not testing it for the moment.
 group :production do
 
-  gem 'mongoid'
-
-  platforms :ruby do
-    gem 'bson_ext'
-  end
-
-end
-
-group :production do
+  # gem 'mongoid'
 
   platforms :jruby do
     gem 'activerecord-jdbc-adapter'
@@ -58,6 +51,7 @@ group :production do
   end
 
   platforms :ruby do
+    # gem 'bson_ext'
     gem 'sqlite3'
   end
 

data/README.md

@@ -15,22 +15,19 @@
 
 ## Links
 
-- [Documentation](https://github.com/typus/typus/wiki)
-- [Issues](https://github.com/typus/typus/issues)
+- [Documentation](https://github.com/fesplugas/typus/wiki)
+- [Issues](https://github.com/fesplugas/typus/issues)
 - [Demo](http://demo.typuscms.com/) ([Code][code])
-- [Source Code](http://github.com/typus/typus)
+- [Source Code](http://github.com/fesplugas/typus)
 - [Mailing List](http://groups.google.com/group/typus)
 - [Gems](http://rubygems.org/gems/typus)
-- [Contributors List](http://github.com/typus/typus/contributors)
+- [Contributors List](http://github.com/fesplugas/typus/contributors)
 
 ## Installing
 
 Add **Typus** to your `Gemfile`
 
-    gem "typus", "~> 3.0.11"
-
-    # Bundle edge typus instead:
-    # gem "typus", :git => "git://github.com/typus/typus.git", :branch => "3-0-stable"
+    gem 'typus', :git => 'git://github.com/fesplugas/typus.git', :branch => '3-1-unstable'
 
 Update your bundle, run the generator and start the application server:
 
@@ -46,5 +43,5 @@ Typus is released under the MIT license.
 
 [paperclip]: http://rubygems.org/gems/paperclip
 [dragonfly]: http://rubygems.org/gems/dragonfly
-[code]: https://github.com/typus/typus/tree/master/test/fixtures/rails_app
-[locales]: https://github.com/typus/typus/tree/master/config/locales
+[code]: https://github.com/fesplugas/typus/tree/master/test/fixtures/rails_app
+[locales]: https://github.com/fesplugas/typus/tree/master/config/locales

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

@@ -0,0 +1,7 @@
+//= require jquery
+//= require jquery_ujs
+//= require_tree ../../vendor
+//= require typus/jquery.application
+//= require typus/jquery.rails.autocomplete
+//= require typus/jquery.searchField
+//= require typus/custom

data/app/assets/{vendor/typus/javascripts → javascripts/typus}/jquery.application.js

@@ -6,7 +6,9 @@ $(document).ready(function() {
 
   $("a.fancybox").fancybox({
     'titlePosition': 'over',
-    'type': 'image'
+    'type': 'image',
+    'centerOnScroll': true,
+    'scrolling': false,
   });
 
   $(".iframe").fancybox({
@@ -15,15 +17,11 @@ $(document).ready(function() {
     'autoScale': false,
     'transitionIn': 'none',
     'transitionOut': 'none',
-    'type': 'iframe'
+    'type': 'iframe',
+    'centerOnScroll': true,
+    'scrolling': false,
   });
 
-  // This method is used by `text_with_ckeditor` template.
-  if ($('textarea.ckeditor').length > 0) {
-      var data = $('textarea');
-      $.each(data, function(i) { CKEDITOR.replace(data[i].id); });
-  }
-
 });
 
 function setConfirmUnload(on) {

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

@@ -0,0 +1,7 @@
+/*
+*= require typus/reset
+*= require typus/screen
+*= require typus/pagination
+*= require_tree ../../vendor
+*= require typus/custom
+*/

data/app/assets/stylesheets/typus/pagination.css

@@ -0,0 +1,17 @@
+.pagination { border-top: 1px solid #D3D3D3; margin: 1.5em auto; padding: 1em 0; text-align: center;}
+
+.pagination em { font-style: normal!important; }
+.pagination em,
+.pagination a { padding: 3px 5px; text-decoration: none; }
+.pagination a:hover,
+.pagination em { background: #000; color: #FFF; }
+
+.pagination span.disabled { color: #D3D3D3; margin: 2px; padding: 2px 3px; }
+
+.pagination .prev { float: left; }
+.pagination .next { float: right; }
+
+.pagination .first,
+.pagination .last,
+.pagination .current,
+.pagination .gap { display: none; }

data/app/assets/{vendor/typus/stylesheets → stylesheets/typus}/screen.css

@@ -69,6 +69,7 @@ a:hover { color: #333; text-decoration: underline!important; }
 #header_wrapper #links .left ul { display: block; }
 #header_wrapper #links .left ul li { display: inline; padding: 0 0.5em 0 0; }
 #header_wrapper #links .left ul li a {
+  -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   background: #242527;
   padding: 3px 5px;
@@ -181,11 +182,7 @@ fieldset.inputs { }
     /* background: #FFFCE1; */
   }
 
-  fieldset.inputs textarea {
-    font-size: 1.2em;
-    padding: 3px;
-    width: 691px;
-  }
+  fieldset.inputs textarea { font-size: 1.2em; padding: 3px; width: 691px; }
 
   fieldset.inputs select { border: 1px solid #999; font-size: 1.20em; }
 
@@ -239,28 +236,6 @@ fieldset.buttons { }
 
 /* @end */
 
-/* @group Pagination */
-
-.pagination {
-  border-top: 1px solid #D3D3D3;
-  margin: 1.5em auto;
-  padding: 1em 0;
-  text-align: center;
-}
-
-.pagination em { font-style: normal!important; }
-.pagination em,
-.pagination a { padding: 3px 5px; text-decoration: none; }
-.pagination a:hover,
-.pagination em { background: #000; color: #FFF; }
-
-.pagination span.disabled { color: #D3D3D3; margin: 2px; padding: 2px 3px; }
-
-.pagination .previous_page { float: left; }
-.pagination .next_page { float: right; }
-
-/* @end */
-
 /* @group Rails errors and flashes */
 
 #errorExplanation,

data/app/controllers/admin/base_controller.rb

@@ -1,7 +1,5 @@
 class Admin::BaseController < ActionController::Base
 
-  render_inheritable
-
   include Typus::Authentication::const_get(Typus.authentication.to_s.classify)
 
   before_filter :set_models_constantized
@@ -25,7 +23,11 @@ class Admin::BaseController < ActionController::Base
   end
 
   def set_locale
-    I18n.locale = admin_user.locale if admin_user.respond_to?(:locale)
+    I18n.locale = if admin_user && admin_user.respond_to?(:locale)
+                    admin_user.locale
+                  else
+                    Typus::I18n.default_locale
+                  end
   end
 
   def zero_users

data/app/controllers/admin/resources_controller.rb

@@ -30,7 +30,8 @@ class Admin::ResourcesController < Admin::BaseController
         add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
         generate_html
       end
-      @resource.typus_export_formats.each { |f| format.send(f) { send("generate_#{f}") } }
+
+      %w(json xml csv).each { |f| format.send(f) { send("generate_#{f}") } }
     end
   end
 
@@ -75,9 +76,9 @@ class Admin::ResourcesController < Admin::BaseController
     check_resource_ownership if @resource.typus_options_for(:only_user_items)
 
 =begin
-    # FIXME
     respond_to do |format|
       format.html # show.html.erb
+      format.xml { render :xml => @item }
       format.json { render :json => @item }
     end
 =end
@@ -131,11 +132,6 @@ class Admin::ResourcesController < Admin::BaseController
     @object_name = ActiveModel::Naming.singular(@resource)
   end
 
-  def resource
-    params[:controller].extract_class
-  end
-  helper_method :resource
-
   def set_context
     @resource
   end

data/app/controllers/admin/session_controller.rb

@@ -36,11 +36,8 @@ class Admin::SessionController < Admin::BaseController
   end
 
   def user_scope
-    if Typus.user_class.scopes.include?(:in_domain)
-      Typus.user_class.in_domain(request.host)
-    else
-      Typus.user_class
-    end
+    klass = Typus.user_class
+    klass.respond_to?(:in_domain) ? klass.in_domain(request.host) : klass
   end
 
 end

data/app/helpers/admin/base_helper.rb

@@ -33,7 +33,7 @@ module Admin
     end
 
     def display_flash_message(message = flash)
-      if message.compact.any?
+      if message.keys.any?
         render "admin/helpers/base/flash_message",
                :flash_type => message.keys.first,
                :message => message

data/app/helpers/admin/display_helper.rb

@@ -46,8 +46,6 @@ module Admin
     alias_method :display_position, :display_string
     alias_method :display_integer, :display_string
     alias_method :display_decimal, :display_string
-    alias_method :display_float, :display_string
-    alias_method :display_date, :display_datetime
 
   end
 end