typus 3.0.8 → 3.0.9

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

@@ -8,18 +8,14 @@
   <ul>
 
     <li>
-      <%= form.label :email, Typus.user_class.human_attribute_name(:email), :for => 'autofocus' %>
-      <%= form.text_field :email, :size => 20, :class => "text", :id => 'autofocus', :autofocus => 'autofocus' %>
+      <%= form.label :email, Typus.user_class.human_attribute_name(:email) %>
+      <%= form.text_field :email, :size => 20, :class => "text", :autofocus => 'autofocus' %>
     </li>
 
     <li>
-      <%= submit_tag Typus::I18n.t("Sign up"), :class => "button" %>
+      <%= submit_tag Typus::I18n.t("Sign up"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %>
     </li>
 
   </ul>
 
-  <script type="text/javascript">
-    (function() { document.getElementById('autofocus').focus(); })();
-  </script>
-
 <% end %>

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

@@ -4,4 +4,4 @@
 
 <p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>
 
-<p>If you need help you can use the provided <%= link_to "user guide", "user_guide" %>.</p>
+<p>If you need help you can use the provided <%= link_to "user guide", admin_user_guide_path %>.</p>

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

@@ -11,6 +11,12 @@
   <%= page_title %>
 </h2>
 
-<%= applications %>
+<% if admin_user.applications.any? %>
+  <%= render 'applications' %>
+<% else %>
+  <div class="notice">
+    No applications detected.
+  </div>
+<% end %>
 
 <%= resources(admin_user) %>

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

@@ -12,7 +12,7 @@
     %>
 
     <%
-      url = { :controller => apps.first.tableize }
+      url = { :controller => "/admin/#{apps.first.tableize}" }
       html_options = { :class => klass }
     %>
 

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

@@ -1,4 +1,4 @@
 <ul>
-  <li><%= Typus::I18n.t("Logged as") %> <%= link_to admin_user.name, { :controller => "/admin/#{Typus.user_class.to_resource}", :action => 'edit', :id => admin_user.id } %></li>
-  <li><%= link_to Typus::I18n.t("Sign out"), admin_session_path, :confirm => Typus::I18n.t("Are you sure you want to sign out and end your session?"), :method => :delete %></li>
+  <li><%= Typus::I18n.t("Logged as") %> <%= link_to admin_user.to_label, { :controller => "/admin/#{Typus.user_class.to_resource}", :action => 'edit', :id => admin_user.id } %></li>
+  <li><%= link_to Typus::I18n.t("Sign out"), admin_sign_out_path, :confirm => Typus::I18n.t("Are you sure you want to sign out and end your session?") %></li>
 </ul>

data/app/views/admin/helpers/filters/_filters.html.erb

@@ -10,7 +10,9 @@
         <%= hidden_field_tag key, value %>
       <% end %>
 
-      <li><%= submit_tag Typus::I18n.t("Filter"), :name => nil %></li>
+      <li><%= submit_tag Typus::I18n.t("Filter"),
+                         :name => nil,
+                         :disable_with => Typus::I18n.t("Sending data ...") %></li>
     </ul>
   </div>
 

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

@@ -4,13 +4,16 @@
 
   <fieldset class="inputs">
     <ol>
-      <%= raw build_form(@fields, form) %>
+      <%= build_form(fields, form) %>
     </ol>
   </fieldset>
 
   <fieldset class="buttons">
     <ol>
-      <li><%= submit_tag button, :class => "commit", :onclick => "setConfirmUnload(false);" %></li>
+      <li><%= submit_tag button,
+                         :class => "commit",
+                         :onclick => "setConfirmUnload(false);",
+                         :disable_with => Typus::I18n.t("Sending data ...") %></li>
     </ol>
   </fieldset>
 

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

@@ -23,4 +23,4 @@
 
 <%= render :partial => 'form', :locals => { :options => options, :button => button } %>
 
-<%= raw typus_relationships %>
+<%= typus_relationships %>

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

@@ -28,7 +28,7 @@
 <% end %>
 
 <% if @items.any? -%>
-  <%= raw build_list(@resource, @fields, @items) %>
+  <%= build_list(@resource, fields, @items) %>
   <%= will_paginate(@items, Typus.pagination) %>
 <% else %>
   <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>

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

@@ -14,10 +14,10 @@
 <%= render 'show' %>
 
 <dl>
-  <% build_display(@item, @fields).each do |attribute, type| %>
+  <% build_display(@item, fields).each do |attribute, type| %>
     <dt><%= attribute %></dt>
     <dd><%= type %></dd>
   <% end %>
 </dl>
 
-<%= raw typus_relationships %>
+<%= typus_relationships %>

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

@@ -8,8 +8,8 @@
   <ul>
 
     <li>
-      <%= form.label :email, Typus.user_class.human_attribute_name(:email), :for => 'autofocus' %>
-      <%= form.text_field :email, :size => 20, :class => "text", :id => 'autofocus', :autofocus => 'autofocus' %>
+      <%= form.label :email, Typus.user_class.human_attribute_name(:email) %>
+      <%= form.text_field :email, :size => 20, :class => "text", :autofocus => "autofocus" %>
     </li>
 
     <li>
@@ -18,13 +18,9 @@
     </li>
 
     <li>
-      <%= submit_tag Typus::I18n.t("Sign in"), :class => "button" %> <%= link_to Typus::I18n.t("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
+      <%= submit_tag Typus::I18n.t("Sign in"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %> <%= link_to Typus::I18n.t("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
     </li>
 
   </ul>
 
-  <script type="text/javascript">
-    (function() { document.getElementById('autofocus').focus(); })();
-  </script>
-
 <% end %>

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

@@ -1,4 +1,11 @@
+<%
+  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
+    html_options.merge!(:disabled => 'disabled')
+    message = Typus::I18n.t("Read only")
+  end
+%>
+
 <li id="<%= attribute %>">
-  <%= form.label related_fk, raw("#{label_text} <small>#{message}</small>") %>
+  <%= form.label related_fk, "#{label_text} <small>#{message}</small>".html_safe %>
   <%= form.select related_fk, values, options, html_options %>
 </li>

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

@@ -1,5 +1,5 @@
 <li id="<%= attribute %>">
-  <%= form.label related_fk, raw("#{label_text} <small>#{message}</small>") %>
+  <%= form.label related_fk, "#{label_text} <small>#{message}</small>".html_safe %>
   <%= form.hidden_field related_fk %>
   <input data-autocomplete="<%= "/admin/#{related.to_resource}/autocomplete" %>"
          id="autocomplete"

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

@@ -1,5 +1,5 @@
 <%= form_tag :action => :relate, :id => @item.id do %>
   <%= hidden_field :related, :model, :value => model_to_relate %>
   <%= hidden_field :related, :association_name, :value => association_name %>
-  <p><%= select :related, :id, items_to_relate.map { |f| [f.to_label, f.id] } %> &nbsp; <%= submit_tag Typus::I18n.t("Add"), :class => "button" %></p>
+  <p><%= select :related, :id, items_to_relate.map { |f| [f.to_label, f.id] } %> &nbsp; <%= submit_tag Typus::I18n.t("Assign"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %></p>
 <% end %>

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

@@ -15,7 +15,9 @@
                size="30"
                type="text"
                value="" />
-        <%= submit_tag Typus::I18n.t("Add"), :class => "button" %>
+        <%= submit_tag Typus::I18n.t("Assign"),
+                       :class => "button",
+                       :disable_with => Typus::I18n.t("Sending data ...") %>
       </li>
     </ol>
 

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

@@ -17,6 +17,6 @@
 %>
 
 <li id="<%= attribute %>">
-  <%= form.label attribute, raw(label_text) %>
+  <%= form.label attribute, label_text.html_safe %>
   <%= form.text_field attribute, options %>
 </li>

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

@@ -11,6 +11,6 @@
 %>
 
 <li id="<%= attribute %>">
-  <%= form.label attribute, raw(label_text) %>
+  <%= form.label attribute, label_text.html_safe %>
   <%= form.text_area attribute, options %>
 </li>

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

@@ -8,6 +8,8 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
+  <%= favicon_link_tag %>
+
   <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
   <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",

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

@@ -8,6 +8,8 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
+  <%= favicon_link_tag %>
+
   <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
   <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",

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

@@ -8,12 +8,18 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
+  <%= favicon_link_tag %>
+
   <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
   <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
                           "/vendor/typus/stylesheets/screen",
                           "/vendor/typus/stylesheets/application" %>
 
+  <%= javascript_include_tag "/vendor/jquery-ui-1.8.9.custom/js/jquery-1.4.4.min.js",
+                             "/vendor/typus/javascripts/jquery.rails.js",
+                             "/vendor/typus/javascripts/application" %>
+
   <%= csrf_meta_tag %>
 
 </head>

data/config/routes.rb

@@ -6,7 +6,10 @@ Rails.application.routes.draw do
     match "user_guide" => "base#user_guide"
 
     if Typus.authentication == :session
-      resource :session, :only => [:new, :create, :destroy], :controller => :session
+      resource :session, :only => [:new, :create], :controller => :session do
+        get :destroy, :as => "destroy"
+      end
+
       resources :account, :only => [:new, :create, :show, :forgot_password] do
         collection do
           get :forgot_password

data/lib/support/active_record.rb

@@ -6,16 +6,6 @@ class ActiveRecord::Base
     association.macro
   end
 
-  #--
-  #     >> Post.to_resource
-  #     => "posts"
-  #     >> Admin::User.to_resource
-  #     => "admin/users"
-  #++
-  def self.to_resource
-    name.underscore.pluralize
-  end
-
   #--
   # On a model:
   #

data/lib/support/fake_user.rb

@@ -24,12 +24,6 @@ class FakeUser
     ::I18n.locale
   end
 
-=begin
-  def resources
-    Typus::Configuration.roles[role].compact
-  end
-=end
-
   def applications
     Typus.applications
   end
@@ -46,4 +40,8 @@ class FakeUser
     true
   end
 
+  def owns?(resource)
+    true
+  end
+
 end

data/lib/support/object.rb

@@ -1,5 +1,9 @@
 class Object
 
+  ##
+  # TODO: Improve this code, which works, but probably there's a better way
+  #       to make the verification.
+  #
   # Probably there's a better way to verify if a model responds to an STI
   # pattern.
   def self.is_sti?

data/lib/support/string.rb

@@ -16,14 +16,6 @@ class String
     Typus::Configuration.models_constantized[self]
   end
 
-  def action_mapper
-    case self
-    when "index" then :list
-    when "new", "create", "edit", "update", "toggle" then :form
-    else self
-    end
-  end
-
   def acl_action_mapper
     case self
     when "new", "create"

data/lib/typus.rb

@@ -6,7 +6,7 @@ require "support/object"
 require "support/string"
 
 require "typus/engine"
-require "typus/i18n"
+require "typus/orm/base"
 require "typus/orm/active_record"
 require "typus/regex"
 require "typus/version"
@@ -19,16 +19,15 @@ autoload :FakeUser, "support/fake_user"
 module Typus
 
   autoload :Configuration, "typus/configuration"
+  autoload :I18n, "typus/i18n"
   autoload :Resources, "typus/resources"
 
   module Controller
-
     autoload :Actions, "typus/controller/actions"
     autoload :Associations, "typus/controller/associations"
     autoload :Autocomplete, "typus/controller/autocomplete"
     autoload :Filters, "typus/controller/filters"
     autoload :Format, "typus/controller/format"
-
   end
 
   module Authentication

data/lib/typus/authentication/base.rb

@@ -14,7 +14,6 @@ module Typus
       def check_resources_ownership; end
       def set_attributes_on_create; end
       def set_attributes_on_update; end
-      def reload_locales; end
 
     end
   end

data/lib/typus/authentication/session.rb

@@ -15,16 +15,21 @@ module Typus
         end
       end
 
+      def deauthenticate
+        session[:typus_user_id] = nil
+        ::I18n.locale = ::I18n.default_locale
+        redirect_to new_admin_session_path
+      end
+
       #--
-      # Return the current user. If role does not longer exist on the
-      # system admin_user will be signed out from Typus.
+      # Return the current user. If role does not longer exist on the system
+      # admin_user will be signed out from the system.
       #++
       def admin_user
         @admin_user ||= Typus.user_class.find_by_id(session[:typus_user_id])
 
         if !@admin_user || !Typus::Configuration.roles.has_key?(@admin_user.role) || !@admin_user.status
-          session[:typus_user_id] = nil
-          redirect_to new_admin_session_path
+          deauthenticate
         end
 
         @admin_user
@@ -66,9 +71,7 @@ module Typus
       #++
       def check_if_user_can_perform_action_on_resource
         resource = params[:controller].remove_prefix.camelize
-        unless admin_user.can?(params[:action], resource, { :special => true })
-          not_allowed
-        end
+        not_allowed if admin_user.cannot?(params[:action], resource, { :special => true })
       end
 
       def not_allowed
@@ -76,18 +79,14 @@ module Typus
       end
 
       #--
-      # If item is owned by another user, we only can perform a
-      # show action on the item. Updated item is also blocked.
-      #
-      #   before_filter :check_resource_ownership, :only => [ :edit, :update, :destroy,
-      #                                                       :toggle, :position,
-      #                                                       :relate, :unrelate ]
+      # If item is owned by another user, we only can perform a show action on
+      # the item. Updated item is also blocked.
       #++
       def check_resource_ownership
         if admin_user.is_not_root?
 
           condition_typus_users = @item.respond_to?(Typus.relationship) && !@item.send(Typus.relationship).include?(admin_user)
-          condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !@item.owned_by?(admin_user)
+          condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !admin_user.owns?(@item)
 
           not_allowed if (condition_typus_users || condition_typus_user_id)
         end
@@ -99,33 +98,27 @@ module Typus
       #++
       def check_resources_ownership
         if admin_user.is_not_root? && @resource.typus_user_id?
-          condition = { Typus.user_fk => admin_user }
-          @resource = @resource.where(condition)
+          @resource = @resource.where(Typus.user_fk => admin_user)
         end
       end
 
+      ##
+      # OPTIMIZE: This method should accept args.
+      #
       def set_attributes_on_create
-        if @resource.typus_user_id?
-          @item.attributes = { Typus.user_fk => admin_user.id }
-        end
+        @item.send("#{Typus.user_fk}=", admin_user.id) if @resource.typus_user_id?
       end
 
+      ##
+      # OPTIMIZE: This method should accept args and not perform an update
+      #           because we are updating the attributes twice!
+      #
       def set_attributes_on_update
         if @resource.typus_user_id? && admin_user.is_not_root?
           @item.update_attributes(Typus.user_fk => admin_user.id)
         end
       end
 
-      #--
-      # Reload admin_user when updating to see flash message in the
-      # correct locale.
-      #++
-      def reload_locales
-        if @resource.eql?(Typus.user_class)
-          ::I18n.locale = admin_user.reload.locale
-        end
-      end
-
     end
   end
 end