typus 3.0.2 → 3.0.4

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

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("%{resources}", :resources => @resource.model_name.human.pluralize)
+  page_title = @resource.model_name.human.pluralize
   title(page_title)
 %>
 
@@ -7,33 +7,28 @@
 
 <h2>
   <%= page_title %>
-  <small><%= remove_filter_link %></small>
 </h2>
 
 <%= display_flash_message %>
-<%= typus_render :partial => 'index' %>
 
-<% if (build_filters || search) && !@resource.count.zero? %>
+<%= render 'index' %>
+
+<ul class="predefined_filters">
+  <% predefined_filters.each do |filter, action, scope| %>
+    <li><%= link_to Typus::I18n.t(filter), :action => action %> (<%= @resource.send(scope).count %>)</li>
+  <% end %>
+</ul>
+
+<% if (build_filters || search) %>
   <div class="filters">
     <%= build_filters %>
     <%= search %>
   </div>
 <% end %>
 
-<% if @resource.count.zero? %>
-  <p>
-    <%= _t("There are no %{records}.", :records => @resource.model_name.human.pluralize.downcase) %>
-    <%= link_to _t("Create one now."), { :action => "new" } if current_user.can?('create', @resource) %>
-  </p>
-<% end %>
-
 <% if @items.any? -%>
   <%= raw build_list(@resource, @fields, @items) %>
-  <%= will_paginate(@items, :renderer => Typus::Pagination) %>
-<% end %>
-
-<% if @items.empty? && !@resource.count.zero? %>
-  <div class="flash notice">
-    <%= _t("There are no %{records} under this filter.", :records => @resource.model_name.human.pluralize.downcase) %>
-  </div>
+  <%= will_paginate(@items, Typus.pagination) %>
+<% else %>
+  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.pluralize.downcase) %></p>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("New %{resource}", :resource => @resource.model_name.human)
+  page_title = Typus::I18n.t("New %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 
@@ -10,7 +10,7 @@
 </h2>
 
 <%= display_link_to_previous %>
-<%= typus_render :partial => 'new' %>
+<%= render 'new' %>
 
 <%
   options = { :action => 'create',
@@ -18,7 +18,7 @@
               :selected => params[:selected],
               :resource => params[:resource],
               :resource_id => params[:resource_id] }
-  button = _t("Create %{resource}", :resource => @resource.model_name.human)
+  button = Typus::I18n.t("Create %{resource}", :resource => @resource.model_name.human)
 %>
 
-<%= typus_render :partial => 'form', :options => options, :button => button %>
+<%= render :partial => 'form', :locals => { :options => options, :button => button } %>

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

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("Show %{resource}", :resource => @resource.model_name.human)
+  page_title = Typus::I18n.t("Show %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 
@@ -10,7 +10,7 @@
 </h2>
 
 <%= display_flash_message %>
-<%= typus_render :partial => 'show' %>
+<%= render 'show' %>
 
 <dl>
 <%- @fields.each do |field| -%>
@@ -20,26 +20,22 @@
     raw_data = @item.send(field.first)
     data = case data_type
            when :boolean
-             boolean_hash = @resource.typus_boolean(field.first)
-             !raw_data.nil? ? boolean_hash["#{raw_data}".to_sym] : @resource.typus_options_for(:nil)
+             @resource.typus_boolean(field.first).invert[raw_data.to_s]
            when :belongs_to
-             if !raw_data.nil?
-               controller = raw_data.class.to_resource
-               action = raw_data.class.typus_options_for(:default_action_on_item)
-               options = { :controller => controller, :action => action, :id => raw_data }
-               link_to raw_data.to_label, options
-             else
-               nil
+             if raw_data
+               link_to raw_data.to_label, { :controller => raw_data.class.to_resource,
+                                            :action => raw_data.class.typus_options_for(:default_action_on_item),
+                                            :id => raw_data }
              end
            when :file
-             typus_preview(@item, field.first)
+             typus_file_preview(@item, field.first)
            when :selector
              @item.mapping(field.first)
            else
              raw_data
            end
   -%>
-  <dd><%= data.blank? ? "&#151;".html_safe : data %></dd>
+  <dd><%= data.present? ? data : "&mdash;".html_safe %></dd>
 <%- end -%>
 </dl>
 

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

@@ -1,5 +1,5 @@
 <%
-  page_title = _t("Sign in")
+  page_title = Typus::I18n.t("Sign in")
   title(page_title)
 %>
 
@@ -8,8 +8,8 @@
   <ul>
 
     <li>
-      <%= form.label :email, Typus.user_class.human_attribute_name(:email) %>
-      <%= form.text_field :email, :size => 20, :class => "text" %>
+      <%= form.label :email, Typus.user_class.human_attribute_name(:email), :for => 'autofocus' %>
+      <%= form.text_field :email, :size => 20, :class => "text", :id => 'autofocus', :autofocus => 'autofocus' %>
     </li>
 
     <li>
@@ -18,9 +18,13 @@
     </li>
 
     <li>
-      <%= submit_tag _t("Sign in"), :class => "button" %> <%= link_to _t("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
+      <%= 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 %>
     </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,4 @@
-<li>
+<li id="<%= attribute %>">
   <%= form.label related_fk, raw("#{label_text} <small>#{message}</small>") %>
   <%= form.select related_fk, values, options, html_options %>
 </li>

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

@@ -1,4 +1,4 @@
-<li>
+<li id="<%= attribute %>">
   <%= form.check_box attribute, options %>
   <%= form.label attribute, label_text, :class => "inline_label" %>
-</li>
+</li>

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

@@ -3,7 +3,7 @@
   options.merge!(custom)
 %>
 
-<li>
+<li id="<%= attribute %>">
   <%= form.label attribute, label_text %>
   <%= form.date_select attribute, options, html_options %>
-</li>
+</li>

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

@@ -3,7 +3,7 @@
   options.merge!(custom)
 %>
 
-<li>
+<li id="<%= attribute %>">
   <%= form.label attribute, label_text %>
   <%= form.datetime_select attribute, options, html_options %>
-</li>
+</li>

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

@@ -1,21 +1,5 @@
-<%
-
-  # attachment = attribute.split('_file_name').first
-
-  if !@item.class.validators.map { |i| i.class }.include?(ActiveModel::Validations::PresenceValidator) && @item.send(attribute).exists?
-    message = _t("Remove %{attribute}", :attribute => @item.class.human_attribute_name(attribute).downcase)
-    label_text << <<-HTML
- <small>#{link_to message, { :action => 'detach',
-                             :id => @item.id,
-                             :attachment => attribute },
-                             :confirm => _t("Are you sure?")}</small>
-    HTML
-  end
-
-%>
-
-<li>
-  <%= form.label attribute, raw(label_text) %>
+<li id="<%= attribute %>">
+  <%= form.label attribute, link_to_detach_attribute(attribute) %>
   <%= form.file_field attribute, options %>
-  <%= typus_preview(@item, attribute) %>
+  <%= typus_file_preview(@item, attribute) %>
 </li>

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

@@ -1,7 +1,7 @@
-<div class="box_relationships" id="<%= model_to_relate_as_resource %>">
+<div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= model_to_relate.model_name.human.pluralize %>
+    <%= association_name.capitalize.pluralize %>
     <small><%= add_new %></small>
   </h2>
 
@@ -9,9 +9,9 @@
 
   <% if @items.any? -%>
     <%= table %>
-    <%= will_paginate(@items, :renderer => Typus::Pagination, :anchor => model_to_relate.to_resource) %>
+    <%= will_paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>
   <% else %>
-    <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.pluralize.downcase) %></p>
   <% end %>
 
 </div>

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

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

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

