typus 3.1.0.rc4 → 3.1.0.rc5

data/Gemfile

@@ -4,11 +4,13 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'sqlite3'
+gem 'jquery-rails'
 
 # And this stuff needed for the demo application.
 gem 'acts_as_list'
 gem 'acts_as_tree'
 gem 'factory_girl'
+gem "rails-trash"
 
 # Asset Management
 gem "dragonfly", "~> 0.9"

data/app/assets/javascripts/typus.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/application

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

@@ -1,7 +1,3 @@
-//= require jquery
-//= require jquery_ujs
-//= require_tree ../../vendor
-//= require typus/jquery.application
-//= require typus/jquery.rails.autocomplete
-//= require typus/jquery.searchField
-//= require typus/custom
+
+// Create the file `app/assets/javascripts/typus/application.js` in your
+// application if you need/want to extend some javascript functionality.

data/app/assets/stylesheets/typus.css

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

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

@@ -1,7 +1,12 @@
+
+/* Create the file `app/assets/stylesheets/typus/application.css` in your
+   application if you need/want to override/add some stylesheets. */
+
 /*
-*= require typus/reset
-*= require typus/screen
-*= require typus/pagination
-*= require_tree ../../vendor
-*= require typus/custom
-*/
+.logo {
+  height: 50px;
+  width: 150px;
+  background: transparent url(/images/logo.gif) no-repeat;
+  text-indent: -10000px;
+}
+*/

data/app/controllers/admin/resources_controller.rb

@@ -128,10 +128,15 @@ class Admin::ResourcesController < Admin::BaseController
   private
 
   def get_model
-    @resource = params[:controller].extract_class
+    @resource = resource
     @object_name = ActiveModel::Naming.singular(@resource)
   end
 
+  def resource
+    params[:controller].extract_class
+  end
+  helper_method :resource
+
   def set_context
     @resource
   end

data/app/helpers/admin/filters_helper.rb

@@ -79,11 +79,7 @@ module Admin
     end
 
     def string_filter(filter)
-      values = if set_context.const_defined?(filter.to_s.upcase)
-                 set_context::const_get(filter.to_s.upcase).to_a
-               else
-                 set_context.send(filter.to_s).to_a
-               end
+      values = set_context.send(filter.to_s).to_a
 
       items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
       array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }

data/app/helpers/admin/form_helper.rb

@@ -22,11 +22,12 @@ module Admin
     end
 
     def typus_tree_field(attribute, form)
-      render "admin/templates/tree",
-             :attribute => attribute,
-             :form => form,
-             :label_text => @resource.human_attribute_name(attribute),
-             :values => expand_tree_into_select_field(@resource.roots, "parent_id")
+      locals = { :attribute => attribute,
+                 :form => form,
+                 :label_text => @resource.human_attribute_name(attribute),
+                 :values => expand_tree_into_select_field(@resource.roots, "parent_id") }
+
+      render "admin/templates/tree", locals
     end
 
     def typus_relationships
@@ -47,13 +48,14 @@ module Admin
                   :disabled => attribute_disabled?(attribute),
                   :include_blank => true }
 
-      render "admin/templates/#{template}",
-             :resource => @resource,
-             :attribute => attribute,
-             :options => options,
-             :html_options => {},
-             :form => form,
-             :label_text => @resource.human_attribute_name(attribute)
+      locals = { :resource => @resource,
+                 :attribute => attribute,
+                 :options => options,
+                 :html_options => {},
+                 :form => form,
+                 :label_text => @resource.human_attribute_name(attribute) }
+
+      render "admin/templates/#{template}", locals
     end
 
     def attribute_disabled?(attribute)

data/app/helpers/admin/relationships_helper.rb

@@ -36,11 +36,12 @@ module Admin
                              ["Trash", {:resource_id=>@item.id, :resource=>@resource.model_name, :action=>"destroy"}, {:confirm=>"Trash?"}]]
                            end
 
-      render "admin/templates/has_n",
-             :association_name => @association_name,
-             :add_new => build_add_new(options),
-             :form => form,
-             :table => build_relationship_table
+      locals = { :association_name => @association_name,
+                 :add_new => build_add_new(options),
+                 :form => form,
+                 :table => build_relationship_table }
+
+      render "admin/templates/has_n", locals
     end
 
     def typus_form_has_and_belongs_to_many(field)
