typus 3.1.0.rc8 → 3.1.0.rc9

data/.gitmodules

@@ -3,4 +3,4 @@
 	url = git@github.com:typus/typus.wiki.git
 [submodule "doc/site"]
 	path = doc/site
-	url = git@github.com:typus/typus.github.com.git
+	url = git@github.com:typus/site.git

data/app/controllers/admin/resources_controller.rb

@@ -151,31 +151,47 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def get_objects
-    eager_loading = @resource.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name }
+    set_scope
+    set_wheres
+    set_joins
+    check_resources_ownership if @resource.typus_options_for(:only_user_items)
+    set_order
+    set_eager_loading
+  end
+
+  def fields
+    @resource.typus_fields_for(params[:action])
+  end
+  helper_method :fields
 
+  # Here we set the current scope!
+  def set_scope
+  end
+
+  def set_wheres
     @resource.build_conditions(params).each do |condition|
       @resource = @resource.where(condition)
     end
+  end
 
+  def set_joins
     @resource.build_my_joins(params).each do |join|
       @resource = @resource.joins(join)
     end
-
-    if @resource.typus_options_for(:only_user_items)
-      check_resources_ownership
-    end
-
-    @resource = @resource.order(set_order).includes(eager_loading)
-  end
-
-  def fields
-    @resource.typus_fields_for(params[:action])
   end
-  helper_method :fields
 
   def set_order
     params[:sort_order] ||= "desc"
-    params[:order_by] ? "#{@resource.table_name}.#{params[:order_by]} #{params[:sort_order]}" : @resource.typus_order_by
+
+    if (order = params[:order_by] ? "#{params[:order_by]} #{params[:sort_order]}" : @resource.typus_order_by).present?
+      @resource = @resource.order(order)
+    end
+  end
+
+  def set_eager_loading
+    if (eager_loading = @resource.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name }).any?
+      @resource = @resource.includes(eager_loading)
+    end
   end
 
   def redirect_on_success

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

@@ -14,4 +14,6 @@ module Admin::Resources::DataTypes::DatetimeHelper
     I18n.l(item.send(attribute), :format => @resource.typus_date_format(attribute))
   end
 
+  alias_method :display_date, :display_datetime
+
 end

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

@@ -11,10 +11,9 @@ module Admin::Resources::DataTypes::DragonflyHelper
 
     if attachment.present? && !validators.include?(attribute) && attachment
       attribute_i18n = @item.class.human_attribute_name(attribute)
-      message = Typus::I18n.t("Remove")
       label_text = <<-HTML
 #{attribute_i18n}
-<small>#{link_to message, { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
+<small>#{link_to Typus::I18n.t("Remove"), { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
       HTML
       label_text.html_safe
     end

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

@@ -1,3 +1,2 @@
 module Admin::Resources::DataTypes::FloatHelper
-
 end

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

@@ -11,27 +11,25 @@ module Admin::Resources::DataTypes::PaperclipHelper
 
     if attachment.exists? && !validators.include?("#{attribute}_file_name") && attachment
       attribute_i18n = @item.class.human_attribute_name(attribute)
-      message = Typus::I18n.t("Remove")
       label_text = <<-HTML
 #{attribute_i18n}
-<small>#{link_to message, { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
+<small>#{link_to Typus::I18n.t("Remove"), { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
       HTML
       label_text.html_safe
     end
   end
 
   def typus_paperclip_preview(item, attachment, options = {})
-    data = item.send(attachment)
-    return unless data.exists?
-
-    styles = data.styles.keys
-    if data.content_type =~ /^image\/.+/ && styles.include?(Typus.file_preview) && styles.include?(Typus.file_thumbnail)
-      render "admin/templates/paperclip_preview",
-             :preview => data.url(Typus.file_preview, false),
-             :thumb => data.url(Typus.file_thumbnail, false),
-             :options => options
-    else
-      link_to data.original_filename, data.url(:original, false)
+    if (data = item.send(attachment)).exists?
+      styles = data.styles.keys
+      if data.content_type =~ /^image\/.+/ && styles.include?(Typus.file_preview) && styles.include?(Typus.file_thumbnail)
+        render "admin/templates/paperclip_preview",
+               :preview => data.url(Typus.file_preview, false),
+               :thumb => data.url(Typus.file_thumbnail, false),
+               :options => options
+      else
+        link_to data.original_filename, data.url(:original, false)
+      end
     end
   end
 

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

@@ -8,6 +8,7 @@ module Admin::Resources::DataTypes::StringHelper
   alias_method :display_position, :display_string
   alias_method :display_integer, :display_string
   alias_method :display_decimal, :display_string
