fesplugas-typus 0.9.9 → 0.9.10

data/README.rdoc

@@ -10,6 +10,7 @@ extensible enough to match lots of use cases.
 - Project site and documentation http://intraducibles.com/projects/typus
 - Plugin source http://github.com/fesplugas/typus/tree
 - Google Group http://groups.google.es/group/typus
+- Bugs http://typus.lighthouseapp.com/dashboard
 
 == Impatients to see it working?
 
@@ -69,6 +70,8 @@ Typus and blog about Typus.
 - José Valim (Code) http://github.com/josevalim
 - Luqman Amjad (Code) http://github.com/snake
 - Alexey Noskov (Russian translation and code) http://github.com/alno
+- Andres Gutierres (Bugfixes & feedback) http://github.com/andresgutgon
+- Komzák Nándor (Code, bugfixes & feedback) http://github.com/rubymood
 
 == Acknowledgments
 

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/app/controllers/admin/master_controller.rb

@@ -36,6 +36,9 @@ class Admin::MasterController < ApplicationController
   before_filter :set_fields, 
                 :only => [ :index, :new, :edit, :create, :update, :show ]
 
+  before_filter :set_tiny_mce, 
+                :only => [ :new, :edit, :create, :update ]
+
   ##
   # This is the main index of the model. With filters, conditions 
   # and more.
@@ -89,7 +92,7 @@ class Admin::MasterController < ApplicationController
     if @item.valid?
       create_with_back_to and return if params[:back_to]
       @item.save
-      flash[:success] = _("{{model}} successfully created.", :model => @resource[:class].human_name)
+      flash[:success] = _("{{model}} successfully created.", :model => @resource[:class].typus_human_name)
       if @resource[:class].typus_options_for(:index_after_save)
         redirect_to :action => 'index'
       else
@@ -126,7 +129,7 @@ class Admin::MasterController < ApplicationController
 
   def update
     if @item.update_attributes(params[:item])
-      flash[:success] = _("{{model}} successfully updated.", :model => @resource[:class].human_name)
+      flash[:success] = _("{{model}} successfully updated.", :model => @resource[:class].typus_human_name)
       path = if @resource[:class].typus_options_for(:index_after_save)
                params[:back_to] ? "#{params[:back_to]}##{@resource[:self]}" : { :action => 'index' }
              else
@@ -141,7 +144,7 @@ class Admin::MasterController < ApplicationController
 
   def destroy
     @item.destroy
-    flash[:success] = _("{{model}} successfully removed.", :model => @resource[:class].human_name)
+    flash[:success] = _("{{model}} successfully removed.", :model => @resource[:class].typus_human_name)
     redirect_to :back
   rescue Exception => error
     error_handler(error, params.merge(:action => 'index', :id => nil))
@@ -151,7 +154,7 @@ class Admin::MasterController < ApplicationController
     if @resource[:class].typus_options_for(:toggle)
       @item.toggle!(params[:field])
       flash[:success] = _("{{model}} {{attribute}} changed.", 
-                          :model => @resource[:class].human_name, 
+                          :model => @resource[:class].typus_human_name, 
                           :attribute => params[:field].humanize.downcase)
     else
       flash[:notice] = _("Toggle is disabled.")
@@ -186,8 +189,8 @@ class Admin::MasterController < ApplicationController
     @item.send(resource_tableized) << resource_class.find(params[:related][:id])
 
     flash[:success] = _("{{model_a}} related to {{model_b}}.", 
-                        :model_a => resource_class.human_name, 
-                        :model_b => @resource[:class].human_name)
+                        :model_a => resource_class.typus_human_name, 
+                        :model_b => @resource[:class].typus_human_name)
 
     redirect_to :action => @resource[:class].typus_options_for(:default_action_on_item), 
                 :id => @item.id, 
@@ -212,7 +215,7 @@ class Admin::MasterController < ApplicationController
       message = "{{model_a}} removed from {{model_b}}."
     end
 
-    flash[:success] = _(message, :model_a => resource_class.human_name, :model_b => @resource[:class].human_name)
+    flash[:success] = _(message, :model_a => resource_class.typus_human_name, :model_b => @resource[:class].typus_human_name)
 
     redirect_to :controller => @resource[:self], 
                 :action => @resource[:class].typus_options_for(:default_action_on_item), 
@@ -289,6 +292,13 @@ private
     @order = params[:order_by] ? "#{@resource[:class].table_name}.#{params[:order_by]} #{params[:sort_order]}" : @resource[:class].typus_order_by
   end
 
+  def set_tiny_mce
+    unless @resource[:class].typus_tiny_mce_fields.empty?
+      options = @resource[:class].typus_tiny_mce_options
+      self.class.class_eval { uses_tiny_mce :options => options }
+    end
+  end
+
   def select_template(template, resource = @resource[:self])
     folder = (File.exist?("app/views/admin/#{resource}/#{template}.html.erb")) ? resource : 'resources'
     render "admin/#{folder}/#{template}"
@@ -319,7 +329,7 @@ private
       @item.send(params[:resource]) << resource
     when :has_many
       @item.save
-      message = _("{{model}} successfully created.", :model => @resource[:class].human_name)
+      message = _("{{model}} successfully created.", :model => @resource[:class].typus_human_name)
       path = "#{params[:back_to]}?#{params[:selected]}=#{@item.id}"
     when :polymorphic
       resource.send(@item.class.name.tableize).create(params[:item])

data/app/helpers/admin/form_helper.rb

@@ -9,6 +9,7 @@ module Admin::FormHelper
     returning(String.new) do |html|
       html << (error_messages_for :item, :header_tag => 'h3')
       html << '<ul>'