@@ -63,11 +64,12 @@ module Admin
       @resource_actions = [["Edit", {:action=>"edit"}, {}],
                            ["Unrelate", {:resource_id=> @item.id, :resource=> @resource.model_name, :action=>"unrelate"}, {:confirm=>"Unrelate?"}]]
 
-      render "admin/templates/has_n",
-             :association_name => @association_name,
-             :add_new => build_add_new,
-             :form => form,
-             :table => build_relationship_table
+      locals = { :association_name => @association_name,
+                 :add_new => build_add_new,
+                 :form => form,
+                 :table => build_relationship_table }
+
+      render "admin/templates/has_n", locals
     end
 
     def build_pagination
@@ -100,7 +102,7 @@ module Admin
                           :resource_id => @item.id }
 
       if set_condition && admin_user.can?("create", @model_to_relate)
-        link_to Typus::I18n.t("Add new"), default_options.merge(options)
+        link_to Typus::I18n.t("Add New"), default_options.merge(options)
       end
     end
 
@@ -114,7 +116,7 @@ module Admin
 
     def set_conditions
       if @model_to_relate.typus_options_for(:only_user_items) && admin_user.is_not_root?
-        { Typus.user_fk => admin_user }
+        { Typus.user_foreign_key => admin_user }
       end
     end
 
@@ -155,7 +157,7 @@ module Admin
         # Pass the resource_id only to edit/update because only there is where
         # the record actually exists.
         options.merge!(:resource_id => @item.id) if %w(edit update).include?(params[:action])
-        message = link_to Typus::I18n.t("Add new"), options
+        message = link_to Typus::I18n.t("Add New"), options
       end
 
       # Set the template.

data/app/helpers/admin/resources_helper.rb

@@ -29,9 +29,8 @@ module Admin
 
         body = Typus::I18n.t("Cancel adding a new %{resource}?", :resource => @resource.model_name.human.downcase)
 
-        render "admin/helpers/resources/display_link_to_previous",
-               :body => body,
-               :url => url
+        locals = { :body => body, :url => url }
+        render "admin/helpers/resources/display_link_to_previous", locals
       end
     end
 

data/app/helpers/admin/sidebar_helper.rb

@@ -19,8 +19,8 @@ module Admin
 
     def default_actions(klass)
       Array.new.tap do |tap|
-        tap << link_to_unless_current(Typus::I18n.t("Add new"), :action => "new") if admin_user.can?("create", klass)
-        tap << link_to_unless_current(Typus::I18n.t("List"), :action => "index")
+        tap << link_to_unless_current(Typus::I18n.t("All #{klass.model_name.human.pluralize}"), :action => "index")
+        tap << link_to_unless_current(Typus::I18n.t("Add New"), :action => "new") if admin_user.can?("create", klass)
       end
     end
 

data/app/helpers/admin/table_helper.rb

@@ -2,13 +2,14 @@ module Admin
   module TableHelper
 
     def build_table(model, fields, items, link_options = {}, association = nil, association_name = nil)
-      render "admin/helpers/table/table",
-             :model => model,
-             :fields => fields,
-             :items => items,
-             :link_options => link_options,
-             :headers => table_header(model, fields),
-             :association_name => association_name
+      locals = { :model => model,
+                 :fields => fields,
+                 :items => items,
+                 :link_options => link_options,
+                 :headers => table_header(model, fields),
+                 :association_name => association_name }
+
+      render "admin/helpers/table/table", locals
     end
 
     def table_header(model, fields, params = params)
@@ -100,7 +101,7 @@ module Admin
     end
 
     def table_file_field(attribute, item)
-      typus_file_preview(item, attribute, { :height => 25, :width => 25})
+      typus_file_preview(item, attribute, { :height => 25, :width => 25 })
     end
 
     def table_tree_field(attribute, item)
@@ -151,12 +152,7 @@ module Admin
 
     def table_transversal_field(attribute, item)
       field_1, field_2 = attribute.split(".")
-
-      if related_item = item.send(field_1)
-        related_item.send(field_2)
-      else
-        "—".html_safe
-      end
+      (related_item = item.send(field_1)) ? related_item.send(field_2) : "—".html_safe
     end
 
   end

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

@@ -36,7 +36,7 @@ To create a new entry:
 
 <ul>
 <li>Click on entries tab.</li>
-<li>Click "Add new" sub 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>

data/app/views/admin/resources/index.html.erb

@@ -15,7 +15,7 @@
 <%= render 'index' %>
 
 <ul class="predefined_filters">