@@ -1,4 +1,4 @@
-<li>
+<li id="<%= attribute %>">
   <%= form.label attribute, label_text %>
   <%= form.password_field attribute, options %>
-</li>
+</li>

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

@@ -0,0 +1,3 @@
+<h2>Profile</h2>
+
+<p>Replace this sidebar dropping a file named <code>_profile_sidebar.html.erb</code> on <code>app/views/admin/templates</code> folder.</p>

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

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

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

@@ -2,7 +2,7 @@
   values = @resource::const_get(attribute.upcase)
 %>
 
-<li>
+<li id="<%= attribute %>">
   <%= form.label attribute, label_text %>
   <%= form.select attribute, values, options.merge!(:include_blank => false) %>
 </li>

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

@@ -1,22 +1,22 @@
 <%
 
   # Read only fields.
-  if @resource.typus_field_options_for(:read_only).to_s.include?(attribute)
+  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
     custom = { :readonly => 'readonly' }
-    label_text << " <small>#{_t("Read only")}</small>"
+    label_text << " <small>#{Typus::I18n.t("Read only")}</small>"
   end
 
   # Auto generated fields.
-  if @resource.typus_field_options_for(:auto_generated).include?(attribute)
+  if @resource.typus_field_options_for(:auto_generated).include?(attribute.to_sym)
     custom = { :auto_generated => true }