+
       fields.each do |key, value|
         if template = @resource[:class].typus_template(key)
           html << typus_template_field(key, template, options)
@@ -23,6 +24,7 @@ module Admin::FormHelper
         when :password:        html << typus_password_field(key)
         when :selector:        html << typus_selector_field(key)
         when :text:            html << typus_text_field(key)
+        when :tiny_mce:        html << typus_tiny_mce_field(key)
         when :time:            html << typus_time_field(key, options)
         when :tree:            html << typus_tree_field(key)
         else
@@ -137,6 +139,13 @@ module Admin::FormHelper
     HTML
   end
 
+  def typus_tiny_mce_field(attribute)
+    <<-HTML
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
+#{text_area :item, attribute, :class => 'mceEditor', :disabled => attribute_disabled?(attribute)}</li>
+    HTML
+  end
+
   def typus_time_field(attribute, options)
     <<-HTML
 <li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
@@ -225,7 +234,7 @@ module Admin::FormHelper
 <a name="#{field}"></a>
 <div class="box_relationships">
   <h2>
-  #{link_to model_to_relate.human_name.pluralize, { :controller => "admin/#{model_to_relate_as_resource}", foreign_key => @item.id }, :title => _("{{model}} filtered by {{filtered_by}}", :model => model_to_relate.human_name.pluralize, :filtered_by => @item.typus_name)}
+  #{link_to model_to_relate.typus_human_name.pluralize, { :controller => "admin/#{model_to_relate_as_resource}", foreign_key => @item.id }, :title => _("{{model}} filtered by {{filtered_by}}", :model => model_to_relate.typus_human_name.pluralize, :filtered_by => @item.typus_name)}
   <small>#{link_to _("Add new"), link_options if @current_user.can_perform?(model_to_relate, 'create')}</small>
   </h2>
       HTML
@@ -246,7 +255,7 @@ module Admin::FormHelper
                            association)
       else
         html << <<-HTML
-  <div id="flash" class="notice"><p>#{_("There are no {{records}}.", :records => model_to_relate.human_name.pluralize.downcase)}</p></div>
+  <div id="flash" class="notice"><p>#{_("There are no {{records}}.", :records => model_to_relate.typus_human_name.pluralize.downcase)}</p></div>
         HTML
       end
       html << <<-HTML
@@ -268,7 +277,7 @@ module Admin::FormHelper
 <a name="#{field}"></a>
 <div class="box_relationships">
   <h2>
-  #{link_to model_to_relate.human_name.pluralize, :controller => "admin/#{model_to_relate_as_resource}"}
+  #{link_to model_to_relate.typus_human_name.pluralize, :controller => "admin/#{model_to_relate_as_resource}"}
   <small>#{link_to _("Add new"), :controller => field, :action => 'new', :back_to => @back_to, :resource => @resource[:self], :resource_id => @item.id if @current_user.can_perform?(model_to_relate, 'create')}</small>
   </h2>
       HTML
@@ -291,7 +300,7 @@ module Admin::FormHelper
                            association)
       else
         html << <<-HTML
-  <div id="flash" class="notice"><p>#{_("There are no {{records}}.", :records => model_to_relate.human_name.pluralize.downcase)}</p></div>
+  <div id="flash" class="notice"><p>#{_("There are no {{records}}.", :records => model_to_relate.typus_human_name.pluralize.downcase)}</p></div>
         HTML
       end
       html << <<-HTML
@@ -313,7 +322,7 @@ module Admin::FormHelper
 <a name="#{field}"></a>
 <div class="box_relationships">
   <h2>
-  #{link_to model_to_relate.human_name, :controller => "admin/#{model_to_relate_as_resource}"}
+  #{link_to model_to_relate.typus_human_name, :controller => "admin/#{model_to_relate_as_resource}"}
   </h2>
       HTML
       items = Array.new
@@ -328,7 +337,7 @@ module Admin::FormHelper
                            association)
       else
         html << <<-HTML
-  <div id="flash" class="notice"><p>#{_("There is no {{records}}.", :records => model_to_relate.human_name.downcase)}</p></div>
+  <div id="flash" class="notice"><p>#{_("There is no {{records}}.", :records => model_to_relate.typus_human_name.downcase)}</p></div>
         HTML
       end
       html << <<-HTML

data/app/helpers/admin/master_helper.rb

@@ -9,7 +9,7 @@ module Admin::MasterHelper
   def display_link_to_previous # (_params = params)
 
     options = {}
-    options[:resource_from] = @resource[:class].human_name
+    options[:resource_from] = @resource[:class].typus_human_name
     options[:resource_to] = params[:resource].classify.humanize if params[:resource]
 
     editing = %w( edit update ).include?(params[:action])

data/app/helpers/admin/sidebar_helper.rb

@@ -171,7 +171,7 @@ function surfto_#{model_pluralized}(form) {
 <!-- /Embedded JS -->
 <p><form class="form" action="#">
   <select name="#{model_pluralized}" onChange="surfto_#{model_pluralized}(this.form)">
-    <option value="#{url_for params_without_filter}">#{_("filter by")} #{_(model.human_name)}</option>
+    <option value="#{url_for params_without_filter}">#{_("filter by")} #{_(model.typus_human_name)}</option>
     #{items.join("\n")}
   </select>
 </form></p>

data/app/helpers/admin/table_helper.rb

@@ -5,7 +5,7 @@ module Admin::TableHelper
     returning(String.new) do |html|
 
       html << <<-HTML
-<table>
+<table class="typus">
       HTML
 
       html << typus_table_header(model, fields)
@@ -55,8 +55,8 @@ module Admin::TableHelper
                                                             :resource => model, 
                                                             :resource_id => item.id }, 
                                                             :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