-  <li><%= link_to Typus::I18n.t("All"), :action => 'index' %> (<%= set_context.count %>)</li>
+  <li><%= link_to Typus::I18n.t("All"), :action => 'index' %> (<%= resource.count %>)</li>
   <% predefined_filters.each do |filter, action, scope| %>
     <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
     <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>

data/app/views/admin/resources/new.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = Typus::I18n.t("New %{resource}", :resource => @resource.model_name.human)
+  page_title = Typus::I18n.t("Add New %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 

data/app/views/admin/shared/_head.html.erb

@@ -6,8 +6,8 @@
 
 <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
-<%= stylesheet_link_tag "typus/application" %>
-<%= javascript_include_tag "typus/application" %>
+<%= stylesheet_link_tag :typus %>
+<%= javascript_include_tag :typus %>
 
 <%= yield :stylesheets -%>
 <%= yield :javascripts -%>

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

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

data/config/locales/typus.ca.models.yml

@@ -7,11 +7,11 @@ ca:
       admin_user: Usuari
     attributes:
       admin_user:
-        email: "Correu electrònic"
-        first_name: "Nom"
-        last_name: "Cognoms"
-        password: "Contrassenya"
-        password_confirmation: "Confirmar contrasenya"
-        status: "Estat"
-        role: "Rol"
-        locale: "Idioma"
+        email: Correu electrònic
+        first_name: Nom
+        last_name: Cognoms
+        password: Contrasenya
+        password_confirmation: Confirmar contrasenya
+        status: Estat
+        role: Rol
+        locale: Idioma

data/config/locales/typus.ca.yml

@@ -6,7 +6,7 @@ ca:
   "Actions": "Accions"
   "Active": "Actiu"
   "Add": "Afegir"
-  "Add new": "Afegir nou"
+  "Add New": "Afegir nou"
   "All": "Tots"
   "Are you sure?": "Estàs segur?"
   "Are you sure you want to sign out and end your session?": "Estàs segur que vols sortir i tancar la sessió?"
@@ -32,7 +32,6 @@ ca:
   "Last few days": "Últims dies"
   "Last 30 days": "Últims 30 dies"
   "Last 7 days": "Últims 7 dies"
-  "List": "Llista"
   "Logged as": "Identificat com"
   "Login": "Login"
 

data/config/locales/typus.de.yml

@@ -6,7 +6,7 @@ de:
   "Actions": "Aktionen"
   "Active":
   "Add": "Zufügen"
-  "Add new": "Erstellen"
+  "Add New": "Erstellen"
   "Are you sure?":
   "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"
 
@@ -31,7 +31,6 @@ de:
   "Last few days": "Letzten Tage"
   "Last 30 days": "Letzten 30 Tage"
   "Last 7 days": "Letzten 7 Tage"
-  "List":
   "Logged as": "Aufgezeichnet als"
   "Login": "Anmeldem"
 

data/config/locales/typus.el.yml

@@ -6,7 +6,7 @@ el:
   "Actions": "Ενέργειες"
   "Active": "Ενεργό"
   "Add": "Προσθήκη"
-  "Add new": "Προσθήκη νέου"
+  "Add New": "Προσθήκη νέου"
   "Are you sure?": "Είσαστε βέβαιοι;"
   "Are you sure you want to sign out and end your session?": "Είσαστε σίγουροι ότι επιθυμείτε να αποσυνδεθείτε και να τερματίσετε το session;"
 
@@ -32,7 +32,6 @@ el:
   "Last few days": "Τελευταίες ημέρες"
   "Last 30 days": "Τελευταίες 30 ημέρες"
   "Last 7 days": "Τελευταίες 7 ημέρες"
-  "List": "Λίστα"
   "Logged as": "Συνδεδεμένος ως"
   "Login": "Σύνδεση"
 

data/config/locales/typus.es.yml

@@ -6,7 +6,7 @@ es:
   "Actions": "Acciones"
   "Active": "Activo"
   "Add": "Añadir"
-  "Add new": "Añadir nuevo"
+  "Add New": "Añadir nuevo"
   "All": "Todos"
   "Are you sure?": "¿Estás seguro?"
   "Are you sure you want to sign out and end your session?": "¿Estás seguro que quieres salir y cerrar la sessión?"
@@ -32,7 +32,6 @@ es:
   "Last few days": "Últimos dias"
   "Last 30 days": "Últimos 30 dias"
   "Last 7 days": "Últimos 7 dias"
-  "List": "Lista"
   "Logged as": "Autenticado como"
   "Login": "Login"