typus 3.0.12 → 3.1.0.rc1

data/app/helpers/admin/file_preview_helper.rb

@@ -63,16 +63,16 @@ module Admin
     end
 
     def typus_file_preview_for_paperclip(attachment, options = {})
-      if attachment.exists?
-        styles = attachment.styles.keys
-        if styles.include?(Typus.file_preview) && styles.include?(Typus.file_thumbnail)
-          render "admin/helpers/file_preview",
-                 :preview => attachment.url(Typus.file_preview, false),
-                 :thumb => attachment.url(Typus.file_thumbnail, false),
-                 :options => options
-        else
-          link_to attachment.original_filename, attachment.url(:original, false)
-        end
+      return unless attachment.exists?
+
+      styles = attachment.styles.keys
+      if attachment.content_type =~ /^image\/.+/ && styles.include?(Typus.file_preview) && styles.include?(Typus.file_thumbnail)
+        render "admin/helpers/file_preview",
+               :preview => attachment.url(Typus.file_preview, false),
+               :thumb => attachment.url(Typus.file_thumbnail, false),
+               :options => options
+      else
+        link_to attachment.original_filename, attachment.url(:original, false)
       end
     end
 

data/app/helpers/admin/filters_helper.rb

@@ -42,7 +42,7 @@ module Admin
         att_assoc = @resource.reflect_on_association(key.to_sym)
         class_name = att_assoc.options[:class_name] || key.capitalize.camelize
         resource = class_name.typus_constantize
-        att_assoc.primary_key_name
+        att_assoc.foreign_key
       else
         key
       end

data/app/helpers/admin/relationships_helper.rb

@@ -12,12 +12,12 @@ module Admin
     def typus_form_has_many(field)
       setup_relationship(field)
 
-      options = @reflection.through_reflection ? {} : { @reflection.primary_key_name => @item.id }
+      options = @reflection.through_reflection ? {} : { @reflection.foreign_key => @item.id }
 
       count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
 
       if set_condition && !count_items_to_relate.zero?
-        form = if Typus.autocomplete
+        form = if Typus.autocomplete && (count_items_to_relate > Typus.autocomplete)
                  build_relate_form('admin/templates/relate_form_with_autocomplete')
                else
                  @items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by) - @item.send(field)
@@ -38,7 +38,6 @@ module Admin
 
       render "admin/templates/has_n",
              :association_name => @association_name,
-             :association_title => @model_to_relate.model_name.human(:count => 2),
              :add_new => build_add_new(options),
              :form => form,
              :table => build_relationship_table
@@ -50,7 +49,7 @@ module Admin
       count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
 
       if set_condition && !count_items_to_relate.zero?
-        form = if Typus.autocomplete
+        form = if Typus.autocomplete && (count_items_to_relate > Typus.autocomplete)
                  build_relate_form('admin/templates/relate_form_with_autocomplete')
                else
                  @items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by) - @item.send(field)
@@ -66,7 +65,6 @@ module Admin
 
       render "admin/templates/has_n",
              :association_name => @association_name,
-             :association_title => @model_to_relate.model_name.human(:count => 2),
              :add_new => build_add_new,
              :form => form,
              :table => build_relationship_table
@@ -75,7 +73,7 @@ module Admin
     def build_pagination
       items_per_page = @model_to_relate.typus_options_for(:per_page)
       data = @item.send(@field).order(@model_to_relate.typus_order_by).where(set_conditions)
-      @items = data.paginate(:per_page => items_per_page, :page => params[:page])
+      @items = data.page(params[:page]).per(items_per_page)
     end
 
     def build_relate_form(template = "admin/templates/relate_form")
@@ -132,11 +130,10 @@ module Admin
       @resource_actions = [["Edit", {:action=>"edit"}, {}],
                            ["Trash", {:resource_id=>@item.id, :resource=>@resource.model_name, :action=>"destroy"}, {:confirm=>"Trash?"}]]
 
-      options = { :resource_id => nil, @reflection.primary_key_name => @item.id }
+      options = { :resource_id => nil, @reflection.foreign_key => @item.id }
 
       render "admin/templates/has_one",
              :association_name => @association_name,