-                                                                          :unrelate_model => model.human_name, 
-                                                                          :unrelate_model_from => @resource[:class].human_name)
+                                                                          :unrelate_model => model.typus_human_name, 
+                                                                          :unrelate_model_from => @resource[:class].typus_human_name)
         end
 
         html << <<-HTML

data/app/helpers/typus_helper.rb

@@ -15,7 +15,7 @@ module TypusHelper
         next if available.compact.empty?
 
         html << <<-HTML
-<table>
+<table class="typus">
 <tr>
 <th colspan="2">#{app}</th>
 </tr>
@@ -27,7 +27,7 @@ module TypusHelper
           new_admin_item_path = { :controller => "admin/#{model.tableize}", :action => 'new'}
           html << <<-HTML
 <tr class="#{cycle('even', 'odd')}">
-<td>#{link_to _(model.constantize.human_name.pluralize), admin_items_path}<br /><small>#{description}</small></td>
+<td>#{link_to model.constantize.typus_human_name.pluralize, admin_items_path}<br /><small>#{description}</small></td>
 <td class="right"><small>
 #{link_to _("Add"), new_admin_item_path if @current_user.can_perform?(model, 'create')}
 </small></td>
@@ -58,7 +58,7 @@ module TypusHelper
     returning(String.new) do |html|
 
       html << <<-HTML
-<table>
+<table class="typus">
 <tr>
 <th colspan="2">#{_("Resources")}</th>
 </tr>
@@ -93,7 +93,8 @@ module TypusHelper
     resources_partials_path = 'admin/resources'
 
     partials = ActionController::Base.view_paths.map do |view_path|
