typus 0.9.39 → 1.0.0.pre

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

@@ -0,0 +1,26 @@
+<%
+  page_title = _("Sign in")
+  title(page_title)
+%>
+
+<%= form_for :typus_user, :url => { :action => :create, :back_to => params[:back_to] } do |form| %>
+
+  <ul>
+
+    <li>
+      <%= form.label :email, Typus.user_class.human_attribute_name(:email) %>
+      <%= form.text_field :email, :size => 20, :class => "text" %>
+    </li>
+
+    <li>
+      <%= form.label :password, Typus.user_class.human_attribute_name(:password) %>
+      <%= form.password_field :password, :size => 20, :class => "text" %>
+    </li>
+
+    <li>
+      <%= submit_tag _("Sign in"), :class => "button" %> <%= link_to _("Recover password"), forgot_password_admin_account_index_path if Rails.env.development? || Typus.mailer_sender %>
+    </li>
+
+  </ul>
+
+<% end %>

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

@@ -0,0 +1,4 @@
+<li>
+  <%= 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,8 +1,4 @@
-<%
-  attribute_name = attribute.gsub(/\?$/,'')
-  custom_true = @resource[:class].typus_boolean(attribute)[:true]
-  custom_true = custom_true != 'True' ? custom_true : "Checked if active"
-%>
-
-<li><label><%= @resource[:class].human_attribute_name(attribute) %></label>
-<%= check_box :item, attribute_name %> <label class="inline_label" for="item_<%= attribute_name %>"><%= _(custom_true) %></label></li>
+<li>
+  <%= form.label attribute, label_text, :class => "inline_label" %>
+  <%= form.check_box attribute, options %>
+</li>

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

@@ -1,2 +1,9 @@
-<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
-<%= date_select :item, attribute, options, { :disabled => attribute_disabled?(attribute)} %></li>
+<%
+  custom = { :include_blank => false }
+  options.merge!(custom)
+%>
+
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.date_select attribute, options, html_options %>
+</li>

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

@@ -1,2 +1,9 @@
-<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
-<%= datetime_select :item, attribute, options, {:disabled => attribute_disabled?(attribute)} %></li>
+<%
+  custom = { :include_blank => false }
+  options.merge!(custom)
+%>
+
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.datetime_select attribute, options, html_options %>
+</li>

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

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

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

