typus 3.1.0.rc11 → 3.1.0.rc12

data/.gitignore

@@ -1,24 +1,12 @@
-*.gem
+# Bundler stuff
 .bundle
+vendor/gems
 Gemfile.lock
-pkg/*
 
-# Projecte specific ignores
-.bundle
-all.css
-all.js
+# Generated stuff
+*.gem
 db/*.sqlite3
 log/*.log
 test/fixtures/rails_app/public/system/*
 test/fixtures/rails_app/tmp/*
 tmp/**/*
-
-# Ignore generated documentation
-.yardoc
-doc/*.html
-doc/css
-doc/js
-doc/Admin
-doc/Typus
-doc/ActiveRecord
-

data/.gitmodules

@@ -1,6 +1,3 @@
-[submodule "doc/wiki"]
-	path = doc/wiki
-	url = git@github.com:typus/typus.wiki.git
-[submodule "doc/site"]
-	path = doc/site
-	url = git@github.com:typus/site.git
+[submodule "test/fixtures/rails_app"]
+	path = test/fixtures/rails_app
+	url = git@github.com:typus/demo.git

data/README.md

@@ -1,6 +1,18 @@
 # Typus: Admin Panel for Ruby on Rails applications
 
-**Typus** allows trusted users to edit structured content.
+**Typus** is a control panel for [Ruby on Rails][rails] applications to allow
+trusted users edit structured content.
+
+It’s not a CMS with a full working system but it provides a part of the
+system: authentication, permissions and basic look and feel for your
+websites control panel. So using [Rails][rails] with **Typus** lets you
+concentrate on your application instead of the bits to manage the system.
+
+**Typus** is the "old latin" word for **type** which stands for:
+
+> A category of people or things having common characteristics.
+
+You can try a demo [here][demo].
 
 ## Key Features
 
@@ -9,25 +21,18 @@
 - Internationalized interface ([See available translations][locales])
 - Customizable and extensible templates.
 - Integrated [paperclip][paperclip] and [dragonfly][dragonfly] attachments viewer.
-- Works with `Rails 3.0.X`.
+- Works with `Rails 3.1.X`.
 - Tested with latest versions of `1.8.7`, `ree`, `1.9.2` and `jruby`.
 - Tested with `SQLite`, `MySQL` and `PostgreSQL`.
 
-## Links
-
-- [Documentation](https://github.com/typus/typus/wiki)
-- [Issues](https://github.com/typus/typus/issues)
-- [Demo](http://demo.typuscms.com/) ([Code][code])
-- [Source Code](http://github.com/typus/typus)
-- [Mailing List](http://groups.google.com/group/typus)
-- [Gems](http://rubygems.org/gems/typus)
-- [Contributors List](http://github.com/typus/typus/contributors)
-
 ## Installing
 
 Add **Typus** to your `Gemfile`
 
-    gem 'typus', :git => 'git://github.com/typus/typus.git', :branch => '3-1-unstable'
+    gem 'typus', '~> 3.1.0.rc'
+
+    # Bundle edge typus instead:
+    # gem 'typus', :git => 'git://github.com/typus/typus.git', :branch => '3-1-unstable'
 
 Update your bundle, run the generator and start the application server:
 
@@ -37,11 +42,40 @@ Update your bundle, run the generator and start the application server:
 
 and go to <http://0.0.0.0:3000/admin>.
 
-## License
+## Links
+
+- [Documentation](https://github.com/typus/typus/wiki)
+- [Issues](https://github.com/typus/typus/issues)
+- [Source Code](http://github.com/typus/typus) and [RubyGems](http://rubygems.org/gems/typus)
+- [Mailing List](http://groups.google.com/group/typus)
+- [Contributors List](http://github.com/typus/typus/contributors)
+
+## MIT License
+
+    Copyright (c) 2007-2011 Francesc Esplugas Marti
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
-Typus is released under the MIT license.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+[demo]: http://demo.typuscms.com/
 [paperclip]: http://rubygems.org/gems/paperclip
 [dragonfly]: http://rubygems.org/gems/dragonfly
+[rails]: http://rubyonrails.org/
 [code]: https://github.com/typus/typus/tree/master/test/fixtures/rails_app
-[locales]: https://github.com/typus/typus/tree/master/config/locales
+[locales]: https://github.com/typus/typus/tree/master/config/locales

data/Rakefile

@@ -1,23 +1,18 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rubygems'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rdoc/task'
 
 task :default => :test
 
-desc 'Test the typus plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  # t.pattern = 'test/**/*_test.rb'
-  t.pattern = 'test/app/controllers/**/*_test.rb'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/app/controllers/**/*_test.rb',
+                          'test/lib/support/*_test.rb',
+                          'test/config/*_test.rb']
   t.verbose = true
 end
 