-      Dir["#{Rails.root}/#{view_path}/#{partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
+      path = Rails.vendor_rails? ? view_path.path : "#{Rails.root}/#{view_path}"
+      Dir["#{path}/#{partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
     end.flatten
     resources_partials = Dir["#{Rails.root}/app/views/#{resources_partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
 
@@ -109,24 +110,28 @@ module TypusHelper
 
   def page_title(action = params[:action])
     crumbs = [ ]
-    crumbs << @resource[:class].human_name.pluralize if @resource
+    crumbs << @resource[:class].typus_human_name.pluralize if @resource
     crumbs << _(action.humanize) unless %w( index ).include?(action)
     return "#{Typus::Configuration.options[:app_name]} - " + crumbs.compact.map { |x| x }.join(' &rsaquo; ')
   end
 
   def header
 
-    if ActionController::Routing::Routes.named_routes.routes.keys.include?(:root)
-      link_to_site = "<li>#{link_to _("View site"), root_path, :target => 'blank'}</li>"
+    links = []
+    links << "<li>#{link_to_unless_current _("Dashboard"), admin_dashboard_path}</li>"
+
+    Typus.models_on_header.each do |model|
+      links << "<li>#{link_to_unless_current model.constantize.typus_human_name.pluralize, :controller => "/admin/#{model.tableize}"}</li>"
     end
 
-    link_to_dashboard = "<li>#{link_to _("Dashboard"), admin_dashboard_path}</li>"
+    if ActionController::Routing::Routes.named_routes.routes.keys.include?(:root)
+      links << "<li>#{link_to _("View site"), root_path, :target => 'blank'}</li>"
+    end
 
     <<-HTML
 <h1>#{Typus::Configuration.options[:app_name]}</h1>
 <ul>
-  #{link_to_dashboard}
-  #{link_to_site}
+#{links.join("\n")}
 </ul>
     HTML
 

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

@@ -5,7 +5,7 @@
 
 <%= display_link_to_previous if params[:back_to] %>
 
-<h2><%= link_to _(@resource[:class].human_name.pluralize), :action => 'index' %> &rsaquo;
+<h2><%= link_to @resource[:class].typus_human_name.pluralize, :action => 'index' %> &rsaquo;
     <%= _("Edit") %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'edit' %>

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

@@ -5,7 +5,7 @@
   <%= filters %>
 <% end %>
 
-<h2><%= _(@resource[:class].human_name.pluralize) %> <%= remove_filter_link %></h2>
+<h2><%= @resource[:class].typus_human_name.pluralize %> <%= remove_filter_link %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'index' %>
 
@@ -15,9 +15,9 @@
 <% else %>
   <div id="flash" class="notice">
     <% if @resource[:class].count.zero? %>
-      <p><%= _("There are no {{records}}.", :records => @resource[:class].human_name.pluralize.downcase) %></p>
+      <p><%= _("There are no {{records}}.", :records => @resource[:class].typus_human_name.pluralize.downcase) %></p>
     <% else %>
-      <p><%= _("There are no {{records}} under this filter.", :records => @resource[:class].human_name.pluralize.downcase) %></p>
+      <p><%= _("There are no {{records}} under this filter.", :records => @resource[:class].typus_human_name.pluralize.downcase) %></p>
     <% end %>
   </div>
 <% end %>

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

@@ -5,7 +5,7 @@
 
 <%= display_link_to_previous if params[:back_to] %>
 
-<h2><%= link_to _(@resource[:class].human_name.pluralize), :action => 'index' %> &rsaquo; 
+<h2><%= link_to @resource[:class].typus_human_name.pluralize, :action => 'index' %> &rsaquo; 
     <%= _("New") %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'new' %>

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

@@ -3,7 +3,7 @@
   <%= actions %>
 <% end %>
 
-<h2><%= link_to _(@resource[:class].human_name.pluralize), :action => 'index' %> &rsaquo; 
+<h2><%= link_to @resource[:class].typus_human_name.pluralize, :action => 'index' %> &rsaquo; 
     <%= _("Show") %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'show' %>

data/app/views/layouts/admin.html.erb

@@ -14,6 +14,7 @@
   <%= yield :stylesheets -%>
 
   <%= javascript_include_tag 'admin/application' %>
+  <%= include_tiny_mce_if_needed %>
   <%= yield :javascripts -%>
 
 </head>

data/config/locales/{es.yml → typus/es.yml}

@@ -1,3 +1,6 @@
+# Spanish translations for Typus
+# by Felipe Talavera <http://github.com/flype>
+
 es:
   "Email": "Correo"
   "Password": "Contraseña"
@@ -87,10 +90,10 @@ es:
   "Have a nice day": "Que tengas un buen dia."
   "Reset password": "Cambiar contraseña"
   "Add new": "Añadir nuevo"
-  "Do you want to cancel it?": " ¿Quieres cancelarlo? "
+  "Do you want to cancel it?": "¿Quieres cancelarlo?"
   "Click here": "Pulsa aquí"
   "Are you sure you want to leave this page?": "¿Estas seguro que quieres abandonar esta página?"
-  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost":   "Si has relizado algún cambio en los campos sin pulsar en el botón de Guardar/Actualizar, tus cambios se perderán."
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Si has relizado algún cambio en los campos sin pulsar en el botón de Guardar/Actualizar, tus cambios se perderán."
   "Click OK to continue, or click Cancel to stay on this page": "Pulse OK para continuar, o pulse Cancelar para permanecer en esta página."
   "Remove entry?": "¿Borrar entrada?"
   "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?"
@@ -100,4 +103,7 @@ es:
   "Past 7 days": "Últimos 7 dias"
   "This month": "Este mes"
   "This year": "Este año"
-  "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
+  "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
+  "True": "Verdadero"
+  "False": "Falso"
+  "Set language to": "Idioma"

data/config/locales/typus/language.yml.template

@@ -0,0 +1,113 @@
+##
+# This is the complete translating yaml reference for Typus.
+##
+
+# <language> translations for Typus
+# by <your_name> <contact_form>
+
+<language>:
+  "Email": 
+  "Password": 
+  "Password confirmation": 
+  "Sign in": 
+  "Recover password": 
+  "Sign up": 
+  "Enter your email below to create the first user": 
+  "That doesn't seem like a valid email address": 
+  "I remember my password": 
+  "Password recovery link sent to your email": 
+  "Passwords don't match": 
+  "A valid token is required": 
+  "The email and/or password you entered is invalid": 
+  "There are not defined applications in config/typus/*.yml": 
+  "Overview": 
+  "Options": 
+  "Password confirm": 
+  "Change password": 
+  "There are no {{records}}": 
+  "There are no {{records}} under this filter": 
+  "Dashboard": 
+  "Create entry": 
+  "Update entry": 
+  "New": 
+  "Show": 
+  "Edit": 
+  "Login": 
+  "Setup": 
+  "Create": 
+  "Sign out": 
+  "Update": 
+  "View site": 
+  "Logged as": 
+  "Remove filter": 
+  "Back to list": 
+  "Actions": 
+  "Add": 
+  "&larr; Previous": 
+  "Next &rarr;": 
+  "Previous": 
+  "Next": 
+  "Search": 
+  "Search by": 
+  "{{model}} successfully updated": 
+  "{{model}} successfully created": 
+  "{{model}} successfully removed": 
+  "{{model}} {{attribute}} changed": 
+  "You're adding a new {{resource_from}} to {{resource_to}}": 
+  "You're adding a new {{resource_from}}": 
+  "You're updating a {{resource_from}} for {{resource_to}}": 
+  "You're updating a {{resource_from}}": 
+  "Toggle is disabled": 
+  "Record moved {{to}}": 
+  "{{model_a}} related to {{model_b}}": 
+  "{{model_a}} successfully assigned to {{model_b}}": 
+  "{{model_a}} unrelated from {{model_b}}": 
+  "{{model_a}} removed from {{model_b}}": 
+  "Your new password is {{password}}": 
+  "Add entry": 
+  "Go to": 
+  "First name": 
+  "Last name": 
+  "Roles": 
+  "Status": 
+  "Typus User": 
+  "System Users Administration": 
+  "Resources": 
+  "Up": 
+  "Down": 
+  "filter by": 
+  "Checked if active": 
+  "As you're not the admin or the owner of this record you cannot edit it": 
+  "You can't change your role": 
+  "Error! Typus User or role doesn't exist": 
+  "You can't toggle your status": 
+  "You're not allowed to toggle status": 
+  "You can't remove yourself": 
+  "You're not allowed to remove Typus Users": 
+  "{{current_user_role}} can't perform action. ({{action}})": 
+  "{{current_user_role}} can't go to {{action}} on {{controller}}": 
+  "{{current_user_role}} can't delete this item": 
+  "{{current_user_role}} can't perform action ({{action}})": 
+  "{{current_user_role}} can't display items": 
+  "You can update your password at": 
+  "If you didn't request a password update, you can ignore this message": 
+  "Have a nice day": 
+  "Reset password": 
+  "Add new": 
+  "Do you want to cancel it?": 
+  "Click here": 
+  "Are you sure you want to leave this page?": 
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": 
+  "Click OK to continue, or click Cancel to stay on this page": 
+  "Remove entry?": 
+  "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": 
+  "Change {{attribute}}?": 
+  "Set language": 
+  "Today": 
+  "Past 7 days": 
+  "This month": 
+  "This year": 
+  "{{model}} filtered by {{filtered_by}}": 
+  "True": 
+  "False": 
+  "Set language to": 

data/config/locales/{pt-BR.yml → typus/pt-BR.yml}

@@ -1,3 +1,6 @@
+# Portuguese (pt-br) translations for Typus
+# by George Guimarães <http://github.com/georgeguimaraes>
+
 pt-BR:
   "Email": "Email"
   "Password": "Senha"
@@ -102,4 +105,7 @@ pt-BR:
   "This year": "Este ano"
   "Created at": "Criado em"
   "Updated at": "Atualizado em"
-  "{{model}} filtered by {{filtered_by}}": 
+  "{{model}} filtered by {{filtered_by}}": 
+  "True": 
+  "False": 
+  "Set language to": 

data/config/locales/{ru.yml → typus/ru.yml}

@@ -1,3 +1,6 @@
+# Russian (ru) translations for Typus
+# by Alexey Noskov <http://github.com/alno>
+
 ru:
   "Email": "E-Mail"
   "Password": "Пароль"
@@ -102,4 +105,7 @@ ru:
   "This year": "Этот год"
   "Created at": "Создано"
   "Updated at": "Обновлено"
-  "{{model}} filtered by {{filtered_by}}": 
+  "{{model}} filtered by {{filtered_by}}": 
+  "True": 
+  "False": 
+  "Set language to": 

data/generators/typus/templates/config/initializers/typus.rb

@@ -22,8 +22,12 @@ Typus::Configuration.options[:app_name] = '<%= application %>'
 # Typus::Configuration.options[:index_after_save] = true
 # Typus::Configuration.options[:minute_step] = 5
 # Typus::Configuration.options[:nil] = 'nil'
+# Typus::Configuration.options[:on_header] = false
 # Typus::Configuration.options[:only_user_items] = false
 # Typus::Configuration.options[:per_page] = 15
 # Typus::Configuration.options[:sidebar_selector] = 5
 # Typus::Configuration.options[:start_year] = Time.now.year - 10
+# Typus::Configuration.options[:tiny_mce] = { :theme => 'advanced',
+#                                             :theme_advanced_toolbar_location => 'top',
+#                                             :theme_advanced_toolbar_align => 'left' }
 # Typus::Configuration.options[:toggle] = true

data/generators/typus/templates/config/typus/application.yml

@@ -9,6 +9,14 @@
 #     show: title, category, is_published?
 #     relationship: title, status
 #     options:
+#       tiny_mce:
+#         fields: body
+#         options:
+#           theme: simple
+#           theme_advanced_buttons3_add:
+#             - fulscreen
+#           plugins: 
+#             - fulscreen
 #       auto_generated:
 #       booleans:
 #         is_published: ["Yes, it is", "No, it isn't"]
@@ -35,6 +43,7 @@
 #     index_after_save: false
 #     minute_step: 15
 #     nil: 'nil'
+#     on_header: true
 #     only_user_items: true
 #     per_page: 5
 #     sidebar_selector: 5

data/generators/typus/templates/public/stylesheets/admin/screen.css

@@ -205,12 +205,12 @@ a.on {
     padding: 0em 1em;
   }
 
-  #content table {
+  #content table.typus {
     margin: 1em 0em;
     background: #000;
   }
 
-  #content h2+table {
+  #content h2+table.typus {
     margin: 0em; /* Here we overwrite a preference */
   }
 
@@ -364,21 +364,21 @@ a.on {
 
 /* @group Content Tables */
 
-#content table {
+#content table.typus {
   width: 100%;
 }
 
-  #content table small {
+  #content table.typus small {
     font-size: 0.8em;
   }
 