-             :association_title => @model_to_relate.model_name.human,
              :add_new => @items.empty? ? build_add_new(options) : nil,
              :table => build_relationship_table
     end
@@ -148,7 +145,7 @@ module Admin
                 else
                   association.class_name.typus_constantize
                 end
-      related_fk = association.primary_key_name
+      related_fk = association.foreign_key
 
       # TODO: Use the build_add_new method.
       if admin_user.can?('create', related)
@@ -161,19 +158,21 @@ module Admin
         message = link_to Typus::I18n.t("Add new"), options
       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"
-
-      # 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
+      # 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
+
+      # 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
 
-      render "admin/templates/#{template}",
+      render template,
              :association => association,
              :resource => @resource,
              :attribute => attribute,

data/app/helpers/admin/sidebar_helper.rb

@@ -5,12 +5,11 @@ module Admin
       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).sort {|a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human}.each do |resource|
         klass = resource.typus_constantize
 
         resources[resource] = default_actions(klass)
         resources[resource] += custom_actions(klass)
-        resources[resource] += export(klass) if params[:action] == 'index'
 
         resources[resource].compact!
       end
@@ -33,11 +32,5 @@ module Admin
       end
     end
 
-    def export(klass, params = params)
-      klass.typus_export_formats.map do |format|
-        link_to Typus::I18n.t("Export as %{mime}", :mime => format.upcase), params.merge(:format => format)
-      end
-    end
-
  end
 end

data/app/helpers/admin/table_helper.rb

@@ -19,7 +19,7 @@ module Admin
 
         if params[:action].eql?('index') && model.typus_options_for(:sortable)
           association = model.reflect_on_association(key.to_sym)
-          order_by = association ? association.primary_key_name : key
+          order_by = association ? association.foreign_key : key
 
           if (model.model_fields.map(&:first).map { |i| i.to_s }.include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym))
             sort_order = case params[:sort_order]
@@ -85,22 +85,22 @@ module Admin
       (raw_content = item.send(attribute)).present? ? truncate(raw_content) : "—".html_safe
     end
 
-    def table_string_field(attribute, item)
+    def table_generic_field(attribute, item)
       (raw_content = item.send(attribute)).present? ? raw_content : "—".html_safe
     end
 
-    alias :table_float_field :table_string_field
-    alias :table_integer_field :table_string_field
-    alias :table_decimal_field :table_string_field
-    alias :table_virtual_field :table_string_field
-    alias :table_password_field :table_string_field
+    alias :table_float_field :table_generic_field
+    alias :table_integer_field :table_generic_field
+    alias :table_decimal_field :table_generic_field
+    alias :table_virtual_field :table_generic_field
+    alias :table_string_field :table_generic_field
 
     def table_selector_field(attribute, item)
       item.mapping(attribute)
     end
 
     def table_file_field(attribute, item)
-      typus_file_preview(item, attribute, { :height => 60, :width => 60})
+      typus_file_preview(item, attribute, { :height => 25, :width => 25})
     end
 
     def table_tree_field(attribute, item)

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

@@ -12,7 +12,7 @@
 
       <%
         klass = model.typus_constantize
-        klass_human_name = klass.model_name.human(:count => 2)
+        klass_human_name = klass.model_name.human.pluralize
         admin_items_path = { :controller => "/admin/#{klass.to_resource}" }
       %>
 

data/app/views/admin/helpers/base/_apps.html.erb

@@ -8,15 +8,10 @@
 
     <%
       apps = admin_user.application(application)
-      klass = (@resource && apps.include?(@resource.model_name)) ? 'active' : nil
+      klass = 'active' if (@resource && apps.include?(@resource.model_name))
     %>
 
-    <%
-      url = { :controller => "/admin/#{apps.first.tableize}" }
-      html_options = { :class => klass }
-    %>
-
-    <li><%= link_to Typus::I18n.t(application), url, html_options %></li>
+    <li><%= link_to Typus::I18n.t(application), { :controller => "/admin/#{apps.first.tableize}" }, { :class => klass } %></li>
 
   <% end %>
 

data/app/views/admin/helpers/base/_header.html.erb