-desc 'Generate plugin documentation.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Typus'
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -25,11 +20,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Deploy test/fixtures/rails_app"
-task :deploy do
-  system "cd test/fixtures/rails_app && cap deploy"
-end
-
 RUBIES = %w[1.8.7 ree 1.9.2 jruby].join(",")
 
 namespace :setup do
@@ -54,14 +44,17 @@ namespace :test do
 
 end
 
-require 'yard'
+namespace :demo do
 
-YARD::Rake::YardocTask.new do |t|
-  t.files   = []
-  t.options = []
-end
+  desc "Update demo"
+  task :update do
+    system "git pull && git submodule update --init"
+  end
 
-YARD::Rake::YardocTask.new 'yard:changed' do |t|
-  t.files   = `git status | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
-  t.options = []
-end
+  desc "Upgrade demo"
+  task :upgrade do
+    system "git submodule foreach 'git pull origin master'"
+    system "git ci -m 'Updated submodules' ."
+  end
+
+end

data/app/helpers/admin/resources/data_types/belongs_to_helper.rb

@@ -22,21 +22,19 @@ module Admin::Resources::DataTypes::BelongsToHelper
       message = link_to Typus::I18n.t("Add New"), options, { :class => 'iframe' }
     end
 
-    # Set the template.
-    template = if Typus.autocomplete && (related.respond_to?(:roots) || !(related.count > Typus.autocomplete))
-                 "admin/templates/belongs_to"
-               else
-                 "admin/templates/belongs_to_with_autocomplete"
-               end
+    # By default the used template is ALWAYS `belongs_to` unless we have the
+    # `Typus.autocomplete` feature enabled.
+    template = Typus.autocomplete ? "belongs_to_with_autocomplete" : "belongs_to"
 
-    # Set the values.
-    values = if related.respond_to?(:roots)
-               expand_tree_into_select_field(related.roots, related_fk)
-             elsif Typus.autocomplete && !(related.count > Typus.autocomplete)
-               related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
-             end
+    # If `Typus.autocomplete` is enabled we don't set the values as will be
+    # autocompleted.
+    if related.respond_to?(:roots)
+      values = expand_tree_into_select_field(related.roots, related_fk)
+    elsif !Typus.autocomplete
+      values = related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
+    end
 
-    render template,
+    render "admin/templates/#{template}",
            :association => association,
            :resource => @resource,
            :attribute => attribute,
@@ -53,14 +51,13 @@ module Admin::Resources::DataTypes::BelongsToHelper
   def table_belongs_to_field(attribute, item)
     if att_value = item.send(attribute)
       action = item.send(attribute).class.typus_options_for(:default_action_on_item)
+      message = att_value.to_label
       if admin_user.can?(action, att_value.class.name)
-        link_to att_value.to_label, :controller => "/admin/#{att_value.class.to_resource}", :action => action, :id => att_value.id
-      else
-        att_value.to_label
+        message = link_to(message, :controller => "/admin/#{att_value.class.to_resource}", :action => action, :id => att_value.id)
       end
-    else
-      "—".html_safe
     end
+
+    message || "—".html_safe
   end
 
   def display_belongs_to(item, attribute)

data/app/helpers/admin/resources/data_types/position_helper.rb

@@ -1,22 +1,20 @@
 module Admin::Resources::DataTypes::PositionHelper
 
   def table_position_field(attribute, item, connector = " / ")
-    html_position = []
+    locals = { :html_position => [], :connector => connector, :item => item }
+    positions = { :move_to_top => "Top", :move_higher => "Up", :move_lower => "Down", :move_to_bottom => "Bottom" }
 
-    [ [:move_to_top, "Top"],
-      [:move_higher,  "Up"],
-      [:move_lower,   "Down"],
-      [:move_to_bottom, "Bottom"] ].each do |key, value|
+    positions.each do |key, value|
+      first_item = item.respond_to?(:first?) && ([:move_higher, :move_to_top].include?(key) && item.first?)
+      last_item = item.respond_to?(:last?) &&  ([:move_lower, :move_to_bottom].include?(key) && item.last?)
 
-      options = { :controller => "/admin/#{item.class.to_resource}", :action => "position", :id => item.id, :go => key }
-      should_be_inactive = (item.respond_to?(:first?) && ([:move_higher, :move_to_top].include?(key) && item.first?)) ||
-                           (item.respond_to?(:last?) &&  ([:move_lower, :move_to_bottom].include?(key) && item.last?))
-      html_position << link_to_unless(should_be_inactive, Typus::I18n.t(value), params.merge(options)) do |name|
-        %w(<span class="inactive">#{name}</span>)
+      unless first_item || last_item
+        options = { :controller => "/admin/#{item.class.to_resource}", :action => "position", :id => item.id, :go => key }
+        locals[:html_position] << link_to(Typus::I18n.t(value), params.merge(options))
       end
     end
 
-    "#{item.position}<br/><br/>#{html_position.compact.join(connector)}".html_safe
+    render "admin/templates/position", locals
   end
 
 end

data/app/helpers/admin/resources/form_helper.rb

@@ -46,24 +46,24 @@ module Admin::Resources::FormHelper
     end
   end
 
-  def display_errors
-    render "helpers/admin/resources/errors"
+  def build_save_options
+    save_options_for_user_class || save_options_for_headless_mode || save_options
   end
 
   def save_options
-    if Typus.user_class == @resource && admin_user.is_not_root?
-      options = { "_continue" => "Save and continue editing" }
-    end
-
-    if headless_mode? && params[:resource]
-      options = { "_saveandassign" => "Save and assign" }
-    end
+    { "_addanother" => "Save and add another",
+      "_continue" => "Save and continue editing",
+      "_save" => "Save" }
+  end
 
-    if headless_mode?
-      options = { "_continue" => "Save and continue editing" }
-    end
+  def save_options_for_headless_mode
+    return unless headless_mode?
+    params[:resource] ? { "_saveandassign" => "Save and assign" } : { "_continue" => "Save and continue editing" }
+  end
 
-    options || { "_addanother" => "Save and add another", "_continue" => "Save and continue editing", "_save" => "Save" }
+  def save_options_for_user_class
+    return unless Typus.user_class == @resource && admin_user.is_not_root?
+    { "_continue" => "Save and continue editing" }
   end
 
 end

data/app/helpers/admin/resources/relationships_helper.rb

@@ -33,7 +33,10 @@ module Admin::Resources::RelationshipsHelper
                         :resource_action => 'relate',
                         :return_to => request.path }
 
-    if set_condition && admin_user.can?("create", @model_to_relate)
+    # Add new basically means: We can create new items or relate existing ones.
+    create_or_read = admin_user.can?("create", @model_to_relate) || admin_user.can?("read", @model_to_relate)
+
+    if set_condition && create_or_read
       link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
     end
   end

data/app/helpers/admin/resources/table_helper.rb

@@ -30,15 +30,11 @@ module Admin::Resources::TableHelper
           switch = sort_order.last if params[:order_by].eql?(order_by)
           options = { :order_by => order_by, :sort_order => sort_order.first }
           message = [content, switch].compact.join(" ").html_safe
-          link_to message, params.merge(options)
-        else
-          content
+          content = link_to(message, params.merge(options))
         end
-
-      else
-        content
       end
 
+      content
     end
   end
 
@@ -47,15 +43,16 @@ module Admin::Resources::TableHelper
   end
 
   def table_actions(model, item, association_name = nil)
-    resource_actions.map do |body, url, options, proc|
-      if admin_user.can?(url[:action], model.name)
-        next if proc && proc.respond_to?(:call) && proc.call(item) == false
+    resource_actions.reject! do |body, url, options, proc|
+      admin_user.cannot?(url[:action], model.name)
+    end
 
-        link_to Typus::I18n.t(body),
-                params.dup.cleanup.merge(url).merge(:controller => "/admin/#{model.to_resource}", :id => item.id),
-                options
-      end
-    end.compact.join(" / ").html_safe
+    resource_actions.map do |body, url, options, proc|
+      next if proc && proc.respond_to?(:call) && proc.call(item) == false
+      { :message => Typus::I18n.t(body),
+        :url => params.dup.cleanup.merge(url).merge(:controller => "/admin/#{model.to_resource}", :id => item.id),
+        :options => options }
+    end
   end
 
 end

data/app/helpers/admin/resources_helper.rb

@@ -15,15 +15,24 @@ module Admin::ResourcesHelper
     resources = ActiveSupport::OrderedHash.new
     app_name = @resource.typus_application
 
-    admin_user.application(app_name) { |a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human }.each do |resource|
+    admin_user.application(app_name).each do |resource|
       klass = resource.typus_constantize
-      resources[resource] = [ link_to_unless_current(Typus::I18n.t("All #{klass.model_name.human.pluralize}"), :action => "index") ]
-      resources[resource] << link_to_unless_current(Typus::I18n.t("Add New"), :action => "new") if admin_user.can?("create", klass)
+      resources[resource] = [sidebar_all_resource(klass), sidebar_add_new(klass)].compact
     end
 
     render "helpers/admin/resources/sidebar", :resources => resources
   end
 
+  def sidebar_add_new(klass)
+    if admin_user.can?("create", klass)
+      { :message => Typus::I18n.t("Add New"), :url => { :action => "new" } }
+    end
+  end
+
+  def sidebar_all_resource(klass)
+    { :message => Typus::I18n.t("All #{klass.model_name.human.pluralize}"), :url => { :action => "index" } }
+  end
+
   # TODO: This method should be moved to `lib/typus/controller/actions.rb`
   def resource_actions
     @resource_actions ||= []

data/app/themes/default/assets/javascripts/typus/jquery.application.js

@@ -31,12 +31,6 @@ $(document).ready(function() {
         $('.action-toggle').each(function() { this.checked = status; });
     });
 
-    // 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/themes/default/assets/stylesheets/typus/pagination.css

@@ -13,5 +13,4 @@
 
 .pagination .first,
 .pagination .last,
-.pagination .current,
-.pagination .gap { display: none; }
+.pagination .current { display: none; }

data/app/themes/default/views/admin/base/user_guide.html.erb

@@ -10,19 +10,23 @@
 
 <% end %>
 
+<%
+  rails = "http://rubyonrails.org/"
+  typus = "http://core.typuscms.com/"
+%>
+
 <a name="introduction"></a>
 
 <h2>Introduction</h2>
 
-<p>
-This website is powered by <%= link_to "Ruby on Rails", "http://rubyonrails.org/" %> and <%= link_to "Typus", "http://core.typuscms.com/" %>.
-</p>
+<p>This website is powered by <%= link_to "Ruby on Rails", rails %> and
+<%= link_to "Typus", typus %>.</p>
 
-<p>With <%= link_to "Typus", "http://core.typuscms.com/" %>, also known as the application backend or admin interface, you'll be able to update your application contents and perform the most common operations for the site maintenance.</p>
+<p>With <%= link_to "Typus", typus %>, also known as the application backend
+or admin interface, you'll be able to update your application contents and
+perform the most common operations for the site maintenance.</p>
 
-<p>
-You can get more information at <%= link_to "http://core.typuscms.com/", "http://core.typuscms.com/" %>.
-</p>
+<p>You can get more information at <%= link_to typus, typus %>.</p>
 
 <a name="basics"></a>
 
@@ -30,22 +34,18 @@ You can get more information at <%= link_to "http://core.typuscms.com/", "http:/
 
 <h3>Create Entries</h3>
 
-<p>
-To create a new entry:
-</p>
+<p>To create a new entry:</p>
 
 <ul>
-<li>Click on entries tab.</li>
-<li>Click "Add New" sub tab.</li>
-<li>Start filling in the blanks.</li>
-<li>When you are ready, click "Save Entry".</li>
+  <li>Click on entries tab.</li>
+  <li>Click "Add New" sub tab.</li>
+  <li>Start filling in the blanks.</li>
+  <li>When you are ready, click "Save Entry".</li>
 </ul>
 
 <h3>Editing &amp; Updating Entries</h3>
 
-<p>
-To edit entries:
-</p>
+<p>To edit entries:</p>
 
 <ul>
   <li>Click on entries tab.</li>
@@ -57,9 +57,7 @@ To edit entries:
 
 <h3>Removing Entries</h3>
 
-<p>
-To remove entries:
-</p>
+<p>To remove entries:</p>
 
 <ul>
   <li>Click on entries tab.</li>
@@ -68,18 +66,18 @@ To remove entries:
   <li>Click "Ok" on the dialog to confirm you want to remove the entry.</li>
 </ul>
 
-<p>
-Removing entries will be only available if you have permissions to do so.
-</p>
+<p>Removing entries will be only available if you have permissions to do so.</p>
 
 <a name="registered-users"></a>
 
 <h2>Registered Users</h2>
 
-<p>
-Registered users can do a variety of different things on a <strong>Typus</strong> driven site. The various elements available to the user are determined by their user level. </p>
+<p>Registered users can do a variety of different things on a <strong>Typus</strong>
+driven site. The various elements available to the user are determined by their
+user level.</p>
 
-<p>When <code>:session</code> authentication is enabled <strong>Typus</strong> will enable a a default role which will allow registered users perform all kind of operations on entries: create, read, update and destroy.
-</p>
+<p>When <code>:session</code> authentication is enabled <strong>Typus</strong>
+will enable a a default role which will allow registered users perform all kind
+of operations on entries: create, read, update and destroy.</p>
 
 <p>It's usually recommended having an extra role which some restrictions.</p>