+  alias_method :display_float, :display_string
 
   def string_filter(filter)
     values = set_context.send(filter.to_s).to_a
@@ -25,5 +26,6 @@ module Admin::Resources::DataTypes::StringHelper
   alias :table_float_field :table_string_field
   alias :table_integer_field :table_string_field
   alias :table_virtual_field :table_string_field
+  alias :table_password_field :table_string_field
 
 end

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

@@ -1,27 +1,25 @@
 module Admin::Resources::FiltersHelper
 
   def build_filters(resource = @resource, params = params)
-    typus_filters = resource.typus_filters
+    if (typus_filters = resource.typus_filters).any?
+      locals = {}
 
-    return if typus_filters.empty?
+      locals[:filters] = typus_filters.map do |key, value|
+                           { :filter => set_filter(key, value), :items => send("#{value}_filter", key) }
+                         end
 
-    locals = {}
+      locals[:hidden_filters] = params.dup
 
-    locals[:filters] = typus_filters.map do |key, value|
-                         { :filter => set_filter(key, value), :items => send("#{value}_filter", key) }
-                       end
+      # Remove default params.
+      rejections = %w(controller action locale utf8 sort_order order_by)
+      locals[:hidden_filters].delete_if { |k, v| rejections.include?(k) }
 
-    locals[:hidden_filters] = params.dup
+      # Remove also custom params.
+      rejections = locals[:filters].map { |f| f[:filter] }
+      locals[:hidden_filters].delete_if { |k, v| rejections.include?(k) }
 
-    # Remove default params.
-    rejections = %w(controller action locale utf8 sort_order order_by)
-    locals[:hidden_filters].delete_if { |k, v| rejections.include?(k) }
-
-    # Remove also custom params.
-    rejections = locals[:filters].map { |f| f[:filter] }
-    locals[:hidden_filters].delete_if { |k, v| rejections.include?(k) }
-
-    render "helpers/admin/resources/filters", locals
+      render "helpers/admin/resources/filters", locals
+    end
   end
 
   def set_filter(key, value)

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

@@ -39,11 +39,7 @@ module Admin::Resources::RelationshipsHelper
   end
 
   def set_condition
-    if @resource.typus_user_id? && admin_user.is_not_root?
-      admin_user.owns?(@item)
-    else
-      true
-    end
+    (@resource.typus_user_id? && admin_user.is_not_root?) ? admin_user.owns?(@item) : true
   end
 
   def set_conditions

data/app/helpers/admin/resources_helper.rb

@@ -15,7 +15,7 @@ module Admin::ResourcesHelper
     resources = ActiveSupport::OrderedHash.new
     app_name = @resource.typus_application
 
-    admin_user.application(app_name).sort { |a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human }.each do |resource|
+    admin_user.application(app_name) { |a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human }.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)

data/app/mailers/admin/mailer.rb

@@ -3,8 +3,7 @@ class Admin::Mailer < ActionMailer::Base
   default :from => Typus.mailer_sender
 
   def reset_password_link(user, url)
-    @user = user
-    @url = url
+    @user, @url = user, url
 
     mail :to => user.email,
          :subject => "[#{Typus.admin_title}] #{Typus::I18n.t("Reset password")}"

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

@@ -0,0 +1,8 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery.fancybox-1.3.4.pack.js
+//= require jquery.rails.autocomplete
+//= require jquery.searchField
+//= require jquery.tokeninput.js
+//= require typus/jquery.application
+//= require typus/application

data/app/{assets → themes/default/assets}/javascripts/typus/application.js

@@ -1,3 +1,2 @@
-
 // Create the file `app/assets/javascripts/typus/application.js` in your
 // application if you need/want to extend some javascript functionality.

data/app/{assets → themes/default/assets}/stylesheets/typus.css

@@ -1,7 +1,8 @@
 /*
+*= require jquery.fancybox-1.3.4.css
+*= require token-input.css
 *= require typus/reset
 *= require typus/screen
 *= require typus/pagination
-*= require_tree ../vendor
 *= require typus/application
 */