@@ -1,6 +1,6 @@
 <h1 class="logo">
   <% if has_root_path? %>
-    <%= link_to Typus.admin_title, root_path, :title => Typus::I18n.t("View site") %>
+    <%= link_to Typus.admin_title, main_app.root_path, :title => Typus::I18n.t("View site") %>
   <% else %>
     <%= Typus.admin_title %>
   <% end %>

data/app/views/admin/helpers/resources/_errors.html.erb

@@ -1,6 +1,6 @@
 <% if @item.errors.any? %>
   <div id="errorExplanation">
-    <h3><%= Typus::I18n.t("%{errors} errors prohibited this page from being saved:", :errors => @item.errors.count) %></h3>
+    <h3><%= Typus::I18n.t("%{errors} prohibited this page from being saved:", :errors => pluralize(@item.errors.count, "error")) %></h3>
     <ul>
     <% @item.errors.full_messages.each do |full_message| %>
       <li><%= full_message %></li>

data/app/views/admin/helpers/sidebar/_sidebar.html.erb

@@ -6,7 +6,7 @@
   %>
 
   <%= link_to :controller => resource, :action => "index" do %>
-    <h3><%= klass.model_name.human(:count => 2) %></h3>
+    <h3><%= klass.model_name.human.pluralize %></h3>
   <% end %>
 
   <% if @resource.model_name.eql?(key) %>

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

@@ -1,5 +1,5 @@
 <%
-  page_title = @resource.model_name.human(:count => 2)
+  page_title = @resource.model_name.human.pluralize
   title(page_title)
 %>
 
@@ -15,7 +15,7 @@
 <%= render 'index' %>
 
 <ul class="predefined_filters">
-  <li><%= link_to Typus::I18n.t("All"), :action => 'index' %> (<%= resource.count %>)</li>
+  <li><%= link_to Typus::I18n.t("All"), :action => 'index' %> (<%= set_context.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>
@@ -31,7 +31,7 @@
 
 <% if @items.any? -%>
   <%= build_list(@resource, fields, @items) %>
-  <%= will_paginate(@items, Typus.pagination) %>
+  <%= paginate(@items, Typus.pagination) %>
 <% else %>
-  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human(:count => 2)) %></p>
+  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>
 <% end %>

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

@@ -6,25 +6,10 @@
 
 <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
-<%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
-                        "/vendor/typus/vendor/jquery-ui-1.8.12.custom/css/ui-lightness/jquery-ui-1.8.12.custom.css",
-                        "/vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css",
-                        "/vendor/typus/vendor/jquery-tokeninput/css/token-input.css",
-                        "/vendor/typus/stylesheets/screen",
-                        "/vendor/typus/stylesheets/application" %>
+<%= stylesheet_link_tag "typus/application" %>
+<%= javascript_include_tag "typus/application" %>
 
 <%= yield :stylesheets -%>
-
-<%= javascript_include_tag "/vendor/typus/vendor/jquery-ui-1.8.12.custom/js/jquery-1.5.1.min.js",
-                           "/vendor/typus/vendor/jquery-ui-1.8.12.custom/js/jquery-ui-1.8.12.custom.min.js",
-                           "/vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js",
-                           "/vendor/typus/vendor/jquery-tokeninput/js/jquery.tokeninput.js",
-                           "/vendor/typus/javascripts/jquery.searchField.js",
-                           "/vendor/typus/javascripts/jquery.rails.js",
-                           "/vendor/typus/javascripts/jquery.rails.autocomplete.js",
-                           "/vendor/typus/javascripts/jquery.application.js",
-                           "/vendor/typus/javascripts/application" %>
-
 <%= yield :javascripts -%>
 
 <%= csrf_meta_tag %>

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