@@ -0,0 +1,24 @@
+<a name="<%= field %>"></a>
+<div class="box_relationships" id="<%= model_to_relate_as_resource %>">
+
+  <h2>
+    <%= link_to model_to_relate.model_name.human.pluralize,
+                { :controller => "admin/#{model_to_relate_as_resource}", foreign_key => @item.id },
+                :title => _("%{model} filtered by %{filtered_by}",
+                            :model => model_to_relate.model_name.human.pluralize,
+                            :filtered_by => @item.to_label) %>
+    <%= add_new %>
+  </h2>
+
+  <%= form %>
+
+  <% unless @items.count.zero? -%>
+    <%= table %>
+    <%= pagination(:anchor => model_to_relate.to_resource) %>
+  <% else %>
+    <div id="flash" class="notice">
+      <p><%= _("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
+    </div>
+  <% end %>
+
+</div>

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

@@ -0,0 +1,17 @@
+<div class="box_relationships" id="<%= model_to_relate_as_resource %>">
+
+  <h2>
+    <%= model_to_relate.model_name.human.pluralize %>
+    <small><%= add_new %></small>
+  </h2>
+
+  <%= form %>
+
+  <% unless @items.count.zero? -%>
+    <%= table %>
+    <%= pagination(:anchor => model_to_relate.to_resource) %>
+  <% else %>
+    <p><%= _("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
+  <% end %>
+
+</div>

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

@@ -1,2 +1,4 @@
-<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
-<%= password_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute) %></li>
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.password_field attribute, options %>
+</li>

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

@@ -0,0 +1,4 @@
+<%= 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 _("Add"), :class => "button" %></p>
+<% end %>

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

@@ -1,21 +1,9 @@
 <%
-
-  options = []
-  @resource[:class].send(attribute).each do |option|
-    case option.kind_of?(Array)
-    when true
-      selected = 'selected' if @item.send(attribute).eql?(option.last)
-      options << %Q[<option #{selected} value="#{option.last}">#{option.first}</option>]
-    else
-      selected = 'selected' if @item.send(attribute).eql?(option)
-      options << %Q[<option #{selected} value="#{option}">#{option}</option>]
-    end
-  end
-
+  values = @resource::const_get(attribute.upcase)
+  values = values.invert if values.kind_of?(Hash)
 %>
 
-<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
-<select id="item_<%= attribute %>" <%= 'disabled="disabled"' if attribute_disabled?(attribute) %> name="item[<%= attribute %>]">
-<option value=""></option>
-<%= options.join("\n") %>
-</select></li>
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.select attribute, values, options.merge!(:include_blank => false) %>
+</li>

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

@@ -1,21 +1,22 @@
 <%
 
   # Read only fields.
-  if @resource[:class].typus_field_options_for(:read_only).include?(attribute)
-    value = 'read_only' if %w( edit ).include?(params[:action])
+  if @resource.typus_field_options_for(:read_only).to_s.include?(attribute)
+    custom = { :readonly => 'readonly' }
+    label_text << " <small>#{_("Read only")}</small>"
   end
 
   # Auto generated fields.
-  if @resource[:class].typus_field_options_for(:auto_generated).include?(attribute)
-    value = 'auto_generated' if %w( new edit ).include?(params[:action])
+  if @resource.typus_field_options_for(:auto_generated).include?(attribute)
+    custom = { :auto_generated => true }
+    label_text << " <small>#{_("Auto generated")}</small>"
   end
 
-  comment = "<small>#{value} field</small>".humanize if %w( read_only auto_generated ).include?(value)
-
-  attribute_humanized = @resource[:class].human_attribute_name(attribute)
-  attribute_humanized += " (#{attribute})" if attribute.include?('_id')
+  options.merge!(custom) if custom
 
 %>
 
-<li><label for="item_<%= attribute %>"><%= attribute_humanized %> <%= comment %></label>
-<%= text_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute) %></li>
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.text_field attribute, options %>
+</li>

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

@@ -1,2 +1,9 @@
-<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
-<%= text_area :item, attribute, :class => 'text', :rows => @resource[:class].typus_options_for(:form_rows), :disabled => attribute_disabled?(attribute) %></li>
+<%
+  custom = { :rows => @resource.typus_options_for(:form_rows) }
+  options = options.merge!(custom)
+%>
+
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.text_area attribute, options %>
+</li>

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

@@ -1,2 +1,9 @@
-<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
-<%= time_select :item, attribute, options, { :disabled => attribute_disabled?(attribute) } %></li>
+<%
+  custom = { :include_blank => false }
+  options.merge!(custom)
+%>
+
+<li>
+  <%= form.label attribute, label_text %>
+  <%= form.time_select attribute, options, html_options %>
+</li>

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

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

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

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+
+<html lang="<%= I18n.locale %>">
+
+<head>
+
+<!--
+
+  Ruby on Rails easy-to-use interface to allow trusted users
+  edit structured content. (Admin scaffold generator)
+
+  Get the code at http://github.com/fesplugas/typus
+
+-->
+
+  <meta charset="utf-8" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+
+  <title><%= yield :title %></title>
+
+  <%= stylesheet_link_tag "/admin/stylesheets/screen",
+                          "/admin/stylesheets/application" %>
+
+</head>
+
+<body id="account">
+
+  <div id="wrapper">
+
+    <div id="box">
+      <h1 class="logo"><%= Typus.admin_title %></h1>
+      <%= display_flash_message %>
+      <%= yield %>
+    </div>
+
+    <div id="footer">
+      <%= Typus.admin_sub_title.html_safe %>
+    </div>
+
+  </div>
+
+</body>
+
+</html>

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

@@ -1,76 +1,82 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html lang="<%= I18n.locale %>">
 
 <head>
 
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta charset="utf-8" />
 
-  <title><%= page_title %></title>
+  <title><%= yield :title %></title>
 
-  <%= stylesheet_link_tag 'admin/reset', :media => 'screen' %>
-  <%= stylesheet_link_tag 'admin/screen', :media => 'screen' %>
-  <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
+  <%= stylesheet_link_tag "/admin/stylesheets/screen",
+                          "/admin/stylesheets/application",
+                          "/admin/vendor/fancybox/jquery.fancybox-1.3.1.css" %>
   <%= yield :stylesheets -%>
 
+  <%= javascript_include_tag "/admin/javascripts/jquery-1.4.2.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/javascripts/application" %>
+  <%= yield :javascripts -%>
+
+  <%= csrf_meta_tag %>
+
 </head>
 
 <body>
 
-  <div id="header_wrapper">
+  <div id="wrapper">
+
+    <div id="header_wrapper">
 
-    <div id="header">
-      <div class="left">
+      <div id="header">
         <%= header %>
+        <div class="clear"></div>
       </div>
-      <div class="right">
-        <%= login_info %>
-      </div>
-      <div class="clear"></div>
-    </div>
 
-  </div>
+      <div id="links">
 
-  <div id="wrapper">
+        <div class="left">
+          <%= apps %>
+        </div>
 
-    <div id="content_wrapper">
+        <div class="right">
+          <%= login_info %>
+        </div>
+
+        <div class="clear"></div>
 
-      <div id="content">
-        <%= display_flash_message %>
-        <%= yield %>
       </div>
 
+    </div>
+
+    <div id="content_wrapper">
+
       <div id="sidebar">
         <%= yield :sidebar %>
       </div>
 
+      <div id="content">
+        <%= yield %>
+      </div>
+
       <div class="clear"></div>
 
     </div>
 
-  </div>
-
-  <div id="footer_wrapper">
+    <div id="footer_wrapper">
 
-    <div id="footer">
-      <div class="left">
-        <%= typus_block :location => 'shared', :partial => 'footer' %>
+      <div id="footer">
+        <%= Typus.admin_sub_title.html_safe %>
       </div>
-      <div class="right">
-        <%= typus_block :location => 'shared', :partial => 'feedback' %>
-      </div>
-      <div class="clear"></div>
+
     </div>
 
   </div>
 
-  <%= javascript_include_tag 'admin/application' %>
-  <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
-  <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
-  <%= include_tiny_mce_if_needed if defined?(TinyMCE) -%>
-  <%= yield :javascripts -%>
-
 </body>
 
-</html>
+</html>

data/config/available_locales/ca.yml

@@ -0,0 +1,124 @@
+# Catalan translations for Typus
+# by Lleïr Borràs <http://github.com/lleirborras>
+
+ca:
+
+  "A valid token is required": "Es necessita un token vàlid."
+  "Actions": "Accions"
+  "Active": "Actiu"
+  "Add": "Afegir"
+  "Add %{resource}": "Afegir %{resource}"
+  "Add new": "Afegir nou"
+  "Are you sure?": "Estàs segur?"
+  "Are you sure you want to leave this page?": "Estàs segur que vols abandonar aquesta pàgina?"
+  "Are you sure you want to sign out and end your session?": "Estàs segur que vols sortir i tancar la sessió?"
+  "As you're not the admin or the owner of this record you cannot edit it": "Com que no ets l'administrador o el propietari d'aquest registre no el pots editar."
+
+  "Back to list": "Tornar al llistat"
+
+  "Cancel and go back":
+  "Change password": "Canviar contrasenya"
+  "Change %{attribute}?": "Canviar %{attribute}?"
+  "Checked if active": "Marca-ho per activar"
+  "Click OK to continue, or click Cancel to stay on this page": "Prem OK per continuar, o prem Cancel·lar per romandre en aquesta página."
+  "Create %{resource}": "Crear %{resource}"
+  "Create one now":
+
+  "Dashboard": "Panell de control"
+  "Do you want to cancel it?": "Vols cancel·lar-lo?"
+  "Documentation": "Documentació"
+  "Down": "Baixar"
+
+  "Edit": "Editar"
+  "Edit %{resource}": "Edit %{resource}"
+  "Enter your email below to create the first user": "Introdueix el teu email per crear el primer usuari."
+  "Error! Typus User or role doesn't exist": "Error! Typus User o el rol no existixen."
+
+  "False": "Fals"
+  "Filter": "Filtrar"
+  "Filter by %{attribute}": "Filtrar per %{attribute}"
+
+  "Go to": "Anar a"
+
+  "I remember my password": "Recordo la meva contrasenya"
+  "If you didn't request a password update, you can ignore this message": "Si no has demanat una actualització de la teva contrasenya, pots ignorar aquest missatge."
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Si has realitzat algun canvi en els camps sense premer el botó Guardar/Actualitzar, els teus canvis es perdran."
+  "Inactive": "Inactiu"
+
+  "Last few days": "Últims dies"
+  "Last 30 days": "Últims 30 dies"
+  "Last 7 days": "Últims 7 dies"
+  "License": "Llicència"
+  "Logged as": "Identificat com"
+  "Login": "Login"
+
+  "New": "Nou"
+  "Next": "Següent"
+
+  "Options": "Opcions"
+
+  "Password recovery link sent to your email": "L'enllaç de recuperació de contrasenya enviat al teu correu electrònic."
+  "Previous": "Anterior"
+
+  "Record moved %{to}": "Registre desplaçat %{to}."
+  "Recover password": "Recuperar contrasenya"
+  "Remove": "Eliminar"
+  "Remove %{attribute}": "Esborrar %{attribute}"
+  "Remove %{resource}?": "Esborrar %{resource}?"
+  "Remove filter": "Treure filtre"
+  "Remove search": "Treure cerca"
+  "Reset password": "Canviar contrasenya"
+  "Resources": "Recursos"
+
+  "Save %{resource}": "Guardar %{resource}"
+  "Search": "Cercar"
+  "Search by": "Cercar per"
+  "Setup": "Configurar"
+  "Send us feedback": "Envians comentaris"
+  "Show": "Mostrar"
+  "Show %{resource}": "Mostrar %{resource}"
+  "Sign in": "Entrar"
+  "Sign out": "Sortir"
+  "Sign up": "Crear compte"
+  "Submit a bug report": "Informar d'un error"
+  "System Users Administration": "Administrar usuaris del sistema"
+
+  "That doesn't seem like a valid email address": "Això no sembla ser una adreça de correu electrònic vàlida."
+  "The email and/or password you entered is invalid": "El correu i/o la contrasenya proporcionats no són vàlids."
+  "There are no %{records}": "No hi han %{records}."
+  "There are no %{records} under this filter": "No hi han %{records} amb aquest filtre."
+  "Today": "Avui"
+  "Toggle is disabled": "Alternar està desactivat."
+  "True": "Cert"
+
+  "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Deslligat %{unrelate_model} de %{unrelate_model_from}?"
+  "Up": "Pujar"
+
+  "You're adding a new %{resource_from}": "Estàs afegint un nou %{resource_from}."
+  "You're adding a new %{resource_from} to %{resource_to}": "Estàs afegint un nou %{resource_from} a %{resource_to}."
+  "You're not allowed to remove Typus Users": "No pots esborrar usuaris de typus."
+  "You're not allowed to toggle status": "No pots canviar el teu estat."
+  "You can update your password at": "Pots actualitzar la teva contrasenya a "
+  "You can't change your role": "No pots canviar-te tu mateix el rol."
+  "You can't remove yourself": "No et pots eliminar a tu mateix."
+  "You can't toggle your status": "No pots canviar-te l'estat."
+  "You're updating a %{resource_from}": "Estàs actualitzant un %{resource_from}."
+  "You're updating a %{resource_from} for %{resource_to}": "Estàs actualitzant un %{resource_from} de %{resource_to}."
+
+  "View site": "Veure la web"
+
+  "%{attachment} can't be removed": "%{attachment} no es pot esborrar."
+  "%{attachment} removed": "%{attachment} esborrat."
+  "%{current_user_role} can't delete this item": "%{current_user_role} no pot esborrar aquest element."
+  "%{current_user_role} can't display items": "%{current_user_role} no pot mostrar els elements."
+  "%{current_user_role} can't perform action. (%{action})": "%{current_user_role} no pot realitzar l'acció. (%{action})"
+  "%{model} filtered by %{filtered_by}": "%{model} filtrats per %{filtered_by}"
+  "%{model} successfully created": "%{model} satisfactòriament creat."
+  "%{model} successfully updated": "%{model} satisfactòriament actualitzat."
+  "%{model} successfully removed": "%{model} satisfactòriament eliminat."
+  "%{model} %{attribute} changed": "%{model} %{attribute} canviat."
+  "%{model_a} cannot be unrelated from %{model_b}":
+  "%{model_a} cannot be related to %{model_b}":
+  "%{model_a} related to %{model_b}": "%{model_a} relacionat amb %{model_b}."
+  "%{model_a} successfully assigned to %{model_b}": "%{model_a} assignat satisfactòriament a %{model_b}."
+  "%{model_a} unrelated from %{model_b}": "%{model_a} no està relacionat amb %{model_b}."

data/config/available_locales/ca_models.yml

@@ -0,0 +1,16 @@
+# Catalan translations for Typus
+# by Lleïr Borràs <http://github.com/lleirborras>
+
+ca:
+  activerecord:
+    models:
+      typus_user: Usuari
+    attributes:
+      typus_user:
+        email: "Correu electrònic"
+        first_name: "Nom"
+        last_name: "Cognoms"
+        password: "Contrassenya"
+        password_confirmation: "Confirmar contrasenya"
+        status: "Estat"
+        role: "Rol"