typus 3.0.11.rc3 → 3.0.11.rc4

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

@@ -18,6 +18,12 @@ $(document).ready(function() {
     'type': 'iframe'
   });
 
+  // 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/helpers/admin/display_helper.rb

@@ -46,6 +46,8 @@ module Admin
     alias_method :display_position, :display_string
     alias_method :display_integer, :display_string
     alias_method :display_decimal, :display_string
+    alias_method :display_float, :display_string
+    alias_method :display_date, :display_datetime
 
   end
 end

data/app/helpers/admin/relationships_helper.rb

@@ -38,6 +38,7 @@ module Admin
 
       render "admin/templates/has_n",
              :association_name => @association_name,
+             :association_title => @model_to_relate.model_name.human.pluralize,
              :add_new => build_add_new(options),
              :form => form,
              :table => build_relationship_table
@@ -65,6 +66,7 @@ module Admin
 
       render "admin/templates/has_n",
              :association_name => @association_name,
+             :association_title => @model_to_relate.model_name.human.pluralize,
              :add_new => build_add_new,
              :form => form,
              :table => build_relationship_table
@@ -134,6 +136,7 @@ module Admin
 
       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

data/app/helpers/admin/sidebar_helper.rb

@@ -5,7 +5,7 @@ module Admin
       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] = default_actions(klass)

data/app/helpers/admin/table_helper.rb

@@ -85,15 +85,15 @@ module Admin
       (raw_content = item.send(attribute)).present? ? truncate(raw_content) : "—".html_safe
     end
 
-    def table_generic_field(attribute, item)
+    def table_string_field(attribute, item)
       (raw_content = item.send(attribute)).present? ? raw_content : "—".html_safe
     end
 
-    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
+    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
 
     def table_selector_field(attribute, item)
       item.mapping(attribute)

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.name.to_s.pluralize %>/autocomplete", {
+        $("#tokenInput_for_<%= related_fk %>").tokenInput("/admin/<%= association.class_name.tableize %>/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_name.titleize.humanize.pluralize %>
+    <%= association_title %>
     <small><%= add_new %></small>
   </h2>
 
@@ -11,7 +11,7 @@
     <%= table %>
     <%= will_paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase.pluralize) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_title.downcase) %></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_name.humanize %>
+    <%= association_title %>
     <small><%= add_new %></small>
   </h2>
 
   <% if @items.any? -%>
     <%= table %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_title.downcase) %></p>
   <% end %>
 
 </div>

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"

data/lib/typus.rb

@@ -137,7 +137,7 @@ module Typus
 
     # Lists modules of an application.
     def application(name)
-      Typus::Configuration.config.map { |i| i.first if i.last["application"] == name }.compact.uniq.sort
+      Typus::Configuration.config.map { |i| i.first if i.last["application"] == name }.compact.uniq
     end
 
     # Lists models from the configuration file.
@@ -175,7 +175,8 @@ module Typus
         "Français" => "fr",
         "Magyar" => "hu",
         "Italiano" => "It",
-        "Portuguese" => "pt-BR",
+        "Portuguese" => "pt-PT",
+        "Brazilian Portuguese" => "pt-BR",
         "Russian" => "ru",
         "中文" => "zh-CN" }
     end

data/lib/typus/controller/associations.rb

@@ -62,7 +62,7 @@ module Typus
         if worked
           notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
         else
-          alert = item.error.full_messages
+          alert = item.errors.full_messages
         end
 
         redirect_to :back, :notice => notice, :alert => alert

data/lib/typus/controller/format.rb

@@ -28,7 +28,7 @@ module Typus
 
         options = { :conditions => @conditions, :batch_size => 1000 }
 
-        ::FasterCSV.open(filename, 'w', :col_sep => ';') do |csv|
+        ::FasterCSV.open(filename, 'w') do |csv|
           csv << fields.keys
           @resource.find_in_batches(options) do |records|
             records.each do |record|

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.11.rc3"
+  VERSION = "3.0.11.rc4"
 end

metadata

@@ -1,82 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: typus
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.11.rc4
   prerelease: 7
-  version: 3.0.11.rc3
 platform: ruby
-authors: 
+authors:
 - Francesc Esplugas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-27 00:00:00.000000000 +02:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154164760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154164760
+- !ruby/object:Gem::Dependency
+  name: fastercsv
+  requirement: &2154163540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154163540
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2154162160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.8
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: render_inheritable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154162160
+- !ruby/object:Gem::Dependency
+  name: render_inheritable
+  requirement: &2154161560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2154161560
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: &2154160520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.pre2
   type: :runtime
-  version_requirements: *id005
-description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured content.
-email: 
+  prerelease: false
+  version_requirements: *2154160520
+description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
+  content.
+email:
 - core@typuscms.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -225,6 +223,8 @@ files:
 - config/locales/typus.locale.yml.template
 - config/locales/typus.pt-BR.models.yml
 - config/locales/typus.pt-BR.yml
+- config/locales/typus.pt-PT.models.yml
+- config/locales/typus.pt-PT.yml
 - config/locales/typus.ru.models.yml
 - config/locales/typus.ru.yml
 - config/locales/typus.zh-CN.models.yml
@@ -481,34 +481,33 @@ files:
 - test/lib/typus_test.rb
 - test/test_helper.rb
 - typus.gemspec
+has_rdoc: true
 homepage: http://core.typuscms.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: typus
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator)
-test_files: 
+summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold
+  generator)
+test_files:
 - test/app/controllers/admin/account_controller_test.rb
 - test/app/controllers/admin/assets_controller_test.rb
 - test/app/controllers/admin/base_controller_test.rb