-  #content table th {
+  #content table.typus th {
     color: #FFF;
     font-weight: normal;
     padding: 4px;
   }
 
-    #content table th a {
+    #content table.typus th a {
       color: #FFF!important;
     }
 
@@ -386,30 +386,30 @@ a.on {
 
     #content .desc { background: transparent url(/images/admin/arrow_down.gif) no-repeat right center; }
 
-  #content table td.right {
+  #content table.typus td.right {
     text-align: right;
   }
 
-  #content table tr.even {
+  #content table.typus tr.even {
     background: #FFF!important;
   }
 
-    #content table tr.even:hover,
-    #content table tr.odd:hover {
+    #content table.typus tr.even:hover,
+    #content table.typus tr.odd:hover {
       background: #000!important;
       color: #FFF;
     }
 
-    #content table tr.even:hover a,
-    #content table tr.odd:hover a {
+    #content table.typus tr.even:hover a,
+    #content table.typus tr.odd:hover a {
       color: #FFF!important;
     }
 
-  #content table tr.odd {
+  #content table.typus tr.odd {
     background: #F5F5F5;
   }
 
-  #content table td {
+  #content table.typus td {
     border: none;
     font-weight: normal;
     padding: 3px 4px;

data/generators/typus/typus_generator.rb

@@ -22,7 +22,7 @@ class TypusGenerator < Rails::Generator::Base
         class_name = model.sub(/\.rb$/,'').classify
         begin
           klass = class_name.constantize
-          active_record_model = klass.superclass.equal?(ActiveRecord::Base)
+          active_record_model = klass.superclass.equal?(ActiveRecord::Base) && !klass.abstract_class?
           active_record_model_with_sti = klass.superclass.superclass.equal?(ActiveRecord::Base)
           ar_models << klass if active_record_model || active_record_model_with_sti
         rescue Exception => error
@@ -40,32 +40,37 @@ class TypusGenerator < Rails::Generator::Base
 
       configuration = { :base => '', :roles => '' }
 
-      ar_models.each do |model|
+      ar_models.sort{ |x,y| x.class_name <=> y.class_name }.each do |model|
 
