typus 3.1.0.rc11 → 3.1.0.rc12

data/app/themes/default/views/admin/dashboard/_applications.html.erb

@@ -8,20 +8,12 @@
       </tr>
     </thead>
 
-    <% admin_user.application(app).each do |model| %>
-
-      <%
-        klass = model.typus_constantize
-        klass_human_name = klass.model_name.human.pluralize
-        admin_items_path = { :controller => "/admin/#{klass.to_resource}" }
-      %>
-
+    <% admin_user.application(app).map { |i| i.typus_constantize }.each do |klass| %>
       <tr class="<%= cycle("even", "odd") %>">
         <td>
-          <%= link_to klass_human_name, admin_items_path %>
+          <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>
         </td>
       </tr>
-
     <% end %>
 
   </table>

data/app/themes/default/views/admin/dashboard/_sidebar.html.erb

@@ -1,5 +1,12 @@
 <h2>Welcome!</h2>
 
-<p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus' %> or use the provided <%= link_to "user guide", admin_user_guide_path %>.</p>
+<%
+  mailing_list = link_to('mailing list', 'http://groups.google.com/group/typus')
+  user_guide = link_to('user guide', admin_user_guide_path)
+%>
 
-<p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>
+<p>If you need help don't hesitate in joining the <%= mailing_list %> or use
+the provided <%= user_guide %>.</p>
+
+<p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code>
+on the <code>app/views/admin/dashboard</code> folder.</p>

data/app/themes/default/views/admin/dashboard/styles.html.erb

@@ -30,27 +30,22 @@
 
 <h2>Header (h2) <small>Small <a href="#">link</a></small></h2>
 
-<p>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
 tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
 consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
 cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-</p>
+non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 
 <blockquote>
-  <p>
-  Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+  <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-  consequat.
-  </p>
-  <p>
-  Duis aute irure dolor in reprehenderit in voluptate velit esse
-  cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-  non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-  </p>
+  consequat.</p>
+
+  <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+  dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+  proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 </blockquote>
 
 <pre>
@@ -138,8 +133,8 @@ consequat.
 
 <div class="filters">
   <ul>
-  <li>Filter</li>
-  <li>Filter</li>
+    <li>Filter</li>
+    <li>Filter</li>
   </ul>
 </div>
 

data/app/themes/default/views/admin/resources/_form.html.erb

@@ -1,6 +1,8 @@
+<%= render "form_javascripts" %>
+
 <%= form_for @item, :url => options, :html => { :class => "resource", :multipart => true } do |form| %>
 
-  <%= display_errors %>
+  <%= render "helpers/admin/resources/errors" %>
 
   <fieldset class="inputs">
     <ol>
@@ -10,7 +12,7 @@
 
   <fieldset class="buttons">
     <ol>
-      <% save_options.each do |key, value| %>
+      <% build_save_options.each do |key, value| %>
         <li><%= submit_tag Typus::I18n.t(value), :name => key, :onclick => "setConfirmUnload(false);", :disable_with => Typus::I18n.t(value) %></li>
       <% end %>
     </ol>

data/app/themes/default/views/admin/templates/README.md

@@ -0,0 +1,5 @@
+Some snippets to use in the future:
+
+    <input type="hidden"
+           id="pageListJSON"
+           value="[<%= Page.all.map { |p| "['#{p.to_label}', '/pages/#{p.respond?(:permalink) p.permalink : p.id}']" }.join(", ") %>]">

data/app/themes/default/views/admin/templates/_dragonfly.html.erb

@@ -1,5 +1,6 @@
 <li id="<%= attribute %>">
   <%= form.label attribute, link_to_detach_attribute_for_dragonfly(attribute) %>
   <%= form.file_field attribute, options %>
+  <%= form.hidden_field "retained_#{attribute}" %>
   <%= typus_dragonfly_preview(@item, attribute) %>
 </li>

data/app/themes/default/views/admin/templates/_has_one.html.erb

@@ -1,7 +1,7 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= association_name.humanize %>
+    <%= association_name.titleize.humanize %>
     <small><%= add_new %></small>
   </h2>
 

data/app/themes/default/views/admin/templates/_position.html.erb

@@ -0,0 +1,5 @@
+<%= item.position %>
+
+<div class="actions">
+  <%= html_position.join(connector).html_safe %>
+</div>

data/app/themes/default/views/admin/templates/_profile_sidebar.html.erb

@@ -1,3 +1,4 @@
 <h2>Profile</h2>
 
-<p>Replace this sidebar dropping a file named <code>_profile_sidebar.html.erb</code> on <code>app/views/admin/templates</code> folder.</p>
+<p>Replace this sidebar dropping a file named <code>_profile_sidebar.html.erb</code>
+on <code>app/views/admin/templates</code> folder.</p>

data/app/themes/default/views/admin/templates/_selector.html.erb

@@ -1,4 +1,7 @@
 <%
+  custom = { :include_blank => true }
+  options.merge!(custom)
+
   if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
     html_options.merge!(:disabled => 'disabled')
     message = Typus::I18n.t("Read only")