@@ -2,7 +2,7 @@
   <% label = "#{@item.class.model_name.underscore.gsub("/","_")}_#{related_fk}" %>
   <script type="text/javascript">
     $(document).ready(function () {
-        $("#tokenInput_for_<%= related_fk %>").tokenInput("/admin/<%= association.class_name.tableize %>/autocomplete", {
+        $("#tokenInput_for_<%= related_fk %>").tokenInput("/admin/<%= association.name.to_s.pluralize %>/autocomplete", {
             hintText: "",
             queryParam: 'term',
             tokenLimit: 1,

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

@@ -1,7 +1,7 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= association_title %>
+    <%= association_name.titleize.humanize.pluralize %>
     <small><%= add_new %></small>
   </h2>
 
@@ -9,9 +9,9 @@
 
   <% if @items.any? -%>
     <%= table %>
-    <%= will_paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>
+    <%= paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_title) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase.pluralize) %></p>
   <% end %>
 
 </div>

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

@@ -1,14 +1,14 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= association_title %>
+    <%= association_name.humanize %>
     <small><%= add_new %></small>
   </h2>
 
   <% if @items.any? -%>
     <%= table %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_title) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase) %></p>
   <% end %>
 
 </div>

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

@@ -4,9 +4,14 @@
            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")
+  end
 %>
 
 <li id="<%= attribute %>">
-  <%= form.label attribute, label_text %>
-  <%= form.select attribute, values, options.merge!(:include_blank => false) %>
+  <%= form.label attribute, "#{label_text} <small>#{message}</small>".html_safe %>
+  <%= form.select attribute, values, options.merge!(:include_blank => false), html_options %>
 </li>

data/config/locales/typus.ca.yml

@@ -75,7 +75,7 @@ ca:
   "View all %{attribute}":
   "View site": "Veure la web"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} satisfactòriament creat."
   "%{model} successfully removed": "%{model} satisfactòriament eliminat."
   "%{model} successfully updated": "%{model} satisfactòriament actualitzat."

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

@@ -1,6 +1,5 @@
 # German (de) translations for Typus by:
 # - Michael Grunewalder <http://michael.grunewalder.com>
-# - Thomas von Deyen <http://thomas.vondeyen.com>
 
 de:
   activerecord:
@@ -8,11 +7,11 @@ de:
       admin_user:
     attributes:
       admin_user:
-        email: "E-Mail"
+        email:
         first_name: "Vorname"
         last_name: "Nachname"
         password: "Passwort"
-        password_confirmation: "Passwort Bestätigung"
-        status: "Status"
-        role: "Rolle"
-        locale: "Sprache"
+        password_confirmation: "Passwort Best&auml;tigung"
+        status:
+        role:
+        locale:

data/config/locales/typus.de.yml

@@ -1,83 +1,80 @@
 # German (de) translations for Typus by:
 # - Michael Grunewalder <http://michael.grunewalder.com>
-# - Thomas von Deyen <http://thomas.vondeyen.com>
 
 de:
+
   "Actions": "Aktionen"
-  "Active": "Aktiv"
-  "Add": "Hinzufügen"
+  "Active":
+  "Add": "Zuf&uuml;gen"
   "Add new": "Erstellen"
-  "All" : 'Alle'
-  "Are you sure?": "Sind Sie sicher?"
+  "Are you sure?":
   "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"
-  "Assign": "Zuweisen"
 
-  "Change %{attribute}?": "%{attribute} ändern?"
-  "Create %{resource}": "%{resource} erstellen"
+  "Change %{attribute}?": "%{attribute}&auml;ndern?"
+  "Create %{resource}": "Erstellen %{resource}"
 
   "Dashboard": "Dashboard"
   "Down": "Runter"
 
   "Edit": "Bearbeiten"
-  "Edit %{resource}": "%{resource} bearbeiten"
+  "Edit %{resource}": "Bearbeiten %{resource}"
   "Enter your email below to create the first user": "Geben Sie Ihre Email Adresse unten ein, um den ersten Benutzer zu erstellen"
 
-  "False": "Nein"
+  "False": "Falsch"
   "Filter": "Filter"
 
   "I remember my password": "Ich erinnere mein Passwort"
-  "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort Änderung beantragt haben, können Sie diese Nachricht ignorieren"
-  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Wenn Sie Änderungen an Feldern vorgenommen haben, ohne den Speichern/Bearbeiten Knopf gedrückt zu haben, gehen diese Änderungen verloren"
+  "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort &Auml;derung beantragt haben, k&ouml;nnen Sie diese nachricht ignorieren"
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Wenn Sie &Auml;nderungen an Feldern vorgenommen haben, ohne den Speichern/Bearbeiten Knopf gedr7uuml;ckt zu haben, gehen diese &Auml;nderungen verloren"
   "Inactive":
 
   "Last few days": "Letzten Tage"
   "Last 30 days": "Letzten 30 Tage"
   "Last 7 days": "Letzten 7 Tage"
-  "List" : 'Liste'
-  "Logged as": "Angemeldet als"
-  "Login": "Anmelden"
+  "List":
+  "Logged as": "Aufgezeichnet als"
+  "Login": "Anmeldem"
 
   "New": "Neu"
-  "New %{resource}": "%{resource} erstellen"
-  "Next": "Nächste"
-  "No %{resources} found": "Keine %{resources} gefunden"
+  "New %{resource}": "Neu %{resource}"
+  "Next": "N&auml;chster"
+  "No %{resources} found":
 
-  "Password recovery link sent to your email": "Der Link zur Wiederherstelllung Ihres Passworts wurde an Ihre Email Adresse geschickt"
+  "Password recovery link sent to your email": "Der Link zur Wiederfindung des Passworts wurde an Ihre Email Adresse gechickt"
   "Previous": "Vorheriger"
 
-  "Record moved %{to}": "Datensatz wurde verschoben nach %{to}"
+  "Record moved %{to}": "Datensatz verschoben nach %{to}"
   "Recover password": "Passwort vergessen?"
   "Remove": "Eintrag"
-  "Remove %{resource}?": "%{resource} entfernen?"
-  "Reset password": "Passwort zurücksetzen"
+  "Remove %{resource}?": "Eintrag %{resource}?"
+  "Reset password": "Passwort zur&uuml;cksetzen"
   "Resources": "Resourcen"
 
-  "Save %{resource}": "%{resource} speichern"
+  "Save %{resource}":
   "Search": "Suchen"
   "Show": "Anzeigen"
-  "Show all dates": "Alle anzeigen"
-  "Show by %{attribute}": "An Hand von %{attribute} anzeigen"
-  "Show %{resource}": "%{resource} anzeigen"
+  "Show all dates":
+  "Show by %{attribute}":
+  "Show %{resource}": "Anzeigen %{resource}"
   "Sign in": "Anmelden"
   "Sign out": "Abmelden"
   "Sign up": "Konto erstellen"
-  "System Users Administration": "Admin Benutzer Verwaltung"
+  "System Users Administration": "System Benutzer Verwaltung"
 
   "Today": "Heute"
-  "Trash": "Löschen"
-  "True": "Ja"
+  "True": "Richtig"
 
-  "Unrelate": "Trennen"
+  "Unrelate":
   "Up": "Hoch"
 
-  "View all %{attribute}": "Alle %{attribute} anzeigen"
-  "View site": "Webseite anzeigen"
+  "View all %{attribute}":
+  "View site": "Site anzeigen"
 
-  "You can update your password at": "Sie können Ihr Passwort ändern unter"
-  "You can't change your role": "Sie können Ihre Rolle nicht ändern"
-  "You can't toggle your status": "Sie können Ihren Status nicht umschalten"
+  "You can update your password at": "Sie k7ouml;nnen Ihr Passwort &auml;ndern unter"
+  "You can't change your role": "Sie k&ouml;nnen Ihre Rolle nicht &auml;ndern"
+  "You can't toggle your status": "Sie k&ouml;nnen Ihren Status nicht umschalten"
 
-  "%{errors} errors prohibited this page from being saved:": "%{errors} Fehler haben diese Seite davon abgehalten gespeichert zu werden:"
-  "%{model} successfully created": "%{model} wurde erfolgreich erstellt"
-  "%{model} successfully removed": "%{model} wurde erfolgreich gelöscht"
-  "%{model} successfully updated": "%{model} wurde erfolgreich geändert"
+  "%{errors} prohibited this page from being saved:":
+  "%{model} successfully created": "%{model} erfolgreich erstellt"
+  "%{model} successfully removed": "%{model} erfolgreich gel&ouml;scht"
+  "%{model} successfully updated": "%{model} erfolgreich ge&auml;ndert"