-        # By default we don't want to show in our lists text fields and created_at
-        # and updated_at attributes.
-        list = model.columns.reject { |c| c.sql_type == 'text' || %w( created_at updated_at ).include?(c.name) }.map(&:name)
+        # Detect all relationships except polymorphic belongs_to using reflection.
+        relationships = [ :belongs_to, :has_and_belongs_to_many, :has_many, :has_one ].map do |relationship|
+                          model.reflect_on_all_associations(relationship).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
+                        end.flatten.sort
 
-        # By default we don't want to show in our forms created_at and updated_at 
-        # attributes.
-        form = model.columns.reject { |c| %w( id created_at updated_at ).include?(c.name) }.map(&:name)
+        # Remove foreign key and polymorphic type attributes
+        reject_columns = []
+        model.reflect_on_all_associations(:belongs_to).each do |i|
+          reject_columns << model.columns_hash[i.name.to_s + '_id']
+          reject_columns << model.columns_hash[i.name.to_s + '_type'] if i.options[:polymorphic]
+        end
 
-        # By default we want to show all model columns in the show action.
-        show = model.columns.map(&:name)
+        model_columns = model.columns - reject_columns
 
-        # Detect relationships using reflection and remove the _id part from 
-        # attributes when relationships is defined in ActiveRecord.
-        list.each do |i|
-          if i.include?('_id')
-            assoc_name = model.reflect_on_association(i.gsub(/_id/, '').to_sym).macro rescue nil
-            i.gsub!(/_id/, '') if assoc_name == :belongs_to
-          end
-        end
+        # Don't show `text` fields and timestamps in lists.
+        list = model_columns.reject { |c| c.sql_type == 'text' || %w( created_at updated_at ).include?(c.name) }.map(&:name)
 
-        # Detect relationships using reflection.
-        relationships = [ :belongs_to, :has_and_belongs_to_many, :has_many, :has_one ].map do |relationship|
-                          model.reflect_on_all_associations(relationship).map { |i| i.name.to_s }
-                        end.flatten.sort
+        # Don't show timestamps in forms.
+        form = model_columns.reject { |c| %w( id created_at updated_at ).include?(c.name) }.map(&:name)
+
+        # Show all model columns in the show action.
+        show = model_columns.map(&:name)
+
+        # We want attributes of belongs_to relationships to be shown in our 
+        # field collections if those are not polymorphic.
+        [ list, form, show ].each do |fields|
+          fields << model.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
+          fields.flatten!
+        end
 
         configuration[:base] << <<-RAW
 #{model}:
@@ -75,6 +80,9 @@ class TypusGenerator < Rails::Generator::Base
     show: #{show.join(', ')}
     relationship:
     options:
+      tiny_mce:
+        fields:
+        options:
       auto_generated:
       read_only:
       selectors:

data/lib/typus/active_record.rb

@@ -21,6 +21,20 @@ module Typus
       return hash
     end
 
+    ##
+    # This method is used to change a Rails behavior.
+    #
+    #   typus $ script/console
+    #   Loading development environment (Rails 2.3.2)
+    #   >> TypusUser.human_name
+    #   => "Typususer"
+    #   >> TypusUser.typus_human_name
+    #   => "Typus user"
+    #
+    def typus_human_name
+      human_name(:default => self.name.underscore.humanize)
+    end
+
     ##
     # Form and list fields
     #
@@ -59,6 +73,10 @@ module Typus
             attribute_type = :selector
           end
 
+          if typus_tiny_mce_fields.include?(field.to_s)
+            attribute_type = :tiny_mce
+          end
+
           # And finally insert the field and the attribute_type 
           # into the fields_with_type ordered hash.
           fields_with_type[field.to_s] = attribute_type
@@ -74,6 +92,24 @@ module Typus
 
     end
 
+    ##
+    # Return tiny_mce options of the model merged into the default options
+    #
+    def typus_tiny_mce_options
+      typus_options_for(:tiny_mce).merge(Typus::Configuration.config[name]['fields']['options']['tiny_mce']['options'].symbolize_keys.delete_if { |key,value| value == nil})
+    rescue
+      typus_options_for(:tiny_mce)
+    end
+
+    ##
+    #  Tiny_mce fields of the model
+    #
+    def typus_tiny_mce_fields
+      Typus::Configuration.config[name]['fields']['options']['tiny_mce']['fields'].split(', ')
+    rescue
+      []
+    end
+
     ##
     # Typus sidebar filters.
     #
@@ -234,10 +270,10 @@ module Typus
           conditions = merge_conditions(conditions, condition)
         when :datetime
           interval = case value
-                     when 'today':         Time.today..Time.today.tomorrow
-                     when 'past_7_days':   6.days.ago.midnight..Time.today.tomorrow
-                     when 'this_month':    Time.today.last_month..Time.today.tomorrow
-                     when 'this_year':     Time.today.last_year..Time.today.tomorrow
+                     when 'today':         Time.new.midnight..Time.new.midnight.tomorrow
+                     when 'past_7_days':   6.days.ago.midnight..Time.new.midnight.tomorrow
+                     when 'this_month':    Time.new.midnight.last_month..Time.new.midnight.tomorrow
+                     when 'this_year':     Time.new.midnight.last_year..Time.new.midnight.tomorrow
                      end
           condition = ["#{key} BETWEEN ? AND ?", interval.first.to_s(:db), interval.last.to_s(:db)]
           conditions = merge_conditions(conditions, condition)
@@ -262,8 +298,8 @@ module Typus
 
     def previous_and_next(condition = {}, klass = self.class)
 
-      previous_conditions = "id < #{id}"
-      next_conditions = "id > #{id}"
+      previous_conditions = "#{klass.primary_key} < #{id}"
+      next_conditions = "#{klass.primary_key} > #{id}"
 
       if !condition.empty?
         conditions, joins = klass.build_conditions(condition)