-    label_text << " <small>#{_t("Auto generated")}</small>"
+    label_text << " <small>#{Typus::I18n.t("Auto generated")}</small>"
   end
 
   options.merge!(custom) if custom
 
 %>
 
-<li>
+<li id="<%= attribute %>">
   <%= form.label attribute, raw(label_text) %>
   <%= form.text_field attribute, options %>
-</li>
+</li>

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

@@ -1,9 +1,16 @@
 <%
-  custom = { :rows => @resource.typus_options_for(:form_rows) }
+  custom = {:rows => @resource.typus_options_for(:form_rows)}
+
+  # Read only fields.
+  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
+    custom.merge!(:readonly => 'readonly')
+    label_text << " <small>#{Typus::I18n.t("Read only")}</small>"
+  end
+
   options = options.merge!(custom)
 %>
 
-<li>
-  <%= form.label attribute, label_text %>
+<li id="<%= attribute %>">
+  <%= form.label attribute, raw(label_text) %>
   <%= form.text_area attribute, options %>
-</li>
+</li>

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

@@ -3,7 +3,7 @@
   options.merge!(custom)
 %>
 
-<li>
+<li id="<%= attribute %>">
   <%= form.label attribute, label_text %>
   <%= form.time_select attribute, options, html_options %>
-</li>
+</li>

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

@@ -1,4 +1,4 @@
-<li>
+<li id="<%= attribute %>">
   <%= form.label label_text %>
   <%= form.select :parent_id, values, { :include_blank => true } %>
 </li>

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

@@ -5,20 +5,21 @@
 <head>
 
   <meta charset="utf-8" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
   <title><%= yield :title %></title>
 
   <%= stylesheet_link_tag "/admin/stylesheets/screen",
                           "/admin/stylesheets/application",
-                          "/admin/vendor/fancybox/jquery.fancybox-1.3.1.css" %>
+                          "/admin/vendor/fancybox/jquery.fancybox-1.3.4.css" %>
   <%= yield :stylesheets -%>
 
-  <%= javascript_include_tag "/admin/javascripts/jquery-1.4.2.min.js",
+  <%= javascript_include_tag "/admin/javascripts/jquery-1.4.4.min.js",
                              "/admin/javascripts/jquery.searchField.js",
                              "/admin/javascripts/jquery.rails.js",
-                             "/admin/vendor/fancybox/jquery.fancybox-1.3.1.pack.js",
-                             "/admin/vendor/fancybox/jquery.easing-1.3.pack.js",
-                             "/admin/vendor/fancybox/jquery.mousewheel-3.0.2.pack.js",
+                             "/admin/vendor/fancybox/jquery.fancybox-1.3.4.pack.js",
+                             "/admin/javascripts/jquery.application.js",
                              "/admin/javascripts/application" %>
   <%= yield :javascripts -%>
 
@@ -60,7 +61,7 @@
       </div>
 
       <div id="content">
-        <%= yield %>
+        <%= yield :layout %>
       </div>
 
       <div class="clear"></div>

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

@@ -4,23 +4,17 @@
 
 <head>
 
-<!--
-
-  Ruby on Rails easy-to-use interface to allow trusted users
-  edit structured content. (Admin scaffold generator)
-
-  Documentation available at http://core.typuscms.com/
-
--->
-
   <meta charset="utf-8" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
   <title><%= yield :title %></title>
 
   <%= stylesheet_link_tag "/admin/stylesheets/screen",
                           "/admin/stylesheets/application" %>
 
+  <%= csrf_meta_tag %>
+
 </head>
 
 <body id="account">
@@ -30,11 +24,7 @@
     <div id="box">
       <h1 class="logo"><%= Typus.admin_title %></h1>
       <%= display_flash_message %>
-      <%= yield %>
-    </div>
-
-    <div id="footer">
-      <%= Typus.admin_sub_title.html_safe %>
+      <%= yield :layout %>
     </div>
 
   </div>

data/config/{available_locales/ca_models.yml → locales/typus.ca.models.yml}

@@ -1,12 +1,12 @@
-# Catalan translations for Typus
-# by Lleïr Borràs <http://github.com/lleirborras>
+# Catalan (ca) translations for Typus by:
+# - Lleïr Borràs <http://github.com/lleirborras>
 
 ca:
   activerecord:
     models:
-      typus_user: Usuari
+      admin_user: Usuari
     attributes:
-      typus_user:
+      admin_user:
         email: "Correu electrònic"
         first_name: "Nom"
         last_name: "Cognoms"
@@ -14,3 +14,4 @@ ca:
         password_confirmation: "Confirmar contrasenya"
         status: "Estat"
         role: "Rol"
+        locale: "Idioma"