@@ -7,5 +10,5 @@
 
 <li id="<%= attribute %>">
   <%= form.label attribute, "#{label_text} <small>#{message}</small>".html_safe %>
-  <%= form.select attribute, @resource.send(attribute), options.merge!(:include_blank => true), html_options %>
+  <%= form.select attribute, @resource.send(attribute), options, html_options %>
 </li>

data/app/themes/default/views/admin/templates/_text_with_ckeditor.html.erb

@@ -7,10 +7,6 @@
   options = options.merge!(custom)
 %>
 
-<input type="hidden"
-       id="pageListJSON"
-       value="[<%= Page.all.map { |p| "['#{p.to_label}', '/pages/#{p.respond?(:permalink) p.permalink : p.id}']" }.join(", ") %>]">
-
 <li id="<%= attribute %>">
   <%= form.label attribute, label_text %>
   <%= form.text_area attribute, options %>

data/app/themes/default/views/helpers/admin/resources/_filters.html.erb

@@ -10,9 +10,7 @@
         <%= hidden_field_tag key, value %>
       <% end %>
 
-      <li><%= submit_tag Typus::I18n.t("Filter"),
-                         :name => nil,
-                         :disable_with => Typus::I18n.t("Sending data ...") %></li>
+      <li><%= submit_tag Typus::I18n.t("Filter"), :name => nil, :disable_with => Typus::I18n.t("Sending data ...") %></li>
     </ul>
   </div>
 

data/app/themes/default/views/helpers/admin/resources/_sidebar.html.erb

@@ -1,18 +1,15 @@
-<% resources.each do |key, value| %>
+<% resources.each do |resource, actions| %>
 
-  <%
-    klass = key.typus_constantize
-    resource = "/admin/#{klass.to_resource}"
-  %>
+  <% klass = resource.typus_constantize %>
 
-  <%= link_to :controller => resource, :action => "index" do %>
+  <%= link_to :controller => "/admin/#{klass.to_resource}" do %>
     <h3><%= klass.model_name.human.pluralize %></h3>
   <% end %>
 
-  <% if @resource.model_name.eql?(key) %>
+  <% if @resource.model_name.eql?(resource) %>
     <ul>
-      <% value.each do |v| %>
-        <li><%= v %></li>
+      <% actions.each do |action| %>
+        <li><%= link_to action[:message], action[:url] %></li>
       <% end %>
     </ul>
   <% end %>

data/app/themes/default/views/helpers/admin/resources/_table.html.erb

@@ -1,5 +1,4 @@
-<table>
-
+<% content_for :table_headers do %>
   <thead>
     <tr>
       <% if controller.respond_to?(:bulk) %>
@@ -10,6 +9,11 @@
       <% end %>
     </tr>
   </thead>
+<% end %>
+
+<table>
+
+  <%= yield :table_headers %>
 
   <% items.each do |item| %>
     <tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id(item) %>">
@@ -23,7 +27,10 @@
           <%= field %>
           <% if index.zero? %>
             <div class="actions">
-              <%= table_actions(model, item, association_name) %>
+                <% table_actions(model, item, association_name).each_with_index do |action, index| %>
+                  <%= "/" unless index.zero? %>
+                  <%= link_to action[:message], action[:url], action[:options] %>
+                <% end %>
             </div>
           <% end %>
         </td>
@@ -31,15 +38,6 @@
     </tr>
   <% end %>
 
-  <thead>
-    <tr>
-      <% if controller.respond_to?(:bulk) %>
-        <th><%= check_box_tag "action-toggle", "", false, :class => "action-toggle" %></th>
-      <% end %>
-      <% headers.each do |header| %>
-        <th><%= header %></th>
-      <% end %>
-    </tr>
-  </thead>
+  <%= yield :table_headers %>
 
 </table>

data/lib/generators/templates/config/initializers/typus_resources.rb

@@ -16,7 +16,7 @@ Typus::Resources.setup do |config|
   # config.only_user_items = false
 
   # Defines per_page.
-  # config.per_page = 15
+  # config.per_page = 25
 
   # Defines start_year.
   # config.start_year = nil

data/lib/generators/templates/config/typus/README

@@ -39,7 +39,7 @@ most common settings.
         minute_step: 15
         nil: 'nil'
         only_user_items: true
-        per_page: 5
+        per_page: 25
         start_year: 1990
 
 Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)

data/lib/typus.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require "support/active_record"
 require "support/hash"
 require "support/object"
@@ -72,10 +70,19 @@ module Typus
   ##
   # Pagination options passed to Kaminari helper.
   #
+  #     :previous_label => "← " + Typus::I18n.t("Previous")
+  #     :next_label => Typus::I18n.t("Next") + " →"
+  #
+  # Note that `Kaminari` only accepts the following configuration options:
+  #
+  # - default_per_page (25 by default)
+  # - window (4 by default)
+  # - outer_window (0 by default)
+  # - left (0 by default)
+  # - right (0 by default)
+  #
   mattr_accessor :pagination