@@ -272,13 +308,13 @@ module Typus
       end
 
       previous_ = klass.find :first, 
-                             :select => [:id], 
-                             :order => "id DESC", 
+                             :select => [klass.primary_key], 
+                             :order => "#{klass.primary_key} DESC", 
                              :conditions => previous_conditions
 
       next_ = klass.find :first, 
-                         :select => [:id], 
-                         :order => "id ASC", 
+                         :select => [klass.primary_key], 
+                         :order => "#{klass.primary_key} ASC", 
                          :conditions => next_conditions
 
       return previous_, next_

data/lib/typus/configuration.rb

@@ -40,10 +40,14 @@ module Typus
                       :index_after_save => false, 
                       :minute_step => 5, 
                       :nil => 'nil', 
+                      :on_header => false, 
                       :only_user_items => false, 
                       :per_page => 15, 
                       :sidebar_selector => 5, 
                       :start_year => nil, 
+                      :tiny_mce => { :theme => 'advanced',
+                                     :theme_advanced_toolbar_location => 'top',
+                                     :theme_advanced_toolbar_align => 'left' }, 
                       :toggle => true }
 
     @@options = typus_options.merge(model_options)

data/lib/typus.rb

@@ -33,6 +33,10 @@ module Typus
       Typus::Configuration.config.map { |i| i.first }.sort
     end
 
+    def models_on_header
+      models.collect { |m| m if m.constantize.typus_options_for(:on_header) }.compact
+    end
+
     ##
     # Return a list of resources, which are models tableless.
     #

data/tasks/typus_tasks.rake

@@ -8,6 +8,18 @@ namespace :typus do
     system "script/plugin install #{plugins.join(' ')} --force"
   end
 
+  desc 'Install ssl_requirement.'
+  task :ssl do
+    system "script/plugin install git://github.com/rails/ssl_requirement.git --force"
+  end
+
+  desc 'Install tiny_mce.'
+  task :tiny_mce do
+    system "script/plugin install git://github.com/kete/tiny_mce.git --force"
+    load File.join Rails.root, 'vendor', 'plugins', 'tiny_mce', 'tasks', 'tiny_mce.rake'
+    Rake::Task["tiny_mce:install"].invoke
+  end
+
   desc 'List current roles.'
   task :roles => :environment do
     Typus::Configuration.roles.each do |role|
@@ -17,10 +29,4 @@ namespace :typus do
     puts "\n"
   end
 
-  desc 'Install ssl_requirement.'
-  task :ssl do
-    plugins = [ 'git://github.com/rails/ssl_requirement.git' ]
-    system "script/plugin install #{plugins.join(' ')} --force"
-  end
-
-end
+end

data/test/config/working/application.yml

@@ -37,6 +37,7 @@ Page:
   filters: is_published?
   options:
     form_rows: 25
+    on_header: true
 
 Post:
   fields:

data/test/helpers/typus_helper_test.rb

@@ -36,13 +36,15 @@ class TypusHelperTest < ActiveSupport::TestCase
     # ActionView::Helpers::UrlHelper does not support strings, which are returned by named routes
     # link root_path
     self.stubs(:link_to).returns(%(<a href="/">View site</a>))
+    self.stubs(:link_to_unless_current).returns(%(<a href="/admin/dashboard">Dashboard</a>))
 
     output = header
     expected = <<-HTML
 <h1>#{Typus::Configuration.options[:app_name]}</h1>
 <ul>
-  <li><a href="/">View site</a></li>
-  <li><a href="/">View site</a></li>
+<li><a href="/admin/dashboard">Dashboard</a></li>
+<li><a href="/admin/dashboard">Dashboard</a></li>
+<li><a href="/">View site</a></li>
 </ul>
     HTML
 
@@ -55,14 +57,14 @@ class TypusHelperTest < ActiveSupport::TestCase
     # Remove root route from list
     ActionController::Routing::Routes.named_routes.routes.reject! {|key, route| key == :root }
 
-    self.stubs(:link_to).returns(%(<a href="/admin/dashboard">Dashboard</a>))
+    self.stubs(:link_to_unless_current).returns(%(<a href="/admin/dashboard">Dashboard</a>))
 
     output = header
     expected = <<-HTML
 <h1>#{Typus::Configuration.options[:app_name]}</h1>
 <ul>
-  <li><a href="/admin/dashboard">Dashboard</a></li>
-  
+<li><a href="/admin/dashboard">Dashboard</a></li>
+<li><a href="/admin/dashboard">Dashboard</a></li>
 </ul>
     HTML
 

data/test/lib/active_record_test.rb

@@ -166,6 +166,11 @@ class ActiveRecordTest < ActiveSupport::TestCase
     assert_equal 10, TypusUser.typus_options_for(:form_rows)
     assert_equal 10, TypusUser.typus_options_for('form_rows')
 
+    assert Page.typus_options_for(:on_header)
+    assert !TypusUser.typus_options_for(:on_header)
+
+    assert_nil TypusUser.typus_options_for(:unexisting)
+
   end
 
   def test_should_verify_typus_boolean_is_an_instance_of_active_support_ordered_hash
@@ -268,9 +273,9 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{Time.today.to_s(:db)}' AND E'#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{Time.new.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{Time.today.to_s(:db)}' AND '#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{Time.new.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
     params = { :created_at => 'today' }
     assert_equal expected, TypusUser.build_conditions(params).first
@@ -278,9 +283,9 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{6.days.ago.midnight.to_s(:db)}' AND E'#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{6.days.ago.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{6.days.ago.midnight.to_s(:db)}' AND '#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{6.days.ago.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
     params = { :created_at => 'past_7_days' }
     assert_equal expected, TypusUser.build_conditions(params).first