data/app/{views → themes/default/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.name.to_s.pluralize %>/autocomplete", {
+        $("#tokenInput_for_<%= related_fk %>").tokenInput("/admin/<%= association.class_name.tableize %>/autocomplete", {
             hintText: "",
             queryParam: 'term',
             tokenLimit: 1,

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

@@ -1,5 +1,5 @@
 <% content_for :javascripts do %>
-  <%= javascript_include_tag '/vendor/ckeditor/ckeditor' %>
+  <%= javascript_include_tag 'ckeditor' %>
 <% end %>
 
 <%

data/app/{views → themes/default/views}/admin/templates/_text_with_ckeditor_and_assets.html.erb

@@ -1,5 +1,5 @@
 <% content_for :javascripts do %>
-  <%= javascript_include_tag '/vendor/ckeditor/ckeditor' %>
+  <%= javascript_include_tag 'ckeditor' %>
 <% end %>
 
 <%

data/config/locales/typus.pt-PT.models.yml

@@ -0,0 +1,17 @@
+# Portuguese (pt-PT) translations for Typus by:
+# - Nuno Baldaia <http://nunobaldaia.com/>
+
+"pt-PT":
+  activerecord:
+    models:
+      admin_user: "Utilizador"
+    attributes:
+      admin_user:
+        email:
+        first_name: "Primeiro nome"
+        last_name: "Último nome"
+        locale: "Linguagem"
+        password: "Senha"
+        password_confirmation: "Confirmação de senha"
+        role: "Função no sistema"
+        status: "Estado"

data/config/locales/typus.pt-PT.yml

@@ -0,0 +1,83 @@
+# Portuguese (pt-PT) translations for Typus by:
+# - Nuno Baldaia <http://nunobaldaia.com/>
+
+"pt-PT":
+
+  "Actions": "Acções"
+  "Active": "Activo"
+  "Add": "Adicionar"
+  "Add new": "Adicionar novo"
+  "Are you sure?": "Tem a certeza?"
+  "Are you sure you want to sign out and end your session?": "Tem certeza que quer sair e encerrar sua sessão?"
+
+  "Change %{attribute}?": "Mudar %{attribute}?"
+  "Create %{resource}": "Criar %{resource}"
+
+  "Dashboard": "Painel"
+  "Down": "Descer"
+
+  "Edit": "Editar"
+  "Edit %{resource}": "Editar %{resource}"
+  "Enter your email below to create the first user": "Introduza o seu email para criar o primeiro utilizador"
+
+  "False": "Falso"
+  "Filter": "Filtrar"
+
+  "I remember my password": "Lembro-me da minha senha"
+  "If you didn't request a password update, you can ignore this message": "Se não pediu uma renovação de senha, por favor ignore esta mensagem."
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Se fez alterações nos campos e não clicou no botão de Salvar/Atualizar, as suas alterações serão perdidas"
+  "Inactive": "Inactivo"
+
+  "Last few days": "Últimos dias"
+  "Last 30 days": "Últimos 30 dias"
+  "Last 7 days": "Últimos 7 dias"
+  "List": "Lista"
+  "Logged as": "Logado como"
+  "Login": "Login"
+
+  "New": "Novo"
+  "New %{resource}": "Novo %{resource}"
+  "Next": "Próximo"
+  "No %{resources} found": "Nenhum resultado encontrado em %{resources}"
+
+  "Password recovery link sent to your email": "Foi enviado para o seu email um link para recuperação da senha."
+  "Previous": "Anterior"
+
+  "Record moved %{to}": "Registro movido %{to}."
+  "Recover password": "Recuperar senha"
+  "Remove": "Remover"
+  "Remove %{resource}?": "Remover %{resource}?"
+  "Reset password": "Trocar senha"
+  "Resources": "Recursos"
+
+  "Save %{resource}": "Salvar %{resource}"
+  "Search": "Procurar"
+  "Show": "Mostrar"
+  "Show all dates": "Mostrar todas as datas"
+  "Show by %{attribute}": "Mostrar por %{attribute}"
+  "Show %{resource}": "Mostrar %{resource}"
+  "Sign in": "Entrar"
+  "Sign out": "Sair"
+  "Sign up": "Criar conta"
+  "System Users Administration": "Administração de utilizadores de sistema"
+
+  "Today": "Hoje"
+  "True": "Verdadeiro"
+
+  "Unrelate": "Desvincular"
+  "Up": "Subir"
+
+  "View all %{attribute}": "Ver todos  %{attribute}"
+  "View site": "Ver site"
+
+  "You can't toggle your status": "Não pode trocar o seu estado."
+  "You can update your password at": "Pode atualizar a sua senha em"
+  "You can't change your role": "Não pode mudar sua própria função no sistema."
+
+  "%{errors} prohibited this page from being saved:":
+  "%{model} successfully created": "%{model} criado com sucesso."
+  "%{model} successfully removed": "%{model} removido com sucesso."
+  "%{model} successfully updated": "%{model} atualizado com sucesso."
+
+  "Top": "Topo"
+  "Bottom": "Fundo"