fesplugas-typus 0.9.6 → 0.9.7

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/app/controllers/admin/master_controller.rb

@@ -290,8 +290,8 @@ private
   end
 
   def select_template(template, resource = @resource[:self])
-    folder = (File.exists?("app/views/admin/#{resource}/#{template}.html.erb")) ? resource : 'resources'
-    render :template => "admin/#{folder}/#{template}"
+    folder = (File.exist?("app/views/admin/#{resource}/#{template}.html.erb")) ? resource : 'resources'
+    render "admin/#{folder}/#{template}"
   end
 
   ##

data/app/controllers/typus_controller.rb

@@ -80,8 +80,8 @@ class TypusController < ApplicationController
       @user.password = params[:user][:password]
       @user.password_confirmation = params[:user][:password_confirmation]
       if @user.save
-        flash[:success] = _("You can login with your new password.")
-        redirect_to admin_sign_in_path
+        session[:typus_user_id] = @user.id
+        redirect_to admin_dashboard_path
       else
         flash[:error] = _("Passwords don't match.")
         redirect_to admin_reset_password_path(:token => params[:token])

data/app/helpers/admin/form_helper.rb

@@ -33,7 +33,7 @@ module Admin::FormHelper
     end
   end
 
-  def typus_belongs_to_field(attribute, klass = @resource[:class])
+  def typus_belongs_to_field(attribute)
 
     ##
     # We only can pass parameters to 'new' and 'edit', so this hack makes
@@ -43,8 +43,8 @@ module Admin::FormHelper
 
     back_to = '/' + [ params[:controller], params[:action], params[:id] ].compact.join('/')
 