@@ -288,18 +293,18 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{Time.today.last_month.to_s(:db)}' AND E'#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{Time.new.midnight.last_month.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{Time.today.last_month.to_s(:db)}' AND '#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{Time.new.midnight.last_month.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
     params = { :created_at => 'this_month' }
     assert_equal expected, TypusUser.build_conditions(params).first
 
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{Time.today.last_year.to_s(:db)}' AND E'#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{Time.new.midnight.last_year.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{Time.today.last_year.to_s(:db)}' AND '#{Time.today.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{Time.new.midnight.last_year.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
     params = { :created_at => 'this_year' }
     assert_equal expected, TypusUser.build_conditions(params).first
@@ -309,9 +314,9 @@ class ActiveRecordTest < ActiveSupport::TestCase
   def test_should_return_sql_conditions_on_filtering_posts_by_published_at
     expected = case ENV['DB']
                when /postgresql/
-                 "(published_at BETWEEN E'#{Time.today.to_s(:db)}' AND E'#{Time.today.tomorrow.to_s(:db)}')"
+                 "(published_at BETWEEN E'#{Time.new.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(published_at BETWEEN '#{Time.today.to_s(:db)}' AND '#{Time.today.tomorrow.to_s(:db)}')"
+                 "(published_at BETWEEN '#{Time.new.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
     params = { :published_at => 'today' }
     assert_equal expected, Post.build_conditions(params).first
@@ -364,8 +369,8 @@ class ActiveRecordTest < ActiveSupport::TestCase
    assert_equal 'datepicker', Post.typus_template('published_at')
    assert_equal 'datepicker', Post.typus_template(:published_at)
 
-   assert_equal nil, Post.typus_template('created_at')
-   assert_equal nil, Post.typus_template('unknown')
+   assert_nil Post.typus_template('created_at')
+   assert_nil Post.typus_template('unknown')
 
   end
 

data/test/lib/configuration_test.rb

@@ -25,16 +25,17 @@ class ConfigurationTest < ActiveSupport::TestCase
     initializer = "#{Rails.root}/config/initializers/typus.rb"
     return if File.exist?(initializer)
     assert_equal 'edit', Typus::Configuration.options[:default_action_on_item]
-    assert_equal nil, Typus::Configuration.options[:end_year]
+    assert_nil Typus::Configuration.options[:end_year]
     assert_equal 10, Typus::Configuration.options[:form_rows]
     assert_equal true, Typus::Configuration.options[:icon_on_boolean]
     assert_equal false, Typus::Configuration.options[:index_after_save]
     assert_equal 5, Typus::Configuration.options[:minute_step]
     assert_equal 'nil', Typus::Configuration.options[:nil]
+    assert_equal false, Typus::Configuration.options[:on_header]
     assert_equal false, Typus::Configuration.options[:only_user_items]
     assert_equal 15, Typus::Configuration.options[:per_page]
     assert_equal 5, Typus::Configuration.options[:sidebar_selector]
-    assert_equal nil, Typus::Configuration.options[:start_year]
+    assert_nil Typus::Configuration.options[:start_year]
     assert_equal true, Typus::Configuration.options[:toggle]
   end
 

data/test/lib/typus_test.rb

@@ -43,6 +43,11 @@ class TypusTest < ActiveSupport::TestCase
     assert_equal %w( Asset Category Comment CustomUser Page Post TypusUser ), Typus.models
   end
 
+  def test_should_return_an_array_of_models_on_header
+    assert Typus.models_on_header.kind_of?(Array)
+    assert_equal ["Page"], Typus.models_on_header
+  end
+
   def test_should_verify_resources_class_method
     assert Typus.respond_to?(:resources)
     models = Typus.models

data/typus.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-06-13}
+  s.date = %q{2009-06-30}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -43,10 +43,10 @@ Gem::Specification.new do |s|
      "app/views/typus/sign_in.html.erb",
      "app/views/typus/sign_up.html.erb",
      "app/views/typus_mailer/reset_password_link.erb",
-     "config/locales/es.yml",
-     "config/locales/pt-BR.yml",
-     "config/locales/ru.yml",
-     "config/locales/typus_hacks.yml",
+     "config/locales/typus/es.yml",
+     "config/locales/typus/language.yml.template",
+     "config/locales/typus/pt-BR.yml",
+     "config/locales/typus/ru.yml",
      "config/routes.rb",
      "generators/typus/templates/config/initializers/typus.rb",
      "generators/typus/templates/config/typus/application.yml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fesplugas-typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -07:00
+date: 2009-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -52,10 +52,10 @@ files:
 - app/views/typus/sign_in.html.erb
 - app/views/typus/sign_up.html.erb
 - app/views/typus_mailer/reset_password_link.erb
-- config/locales/es.yml
-- config/locales/pt-BR.yml
-- config/locales/ru.yml
-- config/locales/typus_hacks.yml
+- config/locales/typus/es.yml
+- config/locales/typus/language.yml.template
+- config/locales/typus/pt-BR.yml
+- config/locales/typus/ru.yml
 - config/routes.rb
 - generators/typus/templates/config/initializers/typus.rb
 - generators/typus/templates/config/typus/application.yml

data/config/locales/typus_hacks.yml

@@ -1,19 +0,0 @@
-en:
-  activerecord:
-    models:
-      typus_user: "Typus user"
-
-es:
-  activerecord:
-    models:
-      typus_user: "Typus user"
-
-pt-BR:
-  activerecord:
-    models:
-      typus_user: "Typus user"
-
-ru:
-  activerecord:
-    models:
-      typus_user: "Typus user"