-  @@pagination = { :window => 0,
-                   :previous_label => "← " + Typus::I18n.t("Previous"),
-                   :next_label => Typus::I18n.t("Next") + " →" }
+  @@pagination = { :window => 0 }
 
   ##
   # Define a password.
@@ -147,14 +154,11 @@ module Typus
 
     # Lists models from the configuration file.
     def models
-      if config = Typus::Configuration.config
-        config.map { |i| i.first }.sort
-      else
-        []
-      end
+      Typus::Configuration.config.map { |i| i.first }.sort
     end
 
-    # Lists resources, which are tableless models.
+    # Lists resources, which are tableless models. This is done by looking at
+    # the roles, which handle the permissions for this kind of data.
     def resources
       if roles = Typus::Configuration.roles
         roles.keys.map do |key|
@@ -171,21 +175,6 @@ module Typus
       Dir.chdir(model_dir) { Dir["**/*.rb"] }
     end
 
-    def locales
-      { "Català" => "ca",
-        "German" => "de",
-        "Greek"  => "el",
-        "English" => "en",
-        "Español" => "es",
-        "Français" => "fr",
-        "Magyar" => "hu",
-        "Italiano" => "It",
-        "Portuguese" => "pt-PT",
-        "Brazilian Portuguese" => "pt-BR",
-        "Russian" => "ru",
-        "中文" => "zh-CN" }
-    end
-
     def application_models
       detect_application_models.map do |model|
         class_name = model.sub(/\.rb$/,"").camelize

data/lib/typus/authentication/base.rb

@@ -15,6 +15,10 @@ module Typus
       def set_attributes_on_create; end
       def set_attributes_on_update; end
 
+      def not_allowed
+        render :text => "Not allowed!", :status => :unprocessable_entity
+      end
+
     end
   end
 end

data/lib/typus/authentication/http_basic.rb

@@ -8,8 +8,8 @@ module Typus
 
       def authenticate
         @admin_user = FakeUser.new
-        authenticate_or_request_with_http_basic(Typus.admin_title) do |user_name, password|
-          user_name == Typus.username && password == Typus.password
+        authenticate_or_request_with_http_basic(Typus.admin_title) do |username, password|
+          username == Typus.username && password == Typus.password
         end
       end
 

data/lib/typus/authentication/session.rb

@@ -59,7 +59,9 @@ module Typus
           # Admin can update himself except setting the status to false!. Other
           # users can update their profile as the attributes (role & status)
           # are protected.
-          status_changed = !(@item.status == params[@object_name][:status])
+          status_as_boolean = params[@object_name][:status] == "1" ? true : false
+
+          status_changed = !(@item.status == status_as_boolean)
           role_changed = !(@item.role == params[@object_name][:role])
 
           root_changed_his_status_or_role = current_user_is_root && (status_changed || role_changed)
@@ -78,10 +80,6 @@ module Typus
         not_allowed if admin_user.cannot?(params[:action], resource, { :special => true })
       end
 
-      def not_allowed
-        render :text => "Not allowed!", :status => :unprocessable_entity
-      end
-
       #--
       # If item is owned by another user, we only can perform a show action on
       # the item. Updated item is also blocked.

data/lib/typus/configuration.rb

@@ -1,11 +1,9 @@
 module Typus
   module Configuration
 
-    # Read configuration from <tt>config/typus/**/*.yml</tt>.
+    # Read configuration from <tt>config/typus/*.yml</tt>.
     def self.config!
-      application = Dir[File.join(Typus.config_folder, "**", "*.yml").to_s]
-      plugins = Dir[File.join("vendor", "plugins", "*", "config", "typus", "*.yml").to_s]
-      files = (application + plugins).reject { |f| f.include?("_roles.yml") }
+      files = Dir[File.join(Typus.config_folder, "*.yml").to_s].reject { |f| f.match(/_roles.yml/) }
 
       @@config = {}
 
@@ -14,17 +12,18 @@ module Typus
           @@config.merge!(data)
         end
       end
-
-      @@config
     end
 
     mattr_accessor :config
+    @@config = {}
+
+    def self.register_config(config)
+      @@config.merge!(config)
+    end
 
-    # Read roles from files <tt>config/typus/**/*_roles.yml</tt>.
+    # Read roles from files <tt>config/typus/*_roles.yml</tt>.
     def self.roles!
-      application = Dir[File.join(Typus.config_folder, "**", "*_roles.yml").to_s]
-      plugins = Dir[File.join("vendor", "plugins", "*", "config", "typus", "*_roles.yml").to_s]
-      files = (application + plugins).sort
+      files = Dir[File.join(Typus.config_folder, "*_roles.yml").to_s].sort
 
       @@roles = {}
 
@@ -35,11 +34,14 @@ module Typus
           end
         end
       end
-
-      @@roles
     end
 
     mattr_accessor :roles
+    @@roles = {}
+
+    def self.register_roles(roles)
+      @@roles.merge!(roles)
+    end
 
     def self.models_constantized!
       @@models_constantized = config.map { |i| i.first }.inject({}) { |result, model| result[model] = model.constantize; result }