-    related = klass.reflect_on_association(attribute.to_sym).class_name.constantize
-    related_fk = klass.reflect_on_association(attribute.to_sym).primary_key_name
+    related = @resource[:class].reflect_on_association(attribute.to_sym).class_name.constantize
+    related_fk = @resource[:class].reflect_on_association(attribute.to_sym).primary_key_name
 
     message = [ _("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."), 
@@ -59,7 +59,7 @@ module Admin::FormHelper
 <li><label for="item_#{attribute}">#{_(related_fk.humanize)}
     <small>#{link_to _('Add'), { :controller => "admin/#{related.class_name.tableize}", :action => 'new', :back_to => back_to, :selected => related_fk }, :confirm => message.join("\n\n") if @current_user.can_perform?(related, 'create')}</small>
     </label>
-#{select :item, related_fk, related.find(:all, :order => related.typus_order_by).collect { |p| [p.typus_name, p.id] }, { :include_blank => true }, { :disabled => attribute_disabled?(attribute, klass) } }</li>
+#{select :item, related_fk, related.find(:all, :order => related.typus_order_by).collect { |p| [p.typus_name, p.id] }, { :include_blank => true }, { :disabled => attribute_disabled?(attribute) } }</li>
         HTML
       end
 
@@ -67,47 +67,47 @@ module Admin::FormHelper
 
   end
 
-  def typus_boolean_field(attribute, klass = @resource[:class])
+  def typus_boolean_field(attribute)
     attribute_name = attribute.gsub(/\?$/,'')
     <<-HTML
-<li><label for="item_#{attribute_name}">#{klass.human_attribute_name(attribute)}</label>
+<li><label for="item_#{attribute_name}">#{@resource[:class].human_attribute_name(attribute)}</label>
 #{check_box :item, attribute_name} #{_('Checked if active')}</li>
     HTML
   end
 
-  def typus_date_field(attribute, options, klass = @resource[:class])
+  def typus_date_field(attribute, options)
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
-#{date_select :item, attribute, options, { :disabled => attribute_disabled?(attribute, klass)} }</li>
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
+#{date_select :item, attribute, options, { :disabled => attribute_disabled?(attribute)} }</li>
     HTML
   end
 
-  def typus_datetime_field(attribute, options, klass = @resource[:class])
+  def typus_datetime_field(attribute, options)
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
-#{datetime_select :item, attribute, options, {:disabled => attribute_disabled?(attribute, klass)}}</li>
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
+#{datetime_select :item, attribute, options, {:disabled => attribute_disabled?(attribute)}}</li>
     HTML
   end
 
-  def typus_file_field(attribute, klass = @resource[:class])
+  def typus_file_field(attribute)
 
     attribute_display = attribute.split('_file_name').first
 
     <<-HTML
 <li><label for="item_#{attribute}">#{_(attribute_display.humanize)}</label>
-#{file_field :item, attribute.split("_file_name").first, :disabled => attribute_disabled?(attribute, klass)}</li>
+#{file_field :item, attribute.split("_file_name").first, :disabled => attribute_disabled?(attribute)}</li>
     HTML
 
   end
 
-  def typus_password_field(attribute, klass = @resource[:class])
+  def typus_password_field(attribute)
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
-#{password_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute, klass)}</li>
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
+#{password_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute)}</li>
     HTML
   end
 
-  def typus_selector_field(attribute, klass = @resource[:class])
+  def typus_selector_field(attribute)
     returning(String.new) do |html|
       options = []
       @resource[:class].send(attribute).each do |option|
@@ -121,7 +121,7 @@ module Admin::FormHelper
         end
       end
       html << <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
 <select id="item_#{attribute}" #{attribute_disabled?(attribute) ? 'disabled="disabled"' : ''} name="item[#{attribute}]">
 <option value=""></option>
 #{options.join("\n")}
@@ -130,23 +130,23 @@ module Admin::FormHelper
     end
   end
 
-  def typus_text_field(attribute, klass = @resource[:class])
+  def typus_text_field(attribute)
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
-#{text_area :item, attribute, :class => 'text', :rows => klass.typus_options_for(:form_rows), :disabled => attribute_disabled?(attribute, klass)}</li>
+<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>
     HTML
   end
 
-  def typus_time_field(attribute, options, klass = @resource[:class])
+  def typus_time_field(attribute, options)
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
-#{time_select :item, attribute, options, {:disabled => attribute_disabled?(attribute, klass)}}</li>
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
+#{time_select :item, attribute, options, {:disabled => attribute_disabled?(attribute)}}</li>
     HTML
   end
 
-  def typus_tree_field(attribute, items = @resource[:class].roots, attribute_virtual = 'parent_id', klass = @resource[:class])
+  def typus_tree_field(attribute, items = @resource[:class].roots, attribute_virtual = 'parent_id')
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
 <select id="item_#{attribute}" #{attribute_disabled?(attribute) ? 'disabled="disabled"' : ''} name="item[#{attribute}]">
   <option value=""></option>
   #{expand_tree_into_select_field(items, attribute_virtual)}
@@ -154,26 +154,26 @@ module Admin::FormHelper
     HTML
   end
 
-  def typus_string_field(attribute, klass = @resource[:class])
+  def typus_string_field(attribute)
 
     # Read only fields.
-    if klass.typus_field_options_for(:read_only).include?(attribute)
+    if @resource[:class].typus_field_options_for(:read_only).include?(attribute)
       value = 'read_only' if %w( edit ).include?(params[:action])
     end
 
     # Auto generated fields.
-    if klass.typus_field_options_for(:auto_generated).include?(attribute)
+    if @resource[:class].typus_field_options_for(:auto_generated).include?(attribute)
       value = 'auto_generated' if %w( new edit ).include?(params[:action])
     end
 
     comment = %w( read_only auto_generated ).include?(value) ? "<small>#{value} field</small>".humanize : ''
 
-    attribute_humanized = klass.human_attribute_name(attribute)
+    attribute_humanized = @resource[:class].human_attribute_name(attribute)
     attribute_humanized += " (#{attribute})" if attribute.include?('_id')
 
     <<-HTML
 <li><label for="item_#{attribute}">#{attribute_humanized}#{comment}</label>
-#{text_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute, klass) }</li>
+#{text_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute) }</li>
     HTML
 
   end
@@ -332,8 +332,8 @@ module Admin::FormHelper
     output || "#{attribute}: Can not find the template '#{template}'"
   end
 
-  def attribute_disabled?(attribute, klass = @resource[:class])
-    accessible = klass.accessible_attributes
+  def attribute_disabled?(attribute)
+    accessible = @resource[:class].accessible_attributes
     return accessible.nil? ? false : !accessible.include?(attribute)
   end
 

data/app/helpers/admin/master_helper.rb

@@ -57,7 +57,7 @@ module Admin::MasterHelper
 
     template = "app/views/admin/#{resource}/_#{resource.singularize}.html.erb"
 
-    if File.exists?(template)
+    if File.exist?(template)
       render :partial => template.gsub('/_', '/'), :collection => items, :as => :item
     else
       build_typus_table(model, fields, items, link_options, association)

data/app/helpers/admin/public_helper.rb

@@ -2,18 +2,21 @@ module Admin
 
   module PublicHelper
 
+    ##
+    # Quick edit usage:
+    #
+    #     <%= quick_edit(:message => "Edit this article", :path => "articles/edit/#{@article.id}") %>
+    #
+    # If user is logged in Typus, a link will appear on the top/right of 
+    # the pages where you insert this helper.
+    #
     def quick_edit(*args)
 
       options = args.extract_options!
-      options[:color] ||= '#000'
-      options[:link] ||= admin_quick_edit_path
-
-      query = options.dup
-      [ :color, :link ].each { |o| query.delete(o) }
 
       <<-HTML
 <script type="text/javascript">
-  document.write('<script type="text/javascript" src="#{options[:link]}?#{query.to_query}" />');
+  document.write('<script type="text/javascript" src="#{admin_quick_edit_path}?#{options.to_query}" />');
 </script>
       HTML
 

data/app/helpers/typus_helper.rb

@@ -88,12 +88,22 @@ module TypusHelper
   def typus_block(*args)
 
     options = args.extract_options!
-    template = [ 'admin', options[:resource], options[:location], "_#{options[:partial]}.html.erb" ].compact.join('/')
 
-    exists = ActionController::Base.view_paths.map { |vp| File.exists?("#{Rails.root}/#{vp}/#{template}") }
+    partials_path = "admin/#{options[:location]}"
+    resources_partials_path = 'admin/resources'
 
-    return unless exists.include?(true)
-    render :partial => template.gsub('/_', '/')
+    partials = ActionController::Base.view_paths.map do |view_path|
+      Dir["#{Rails.root}/#{view_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') }
+
+    partial = "_#{options[:partial]}"
+
+    path = if partials.include?(partial) then partials_path
+           elsif resources_partials.include?(partial) then resources_partials_path
+           end
+
+    render :partial => "#{path}/#{options[:partial]}" if path
 
   end
 

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

@@ -1,8 +1,8 @@
 <h2>Welcome to Typus!</h2>
 
-<p>Documentation is available <a href="http://intraducibles.com/projects/typus">here</a>.</p>
+<p>Documentation is available <%= link_to 'here', 'http://intraducibles.com/projects/typus', :rel => 'external' %>.</p>
 
-<p>If you need help don't hesitate in joining the <a href="http://groups.google.com/group/typus" rel="external">Typus</a> mailing list.</p>
+<p>If you need help don't hesitate in joining the <%= link_to 'Typus', 'http://groups.google.com/group/typus', :rel => 'external' %> mailing list.</p>
 
 <p>Replace this message adding a <code>_sidebar.html.erb</code> file on the <code>app/views/admin/dashboard</code> folder.</p>
 

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

@@ -1,17 +1,15 @@
 <% content_for :sidebar do %>
-  <%= typus_block :resource => @resource[:self], :partial => :edit_sidebar %>
+  <%= typus_block :location => @resource[:self], :partial => 'sidebar' %>
   <%= actions %>
 <% end %>
 
-<%= typus_block :resource => @resource[:self], :partial => :edit %>
-
 <%= display_link_to_previous if params[:back_to] %>
 
 <h2><%= link_to _('Dashboard'), admin_dashboard_path %> &rsaquo; 
     <%= link_to _(@resource[:class].human_name.pluralize), :action => 'index' %> &rsaquo; 
     <%= _('Edit') %></h2>
 
-<%= typus_block :resource => @resource[:self], :partial => :edit_top %>
+<%= typus_block :location => @resource[:self], :partial => 'edit' %>
 
 <% form_for @item, 
             :url  => { :action => 'update',
@@ -24,6 +22,4 @@
   <p><%= submit_tag _('Update entry'), :class => 'button' %></p>
 <% end %>
 
-<%= typus_relationships %>
-
-<%= typus_block :resource => @resource[:self], :partial => :edit_bottom %>
+<%= typus_relationships %>

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

@@ -1,16 +1,14 @@
 <% content_for :sidebar do %>
-  <%= typus_block :resource => @resource[:self], :partial => :index_sidebar %>
+  <%= typus_block :location => @resource[:self], :partial => 'sidebar' %>
   <%= actions %>
   <%= search %>
   <%= filters %>
 <% end %>
 
-<%= typus_block :resource => @resource[:self], :partial => :index %>
-
 <h2><%= link_to _('Dashboard'), admin_dashboard_path %> &rsaquo; 
     <%= _(@resource[:class].human_name.pluralize) %> <%= remove_filter_link %></h2>
 
-<%= typus_block :resource => @resource[:self], :partial => :index_top %>
+<%= typus_block :location => @resource[:self], :partial => 'index' %>
 
 <% unless @items.count.zero? -%>
   <%= build_list(@resource[:class], @fields, @items) %>
@@ -23,6 +21,4 @@
       <p><%= _("There are no {{records}} under this filter.", :records => @resource[:class].human_name.pluralize.downcase) %></p>
     <% end %>
   </div>
-<% end %>
-
-<%= typus_block :resource => @resource[:self], :partial => :index_bottom %>
+<% end %>

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

@@ -1,17 +1,15 @@
 <% content_for :sidebar do %>
-  <%= typus_block :resource => @resource[:self], :partial => :new_sidebar %>
+  <%= typus_block :location => @resource[:self], :partial => 'sidebar' %>
   <%= actions %>
 <% end %>
 
-<%= typus_block :resource => @resource[:self], :partial => :new %>
-
 <%= display_link_to_previous if params[:back_to] %>
 
 <h2><%= link_to _('Dashboard'), admin_dashboard_path %> &rsaquo; 
     <%= link_to _(@resource[:class].human_name.pluralize), :action => 'index' %> &rsaquo; 
     <%= _('New') %></h2>
 
-<%= typus_block :resource => @resource[:self], :partial => :new_top %>
+<%= typus_block :location => @resource[:self], :partial => 'new' %>
 
 <% form_for @item, 
             :url  => { :action => 'create', 
@@ -22,6 +20,4 @@
             :html => { :multipart => true } do |f| %>
   <%= build_form(@fields) %>
   <p><%= submit_tag _('Create entry'), :class => 'button' %></p>
-<% end %>
-
-<%= typus_block :resource => @resource[:self], :partial => :new_bottom %>
+<% end %>

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

@@ -1,21 +1,17 @@
 <% content_for :sidebar do %>
-  <%= typus_block :resource => @resource[:self], :partial => :show_sidebar %>
+  <%= typus_block :location => @resource[:self], :partial => 'sidebar' %>
   <%= actions %>
 <% end %>
 
-<%= typus_block :resource => @resource[:self], :partial => :show %>
-
 <h2><%= link_to _('Dashboard'), admin_dashboard_path %> &rsaquo; 
     <%= link_to _(@resource[:class].human_name.pluralize), :action => 'index' %> &rsaquo; 
     <%= _('Show') %></h2>
 
-<%= typus_block :resource => @resource[:self], :partial => :show_top %>
+<%= typus_block :location => @resource[:self], :partial => 'show' %>
 
 <dl>
 <%- @fields.map { |u| u.first }.each do |column| -%>
   <dt><%=h @resource[:class].human_attribute_name(column) %></dt>
   <dd><%=h (!@item.send(column).blank?) ? @item.send(column) : 'nil' %></dd>
 <%- end -%>
-</dl>
-
-<%= typus_block :resource => @resource[:self], :partial => :show_bottom %>
+</dl>

data/app/views/admin/shared/_footer.html.erb

@@ -1 +1 @@
-<p><a href="http://intraducibles.com/projects/typus">Typus</a> is the effortless backend interface for <a href="http://rubyonrails.org/">Ruby on Rails</a> applications.</p>
+<p><%= link_to 'Typus', 'http://intraducibles.com/projects/typus', :rel => 'external' %> is the effortless backend interface for <%= link_to 'Ruby on Rails', 'http://rubyonrails.org/', :rel => 'external' %> applications.</p>

data/app/views/typus/dashboard.html.erb

@@ -2,12 +2,8 @@
   <%= typus_block :location => 'dashboard', :partial => 'sidebar' %>
 <% end %>
 
-<h2><%= _("Dashboard") %></h2>
-
-<%= typus_block :location => 'dashboard', :partial => 'top' %>
+<h2><%= _('Dashboard') %></h2>
 
 <%= resources %>
 
-<%= applications %>
-
-<%= typus_block :location => 'dashboard', :partial => 'bottom' %>
+<%= applications %>

data/app/views/typus/recover_password.html.erb

@@ -1,7 +1,7 @@
 <% form_tag admin_recover_password_path do %>
   <ul>
-  <li><label for="email"><%= _("Email") %></label>
-  <%= text_field :user, :email, :size => "20", :class => 'text' %></li>
-  <li><%= submit_tag _("Recover password"), :class => 'button' %> <%= link_to _("I remember my password"), admin_sign_in_path %></li>
+  <li><label for="email"><%= _('Email') %></label>
+  <%= text_field :user, :email, :size => 20, :class => 'text' %></li>
+  <li><%= submit_tag _('Recover password'), :class => 'button' %> <%= link_to _('I remember my password'), admin_sign_in_path %></li>
   </ul>
 <% end %>

data/app/views/typus/reset_password.html.erb

@@ -3,11 +3,11 @@
   <%= hidden_field_tag :token, @user.token %>
 
   <ul>
-  <li><label for="password"><%= _("Password") %></label>
+  <li><label for="password"><%= _('Password') %></label>
   <%= password_field :user, :password, :size => 20, :class => 'text' %></li>
-  <li><label for="password"><%= _("Password confirm") %></label>
+  <li><label for="password"><%= _('Password confirm') %></label>
   <%= password_field :user, :password_confirmation, :size => 20, :class => 'text' %></li>
-  <li><%= submit_tag _("Change password"), :class => 'button' %> <%= link_to _("I remember my password"), admin_sign_in_path %></li>
+  <li><%= submit_tag _('Change password'), :class => 'button' %> <%= link_to _('I remember my password'), admin_sign_in_path %></li>
   </ul>
 
 <% end %>

data/app/views/typus/sign_in.html.erb

@@ -1,9 +1,9 @@
 <% form_tag admin_sign_in_path(:back_to => params[:back_to]) do %>
   <ul>
-  <li><label for="email"><%= _("Email") %></label>
+  <li><label for="email"><%= _('Email') %></label>
   <%= text_field :user, :email, :size => 20, :class => 'text' %></li>
-  <li><label for="password"><%= _("Password") %></label>
+  <li><label for="password"><%= _('Password') %></label>
   <%= password_field :user, :password, :size => 20, :class => 'text' %></li>
-  <li><%= submit_tag _("Sign in"), :class => 'button' %> <%= link_to _("Recover password"), admin_recover_password_path if Typus::Configuration.options[:recover_password] %></li>
+  <li><%= submit_tag _('Sign in'), :class => 'button' %> <%= link_to _('Recover password'), admin_recover_password_path if Typus::Configuration.options[:recover_password] %></li>
   </ul>
 <% end %>

data/app/views/typus/sign_up.html.erb

@@ -1,7 +1,7 @@
 <% form_tag admin_sign_up_path do %>
   <ul>
-  <li><label for="email"><%= _("Email") %></label>
+  <li><label for="email"><%= _('Email') %></label>
   <%= text_field :user, :email, :size => 20, :class => 'text' %></li>
-  <li><%= submit_tag _("Sign up"), :class => 'button' %></li>
+  <li><%= submit_tag _('Sign up'), :class => 'button' %></li>
   </ul>
 <% end %>

data/config/locales/es.yml

@@ -9,7 +9,6 @@ es:
   "That doesn't seem like a valid email address": "Eso no parecia una dirección válida de correo electrónico."
   "I remember my password": "Recuerdo mi contraseña"
   "Password recovery link sent to your email": "Enlace de recuperación de contraseña enviado a tu correo electrónico."
-  "You can login with your new password": "Puedes acceder con tu nueva contraseña."
   "Passwords don't match": "Las Contraseñas no coinciden."
   "A valid token is required": "Se requiere un token válido."
   "The email and/or password you entered is invalid": "El correo y/o la contraseña proporcionadas no son válidas."

data/config/locales/pt-BR.yml

@@ -9,7 +9,6 @@ pt-BR:
   "That doesn't seem like a valid email address": "Este não parece um email válido"
   "I remember my password": "Lembro minha senha"
   "Password recovery link sent to your email": "Link para recuperar senha enviado para seu email."
-  "You can login with your new password": "Você já pode entrar com sua nova senha."
   "Passwords don't match": "As senhas não conferem."
   "A valid token is required": "É necessário um token válido."
   "The email and/or password you entered is invalid": "O email e/ou a senha que você colocou são inválidos."

data/config/locales/ru.yml

@@ -0,0 +1,107 @@
+ru:
+  "Email": "E-Mail"
+  "Password": "Пароль"
+  "Password confirmation": "Подтверждение пароля"
+  "Sign in": "Войти"
+  "Recover password": "Восстановить пароль"
+  "Sign up": "Зарегистрироваться"
+  "Enter your email below to create the first user": "Введите E-Mail для создания первого пользователя"
+  "That doesn't seem like a valid email address": "E-Mail некорректен"
+  "I remember my password": "Запомнить пароль"
+  "Password recovery link sent to your email": "Ссылка для восставновления пароля выслана по указанному E-Mail"
+  "Passwords don't match": "Пароли не совпадают"
+  "A valid token is required": "Необходим корректный ключ"
+  "The email and/or password you entered is invalid": "E-Mail или пароль введены неверно"
+  "There are not defined applications in config/typus/*.yml": "Ни одного приложения не определено в config/typus/*.yml"
+  "Overview": "Обзор"
+  "Options": "Опции"
+  "Password confirmation": "Подтверждение пароля"
+  "Change password": "Сменить пароль"
+  "There are no {{records}}": "{{records}} не найдены"
+  "There are no {{records}} under this filter": "{{records}} по такому фильтру не найдены"
+  "Dashboard": "Обзор"
+  "Create entry": "Создать запись"
+  "Update entry": "Изменить запись"
+  "New": "Новый"
+  "Show": "Показать"
+  "Edit": "Editar"
+  "Login": "Редактировать"
+  "Setup": "Установки"
+  "Create": "Создать"
+  "Sign out": "Выйти"
+  "Update": "Обновить"
+  "View site": "Перейти к сайту"
+  "Logged as": "Вы вошли как"
+  "Remove filter": "Удалить фильтр"
+  "Back to list": "Назад к списку"
+  "Actions": "Действия"
+  "Add": "Добавить"
+  "← Previous": "← Предыдущая"
+  "Next →": "Следующая →"
+  "Previous": "Предыдующий"
+  "Next": "Следующий"
+  "Search": "Поиск"
+  "Search by": "Искать по"
+  "{{model}} successfully updated": "{{model}} успешно обновлен"
+  "{{model}} successfully created": "{{model}} создан"
+  "{{model}} successfully removed": "{{model}} удален"
+  "{{model}} {{attribute}} changed": "{{model}} {{attribute}} изменен"
+  "You're adding a new {{resource_from}} to {{resource_to}}": "Вы добавляете новый {{resource_from}} для {{resource_to}}."
+  "You're adding a new {{resource_from}}": "Вы добавляете новый {{resource_from}}."
+  "You're updating a {{resource_from}} for {{resource_to}}": "Вы редактируете {{resource_from}} для {{resource_to}}."
+  "You're updating a {{resource_from}}": "Вы редактируете {{resource_from}}."
+  "Toggle is disabled": "Переключение отключено"
+  "Record moved {{to}}": "Запись перемещена в {{to}}."
+  "{{model_a}} related to {{model_b}}": "{{model_a}} присоединен с {{model_b}}."
+  "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} добавлен к {{model_b}}."
+  "{{model_a}} unrelated from {{model_b}}": "{{model_a}} отсоединен от {{model_b}}."
+  "{{model_a}} removed from {{model_b}}": "{{model_a}} удален из {{model_b}}."
+  "Your new password is {{password}}": "Ваш новый пароль: {{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}} не может выполнить действие. ({{action}})"
+  "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} не может перейти к {{action}} в {{controller}}."
+  "{{current_user_role}} can't delete this item": "{{current_user_role}} не может удалить эту запись"
+  "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} не может выполнить действие ({{action}})"
+  "Record owned by another user": "Запись принадлежит другому пользователю."
+  "{{current_user_role}} can't display items": "{{current_user_role}} не может отобразить записи"
+  "Submodules": "Подмодули"
+  "Parent module": "Дочерний модуль"
+  "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}}?": "Отсоединить {{unrelate_model}} от {{unrelate_model_from}}?"
+  "Change {{attribute}}?": "Изменить {{attribute}}?"
+  "Set language": "Установить язык"
+  "Today": "Сегодня"
+  "Past 7 days": "Последние 7 дней"
+  "This month": "Этот месяц"
+  "This year": "Этот год"
+  "Created at": "Создано"
+  "Updated at": "Обновлено"

data/lib/typus/active_record.rb

@@ -212,7 +212,7 @@ module Typus
       # If a search is performed.
       if query_params[:search]
         search = typus_defaults_for(:search).map do |s|
-                   ["LOWER(#{s}) LIKE '%#{query_params[:search].downcase}%'"]
+                   ["LOWER(#{s}) LIKE '%#{ActiveRecord::Base.connection.quote_string(query_params[:search].downcase)}%'"]
                  end
         conditions = merge_conditions(conditions, search.join(' OR '))
       end

data/lib/typus/generator.rb

@@ -64,7 +64,7 @@ end
       view_folder = "#{admin_views_folder}/#{resource.underscore}"
       view_filename = "index.html.erb"
 
-      if !File.exists?("#{view_folder}/#{view_filename}")
+      if !File.exist?("#{view_folder}/#{view_filename}")
         Dir.mkdir(view_folder) unless File.directory?(view_folder)
         view = File.open("#{view_folder}/#{view_filename}", "w+")
         content = <<-RAW

data/lib/typus/quick_edit.rb

@@ -6,25 +6,32 @@ module Typus
 
       render :text => '' and return unless session[:typus_user_id]
 
-      url = url_for :controller => "admin/#{params[:resource]}", 
-                    :action => 'edit', 
-                    :id => params[:id]
-
-      @content = <<-HTML
-  var links = '';
-  links += '<div id="quick_edit">';
-  links += '<a href=\"#{url}\">#{params[:message]}</a>';
-  links += '</div>';
-  links += '<style type="text/css">';
-  links += '<!--';
-  links += '#quick_edit { font-size: 11px; float: right; position: fixed; right: 0px; background: #{params[:color]}; margin: 5px; padding: 3px 5px; }';
-  links += '#quick_edit a { color: #FFF; font-weight: bold; }'
-  links += '-->';
-  links += '</style>';
-  document.write(links);
-        HTML
-
-      render :text => @content
+      links = [[ "Dashboard", admin_dashboard_path ] ]
+      links << [ params[:message], "/admin/#{params[:path]}" ] if params[:message] && params[:path]
+
+      options = links.reverse.map do |link|
+                  "<li><a href=\"#{link.last}\">#{link.first}</a></li>"
+                end
+
+      content = <<-HTML
+var links = '';
+links += '<div id="quick_edit">';
+links += '<ul>';
+links += '#{options}';
+links += '</ul>';
+links += '</div>';
+links += '<style type="text/css">';
+links += '<!--';
+links += '#quick_edit { font-size: 12px; font-family: sans-serif; position: absolute; top: 0px; right: 0px; margin: 10px; }';
+links += '#quick_edit a { color: #FFF; font-weight: bold; text-decoration: none; }'
+links += '#quick_edit ul { margin: 0; padding: 0; }';
+links += '#quick_edit li { display: inline; background: #000; margin: 0 0 0 5px; padding: 3px 5px; }';
+links += '-->';
+links += '</style>';
+document.write(links);
+      HTML
+
+      render :text => content
 
     end
 

data/lib/typus.rb

@@ -85,7 +85,7 @@ module Typus
     end
 
     def plugin?
-      File.exists?("#{Rails.root}/vendor/plugins/typus")
+      File.exist?("#{Rails.root}/vendor/plugins/typus")
     end
 
     ##

data/test/fixtures/app/views/admin/comments/_edit.html.erb

@@ -0,0 +1 @@
+_edit.html.erb

data/test/fixtures/app/views/admin/comments/_index.html.erb

@@ -0,0 +1 @@
+_index.html.erb

data/test/fixtures/app/views/admin/comments/_new.html.erb

@@ -0,0 +1 @@
+_new.html.erb

data/test/fixtures/app/views/admin/comments/_show.html.erb

@@ -0,0 +1 @@
+_show.html.erb

data/test/fixtures/app/views/admin/comments/_sidebar.html.erb

@@ -0,0 +1 @@
+_sidebar.html.erb

data/test/fixtures/app/views/admin/dashboard/_content.html.erb

@@ -0,0 +1 @@
+_content.html.erb

data/test/fixtures/app/views/admin/resources/_sidebar.html.erb

@@ -0,0 +1 @@
+_sidebar.html.erb

data/test/functional/admin/comments_controller_test.rb

@@ -11,24 +11,31 @@ class Admin::CommentsControllerTest < ActionController::TestCase
     @comment = comments(:first)
   end
 
-  def test_should_render_posts_extensions_on_index
+  def test_should_render_comments_partials_on_index
     get :index
     assert_response :success
-    partials = %w( _index_sidebar.html.erb _index_top.html.erb _index_bottom.html.erb )
+    partials = %w( _index.html.erb _sidebar.html.erb )
     partials.each { |p| assert_match p, @response.body }
   end
 
-  def test_should_render_posts_extensions_on_edit
+  def test_should_render_comments_partials_on_new
+    get :new
+    assert_response :success
+    partials = %w( _new.html.erb _sidebar.html.erb )
+    partials.each { |p| assert_match p, @response.body }
+  end
+
+  def test_should_render_comments_partials_on_edit
     get :edit, { :id => @comment.id }
     assert_response :success
-    partials = %w( _edit_sidebar.html.erb _edit_top.html.erb _edit_bottom.html.erb )
+    partials = %w( _edit.html.erb _sidebar.html.erb )
     partials.each { |p| assert_match p, @response.body }
   end
 
-  def test_should_render_posts_extensions_on_show
+  def test_should_render_comments_partials_on_show
     get :show, { :id => @comment.id }
     assert_response :success
-    partials = %w( _show_sidebar.html.erb _show_top.html.erb _show_bottom.html.erb )
+    partials = %w( _show.html.erb _sidebar.html.erb )
     partials.each { |p| assert_match p, @response.body }
   end
 

data/test/functional/typus_controller_test.rb

@@ -117,6 +117,13 @@ class TypusControllerTest < ActionController::TestCase
 
   end
 
+  def test_should_sign_in_user_after_password_change
+    typus_user = typus_users(:admin)
+    post :reset_password, { :token => typus_user.token, :user => { :password => '12345678', :password_confirmation => '12345678' } }
+    assert_response :redirect
+    assert_redirected_to admin_dashboard_path
+  end
+
   def test_should_be_redirected_if_password_does_not_match_confirmation
     typus_user = typus_users(:admin)
     post :reset_password, { :token => typus_user.token, :user => { :password => 'drowssap', :password_confirmation => 'drowssap2' } }
@@ -308,7 +315,7 @@ class TypusControllerTest < ActionController::TestCase
     @request.session[:typus_user_id] = admin.id
     get :dashboard
     assert_response :success
-    partials = %w( _sidebar.html.erb _top.html.erb _bottom.html.erb )
+    partials = %w( _sidebar.html.erb )
     partials.each { |p| assert_match p, @response.body }
   end
 

data/test/helpers/admin/form_helper_test.rb

@@ -22,6 +22,7 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
     @current_user = mock()
     @current_user.expects(:can_perform?).with(Post, 'create').returns(false)
+    @resource = { :class => Comment }
 
     expected = <<-HTML
 <li><label for="item_post">Post
@@ -34,7 +35,7 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 <option value="2">Post#2</option></select></li>
     HTML
 
-    assert_equal expected, typus_belongs_to_field('post', Comment)
+    assert_equal expected, typus_belongs_to_field('post')
 
   end
 
@@ -47,6 +48,7 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
     @current_user = mock()
     @current_user.expects(:can_perform?).with(Comment, 'create').returns(true)
+    @resource = { :class => Post }
 
     expected = <<-HTML
 <li><label for="item_favorite_comment">Favorite comment
@@ -58,13 +60,15 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 <option value="3">John</option>
 <option value="4">Me</option></select></li>
     HTML
-    assert_equal expected, typus_belongs_to_field('favorite_comment', Post)
+    assert_equal expected, typus_belongs_to_field('favorite_comment')
 
   end
 
   def test_typus_boolean_field
 
-    output = typus_boolean_field('test', Post)
+    @resource = { :class => Post }
+
+    output = typus_boolean_field('test')
 
     expected = <<-HTML
 <li><label for="item_test">Test</label>
@@ -77,7 +81,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_date_field
 
-    output = typus_date_field('test', {}, Post)
+    @resource = { :class => Post }
+
+    output = typus_date_field('test', {})
     expected = <<-HTML
 <li><label for="item_test">Test</label>
     HTML
@@ -88,7 +94,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_datetime_field
 
-    output = typus_datetime_field('test', {}, Post)
+    @resource = { :class => Post }
+
+    output = typus_datetime_field('test', {})
     expected = <<-HTML
 <li><label for="item_test">Test</label>
     HTML
@@ -99,7 +107,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_file_field
 
-    output = typus_file_field('asset_file_name', Post)
+    @resource = { :class => Post }
+
+    output = typus_file_field('asset_file_name')
     expected = <<-HTML
 <li><label for="item_asset_file_name">Asset</label>
 <input id="item_asset" name="item[asset]" size="30" type="file" /></li>
@@ -111,7 +121,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_password_field
 
-    output = typus_password_field('test', Post)
+    @resource = { :class => Post }
+
+    output = typus_password_field('test')
     expected = <<-HTML
 <li><label for="item_test">Test</label>
 <input class="text" id="item_test" name="item[test]" size="30" type="password" /></li>
@@ -146,7 +158,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_text_field
 
-    output = typus_text_field('test', Post)
+    @resource = { :class => Post }
+
+    output = typus_text_field('test')
     expected = <<-HTML
 <li><label for="item_test">Test</label>
 <textarea class="text" cols="40" id="item_test" name="item[test]" rows="10"></textarea></li>
@@ -158,7 +172,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_time_field
 
-    output = typus_time_field('test', {}, Post)
+    @resource = { :class => Post }
+
+    output = typus_time_field('test', {})
     expected = <<-HTML
 <li><label for="item_test">Test</label>
     HTML
@@ -191,7 +207,9 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_typus_string_field
 
-    output = typus_string_field('test', Post)
+    @resource = { :class => Post }
+
+    output = typus_string_field('test')
     expected = <<-HTML
 <li><label for="item_test">Test</label>
 <input class="text" id="item_test" name="item[test]" size="30" type="text" /></li>
@@ -267,13 +285,15 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   def test_attribute_disabled
 
-    assert !attribute_disabled?('test', Post)
+    @resource = { :class => Post }
+
+    assert !attribute_disabled?('test')
 
     Post.expects(:accessible_attributes).returns(['test'])
-    assert !attribute_disabled?('test', Post)
+    assert !attribute_disabled?('test')
 
     Post.expects(:accessible_attributes).returns(['no_test'])
-    assert attribute_disabled?('test', Post)
+    assert attribute_disabled?('test')
 
   end
 

data/test/helpers/admin/master_helper_test.rb

@@ -49,7 +49,7 @@ class Admin::MasterHelperTest < ActiveSupport::TestCase
     resource = 'typus_users'
 
     self.stubs(:render).returns('a_template')
-    File.stubs(:exists?).returns(true)
+    File.stubs(:exist?).returns(true)
 
     output = build_list(model, fields, items, resource)
     expected = 'a_template'

data/test/helpers/admin/public_helper_test.rb

@@ -6,12 +6,12 @@ class Admin::PublicHelperTest < ActiveSupport::TestCase
 
   def test_quick_edit
 
-    options = { :color => 'CC0000', :link => 'quick_edit', :resource => 'posts', :id => '1', :action => 'edit' }
+    options = { :path => 'articles/edit/1', :message => 'Edit this article' }
     output = quick_edit(options)
 
     html = <<-HTML
 <script type="text/javascript">
-  document.write('<script type="text/javascript" src="quick_edit?action=edit&id=1&resource=posts" />');
+  document.write('<script type="text/javascript" src="quick_edit?message=Edit+this+article&path=articles%2Fedit%2F1" />');
 </script>
     HTML
 
@@ -19,4 +19,8 @@ class Admin::PublicHelperTest < ActiveSupport::TestCase
 
   end
 
+  def admin_quick_edit_path
+    'quick_edit'
+  end
+
 end

data/test/lib/configuration_test.rb

@@ -8,7 +8,7 @@ class ConfigurationTest < ActiveSupport::TestCase
 
   def test_should_verify_application_wide_configuration_options
     initializer = "#{Rails.root}/config/initializers/typus.rb"
-    return if File.exists?(initializer)
+    return if File.exist?(initializer)
     assert_equal 'Typus', Typus::Configuration.options[:app_name]
     assert_equal 'vendor/plugins/typus/test/config/working', Typus::Configuration.options[:config_folder]
     assert_equal 'admin@example.com', Typus::Configuration.options[:email]
@@ -23,7 +23,7 @@ class ConfigurationTest < ActiveSupport::TestCase
 
   def test_should_verify_model_configuration_options
     initializer = "#{Rails.root}/config/initializers/typus.rb"
-    return if File.exists?(initializer)
+    return if File.exist?(initializer)
     assert_equal 'edit', Typus::Configuration.options[:default_action_on_item]
     assert_equal nil, Typus::Configuration.options[:end_year]
     assert_equal 10, Typus::Configuration.options[:form_rows]

data/test/lib/typus_test.rb

@@ -14,7 +14,7 @@ class TypusTest < ActiveSupport::TestCase
 
   def test_should_return_locales
     initializer = "#{Rails.root}/config/initializers/typus.rb"
-    return if File.exists?(initializer)
+    return if File.exist?(initializer)
     assert Typus.respond_to?(:locales)
     assert Typus.locales.kind_of?(Array)
     assert_equal [["English", :en]], Typus.locales

data/test/unit/typus_user_test.rb

@@ -18,6 +18,12 @@ class TypusUserTest < ActiveSupport::TestCase
     end
   end
 
+  def test_should_verify_definition_on_instance_methods
+    %w( is_root? authenticated? ).each do |instance_method|
+      assert TypusUser.instance_methods.include?(instance_method)
+    end
+  end
+
   def test_should_verify_email_format
     @typus_user.email = 'admin'
     assert @typus_user.invalid?

data/typus.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-05-30}
+  s.date = %q{2009-06-07}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "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/routes.rb",
      "generators/typus/templates/config/initializers/typus.rb",
@@ -112,21 +113,14 @@ Gem::Specification.new do |s|
      "test/fixtures/app/controllers/admin/status_controller.rb",
      "test/fixtures/app/controllers/admin/typus_users_controller.rb",
      "test/fixtures/app/controllers/admin/watch_dog_controller.rb",
-     "test/fixtures/app/views/admin/comments/_edit_bottom.html.erb",
-     "test/fixtures/app/views/admin/comments/_edit_sidebar.html.erb",
-     "test/fixtures/app/views/admin/comments/_edit_top.html.erb",
-     "test/fixtures/app/views/admin/comments/_index_bottom.html.erb",
-     "test/fixtures/app/views/admin/comments/_index_sidebar.html.erb",
-     "test/fixtures/app/views/admin/comments/_index_top.html.erb",
-     "test/fixtures/app/views/admin/comments/_new_bottom.html.erb",
-     "test/fixtures/app/views/admin/comments/_new_sidebar.html.erb",
-     "test/fixtures/app/views/admin/comments/_new_top.html.erb",
-     "test/fixtures/app/views/admin/comments/_show_bottom.html.erb",
-     "test/fixtures/app/views/admin/comments/_show_sidebar.html.erb",
-     "test/fixtures/app/views/admin/comments/_show_top.html.erb",
-     "test/fixtures/app/views/admin/dashboard/_bottom.html.erb",
+     "test/fixtures/app/views/admin/comments/_edit.html.erb",
+     "test/fixtures/app/views/admin/comments/_index.html.erb",
+     "test/fixtures/app/views/admin/comments/_new.html.erb",
+     "test/fixtures/app/views/admin/comments/_show.html.erb",
+     "test/fixtures/app/views/admin/comments/_sidebar.html.erb",
+     "test/fixtures/app/views/admin/dashboard/_content.html.erb",
      "test/fixtures/app/views/admin/dashboard/_sidebar.html.erb",
-     "test/fixtures/app/views/admin/dashboard/_top.html.erb",
+     "test/fixtures/app/views/admin/resources/_sidebar.html.erb",
      "test/fixtures/app/views/admin/shared/_footer.html.erb",
      "test/fixtures/app/views/admin/status/index.html.erb",
      "test/fixtures/app/views/admin/templates/_datepicker.html.erb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fesplugas-typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,7 @@ files:
 - 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/routes.rb
 - generators/typus/templates/config/initializers/typus.rb
@@ -121,21 +122,14 @@ files:
 - test/fixtures/app/controllers/admin/status_controller.rb
 - test/fixtures/app/controllers/admin/typus_users_controller.rb
 - test/fixtures/app/controllers/admin/watch_dog_controller.rb
-- test/fixtures/app/views/admin/comments/_edit_bottom.html.erb
-- test/fixtures/app/views/admin/comments/_edit_sidebar.html.erb
-- test/fixtures/app/views/admin/comments/_edit_top.html.erb
-- test/fixtures/app/views/admin/comments/_index_bottom.html.erb
-- test/fixtures/app/views/admin/comments/_index_sidebar.html.erb
-- test/fixtures/app/views/admin/comments/_index_top.html.erb
-- test/fixtures/app/views/admin/comments/_new_bottom.html.erb
-- test/fixtures/app/views/admin/comments/_new_sidebar.html.erb
-- test/fixtures/app/views/admin/comments/_new_top.html.erb
-- test/fixtures/app/views/admin/comments/_show_bottom.html.erb
-- test/fixtures/app/views/admin/comments/_show_sidebar.html.erb
-- test/fixtures/app/views/admin/comments/_show_top.html.erb
-- test/fixtures/app/views/admin/dashboard/_bottom.html.erb
+- test/fixtures/app/views/admin/comments/_edit.html.erb
+- test/fixtures/app/views/admin/comments/_index.html.erb
+- test/fixtures/app/views/admin/comments/_new.html.erb
+- test/fixtures/app/views/admin/comments/_show.html.erb
+- test/fixtures/app/views/admin/comments/_sidebar.html.erb
+- test/fixtures/app/views/admin/dashboard/_content.html.erb
 - test/fixtures/app/views/admin/dashboard/_sidebar.html.erb
-- test/fixtures/app/views/admin/dashboard/_top.html.erb
+- test/fixtures/app/views/admin/resources/_sidebar.html.erb
 - test/fixtures/app/views/admin/shared/_footer.html.erb
 - test/fixtures/app/views/admin/status/index.html.erb
 - test/fixtures/app/views/admin/templates/_datepicker.html.erb

data/test/fixtures/app/views/admin/comments/_edit_bottom.html.erb

@@ -1 +0,0 @@
-_edit_bottom.html.erb

data/test/fixtures/app/views/admin/comments/_edit_sidebar.html.erb

@@ -1 +0,0 @@
-_edit_sidebar.html.erb

data/test/fixtures/app/views/admin/comments/_edit_top.html.erb

@@ -1 +0,0 @@
-_edit_top.html.erb

data/test/fixtures/app/views/admin/comments/_index_bottom.html.erb

@@ -1 +0,0 @@
-_index_bottom.html.erb

data/test/fixtures/app/views/admin/comments/_index_sidebar.html.erb

@@ -1 +0,0 @@
-_index_sidebar.html.erb

data/test/fixtures/app/views/admin/comments/_index_top.html.erb

@@ -1 +0,0 @@
-_index_top.html.erb

data/test/fixtures/app/views/admin/comments/_new_bottom.html.erb

@@ -1 +0,0 @@
-_new_bottom.html.erb

data/test/fixtures/app/views/admin/comments/_new_sidebar.html.erb

@@ -1 +0,0 @@
-_new_sidebar.html.erb

data/test/fixtures/app/views/admin/comments/_new_top.html.erb

@@ -1 +0,0 @@
-_new_top.html.erb

data/test/fixtures/app/views/admin/comments/_show_bottom.html.erb

@@ -1 +0,0 @@
-_show_bottom.html.erb

data/test/fixtures/app/views/admin/comments/_show_sidebar.html.erb

@@ -1 +0,0 @@
-_show_sidebar.html.erb

data/test/fixtures/app/views/admin/comments/_show_top.html.erb

@@ -1 +0,0 @@
-_show_top.html.erb

data/test/fixtures/app/views/admin/dashboard/_bottom.html.erb

@@ -1 +0,0 @@
-_bottom.html.erb

data/test/fixtures/app/views/admin/dashboard/_top.html.erb

@@ -1 +0,0 @@
-_top.html.erb