administrate 0.7.0 → 0.8.0

data/app/views/administrate/application/_icons.erb

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+  <symbol id="icon-cancel" viewBox="0 0 48 48">
+    <path fill-rule="evenodd" d="M24 19.757l-8.485-8.485c-.784-.783-2.047-.782-2.827 0l-1.417 1.416c-.777.777-.78 2.046.002 2.827L19.757 24l-8.485 8.485c-.783.784-.782 2.047 0 2.827l1.416 1.417c.777.777 2.046.78 2.827-.002L24 28.243l8.485 8.485c.784.783 2.047.782 2.827 0l1.417-1.416c.777-.777.78-2.046-.002-2.827L28.243 24l8.485-8.485c.783-.784.782-2.047 0-2.827l-1.416-1.417c-.777-.777-2.046-.78-2.827.002L24 19.757zM24 47c12.703 0 23-10.297 23-23S36.703 1 24 1 1 11.297 1 24s10.297 23 23 23z" />
+  </symbol>
+
+  <symbol id="icon-eyeglass" viewBox="0 0 48 48">
+    <path d="M27.885 32.515c-2.864 1.966-6.333 3.116-10.07 3.116C7.976 35.63 0 27.656 0 17.817 0 7.976 7.976 0 17.816 0S35.63 7.976 35.63 17.816c0 3.736-1.15 7.205-3.115 10.07l14.53 14.53c1.278 1.277 1.275 3.352 0 4.628-1.28 1.278-3.353 1.278-4.63 0l-14.53-14.53zm-10.07-3.736c6.056 0 10.964-4.91 10.964-10.964 0-6.055-4.91-10.964-10.964-10.964-6.055 0-10.964 4.91-10.964 10.964 0 6.055 4.91 10.963 10.964 10.963z" />
+  </symbol>
+
+  <symbol id="icon-up-caret" viewBox="0 0 48 48">
+    <path d="M2.988 33.02c-1.66 0-1.943-.81-.618-1.824l20-15.28c.878-.672 2.31-.67 3.188 0l20.075 15.288c1.316 1.003 1.048 1.816-.62 1.816H2.987z" />
+  </symbol>
+</svg>

data/app/views/administrate/application/_search.html.erb

@@ -1,21 +1,25 @@
 <form class="search" role="search">
-  <span class="search__icon">
-    <%= svg_tag "administrate/search.svg", "search", width: 16, height: 16 %>
-  </span>
-  <input
-    type="text"
-    name="search"
-    class="search__input"
-    placeholder="Search"
-    value="<%= search_term %>"
-    aria-label="Search"
-  />
-  <span class="search__hint">
-    Press enter to search
-  </span>
-  <span class="search__clear">
-    <%= link_to clear_search_params do %>
-      <%= svg_tag "administrate/cancel.svg", "cancel-search", width: 16, height: 16 %>
-    <% end %>
-  </span>
+  <label class="search__label" for="search">
+    <svg class="search__eyeglass-icon" role="img">
+      <title>
+        <%= t("administrate.search.label", resource: resource_name) %>
+      </title>
+      <use xlink:href="#icon-eyeglass" />
+    </svg>
+  </label>
+
+  <input class="search__input"
+         id="search"
+         type="search"
+         name="search"
+         placeholder="<%= t("administrate.search.label",
+                            resource: resource_name) %>"
+         value="<%= search_term %>">
+
+  <%= link_to clear_search_params, class: "search__clear-link" do %>
+    <svg class="search__clear-icon" role="img">
+      <title><%= t("administrate.search.clear") %></title>
+      <use xlink:href="#icon-cancel" />
+    </svg>
+  <% end %>
 </form>

data/app/views/administrate/application/index.html.erb

@@ -27,17 +27,19 @@ It renders the `_table` partial to display details about the resources.
   <%= display_resource_name(page.resource_name) %>
 <% end %>
 
-<% content_for(:search) do %>
-  <% if show_search_bar %>
-    <%= render "search", search_term: search_term %>
-  <% end %>
-<% end %>
-
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title" id="page-title">
     <%= content_for(:title) %>
   </h1>
 
+  <% if show_search_bar %>
+    <%= render(
+      "search",
+      search_term: search_term,
+      resource_name: display_resource_name(page.resource_name)
+    ) %>
+  <% end %>
+
   <div>
     <%= link_to(
       "#{t("administrate.actions.new")} #{page.resource_name.titleize.downcase}",
@@ -48,6 +50,12 @@ It renders the `_table` partial to display details about the resources.
 </header>
 
 <section class="main-content__body main-content__body--flush">
-  <%= render "collection", collection_presenter: page, resources: resources %>
+  <%= render(
+    "collection",
+    collection_presenter: page,
+    resources: resources,
+    table_title: "page-title"
+  ) %>
+
   <%= paginate resources %>
 </section>

data/app/views/administrate/application/show.html.erb

@@ -35,7 +35,7 @@ as well as a link to its edit page.
 <section class="main-content__body">
   <dl>
     <% page.attributes.each do |attribute| %>
-      <dt class="attribute-label">
+      <dt class="attribute-label" id="<%= attribute.name %>">
       <%= t(
         "helpers.label.#{resource_name}.#{attribute.name}",
         default: attribute.name.titleize,

data/app/views/fields/has_many/_show.html.erb

@@ -22,7 +22,8 @@ from the associated resource class's dashboard.
   <%= render(
     "collection",
     collection_presenter: field.associated_collection,
-    resources: field.resources(params[field.name])
+    resources: field.resources(params[field.name]),
+    table_title: field.name
   ) %>
 
   <% if field.more_than_limit? %>

data/app/views/fields/has_one/_form.html.erb

@@ -3,8 +3,7 @@
 
 This partial renders an input element for has_one relationships.
 
-At the moment, has_one form fields are not supported,
-so this partial renders a message to that effect.
+The form will be rendered as nested_from to parent relationship.
 
 ## Local variables:
 
@@ -17,10 +16,13 @@ so this partial renders a message to that effect.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasOne
 %>
 
-<div class="field-unit__label">
-  <%= f.label field.attribute %>
-</div>
-
-<div class="field-unit__field">
-  <%= t("administrate.fields.has_one.not_supported") %>
-</div>
+<%= f.fields_for field.attribute, field.data || field.nested_form.resource.class.new do |has_one_f| %>
+  <fieldset class="field-unit--nested">
+    <legend><%= field.nested_form.resource_name.titleize %></legend>
+    <% field.nested_form.attributes.each do |attribute| -%>
+      <div class="field-unit field-unit--<%= attribute.html_class %>">
+        <%= render_field attribute, f: has_one_f %>
+      </div>
+    <% end -%>
+  </fieldset>
+<% end %>

data/app/views/fields/has_one/_show.html.erb

@@ -4,7 +4,7 @@
 This partial renders a has_one relationship,
 to be displayed on a resource's show page.
 
-By default, the relationship is rendered as a link to the associated object.
+All fields of has_one relationship would be rendered
 
 ## Local variables:
 
@@ -16,8 +16,25 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <%= link_to(
-    field.display_associated_resource,
-    [namespace, field.data],
-  ) %>
+  <fieldset class="attribute--nested">
+    <legend>
+      <%= link_to(
+        field.display_associated_resource,
+        [namespace, field.data],
+      ) %>
+    </legend>
+    <% field.nested_form.attributes.each do |attribute| -%>
+      <div>
+      <dt class="attribute-label">
+        <%= t(
+          "helpers.label.#{resource_name}.#{attribute.name}",
+          default: attribute.name.titleize,
+        ) %>
+      </dt>
+      <dd class="attribute-data attribute-data--<%= attribute.html_class %>">
+        <%= attribute.data %>
+      </dd>
+      </div>
+    <% end -%>
+  </fieldset>
 <% end %>

data/app/views/layouts/administrate/application.html.erb

@@ -25,11 +25,12 @@ By default, it renders:
   <%= csrf_meta_tags %>
 </head>
 <body>
+  <%= render "icons" %>
+
   <div class="app-container">
     <%= render "navigation" -%>
 
     <main class="main-content" role="main">
-      <%= content_for(:search) %>
       <%= render "flashes" -%>
       <%= yield %>
     </main>

data/config/locales/administrate.ar.yml

@@ -23,3 +23,6 @@ ar:
         not_supported: "غير مدعمه \"Polymorphic\" هذه العلاقه"
       has_one:
         not_supported: "غير مدعمه \"HasOne\" هذه العلاقه"
+    search:
+      clear: مسح البحث
+      label: بحث %{resource}

data/config/locales/administrate.da.yml

@@ -23,3 +23,6 @@ da:
         not_supported: "Formularer med polymorphic relationships er ikke understøttede."
       has_one:
         not_supported: "Formularer med has_one associationer er ikke understøttede."
+    search:
+      clear: Ryd søgning
+      label: Søg %{resource}

data/config/locales/administrate.de.yml

@@ -23,3 +23,6 @@ de:
         not_supported: Polymorphe Beziehungen werden nicht unterstützt.
       has_one:
         not_supported: HasOne Beziehungen werden nicht unterstützt.
+    search:
+      clear: Saubere Suche
+      label: Suche %{resource}

data/config/locales/administrate.en.yml

@@ -23,3 +23,6 @@ en:
         not_supported: Polymorphic relationship forms are not supported.
       has_one:
         not_supported: HasOne relationship forms are not supported.
+    search:
+      clear: Clear search
+      label: Search %{resource}

data/config/locales/administrate.es.yml

@@ -23,3 +23,6 @@ es:
         not_supported: Los formularios con relaciones polimórficas no están soportados.
       has_one:
         not_supported: Los formularios con relaciones HasOne no están soportados.
+    search:
+      clear: Borrar búsqueda
+      label: Buscar %{resource}

data/config/locales/administrate.fr.yml

@@ -23,3 +23,6 @@ fr:
         not_supported: Les relations polymorphiques dans les formulaires ne sont pas supportées.
       has_one:
         not_supported: Les relations HasOne dans les formulaires ne sont pas supportées.
+    search:
+      clear: Effacer la recherche
+      label: Chercher %{resource}

data/config/locales/administrate.it.yml

@@ -23,3 +23,6 @@ it:
         not_supported: Associazioni polimorfiche non ancora supportate. Spiacenti!
       has_one:
         not_supported: Associazioni HasOne non ancora supportate. Spiacenti!
+    search:
+      clear: Cancella ricerca
+      label: Ricerca %{resource}

data/config/locales/administrate.ja.yml

@@ -23,3 +23,6 @@ ja:
         not_supported: フォームでは「多：多」の関連をサポートしていません。
       has_one:
         not_supported: フォームでは「１：１」の関連をサポートしていません。
+    search:
+      clear: 検索をクリアする
+      label: サーチ %{resource}

data/config/locales/administrate.ko.yml

@@ -23,3 +23,6 @@ ko:
         not_supported: 상속 관계에 대한 양식은 제공되지 않습니다.
       has_one:
         not_supported: 일대일 관계에 대한 양식은 제공되지 않습니다.
+    search:
+      clear: 검색 초기화
+      label: "%{resource} 검색"

data/config/locales/administrate.nl.yml

@@ -23,3 +23,6 @@ nl:
         not_supported: Polymorphische relaties formulieren worden niet ondersteund.
       has_one:
         not_supported: HasOne relaties formulieren worden niet ondersteund.
+    search:
+      clear: CDuidelijke zoek
+      label: Zoeken %{resource}

data/config/locales/administrate.pl.yml

@@ -23,3 +23,6 @@ pl:
         not_supported: Relacje polimorficzne nie są obsługiwane.
       has_one:
         not_supported: Relacje jeden-do-jednego nie są obsługiwane.
+    search:
+      clear: Wyczyść wyszukiwanie
+      label: Szukanie %{resource}

data/config/locales/administrate.pt-BR.yml

@@ -24,3 +24,6 @@ pt-BR:
         not_supported: Relações polimórficas nos formulários não são suportadas.
       has_one:
         not_supported: Relações um para muitos nos formulários não são suportadas.
+    search:
+      clear: Limpar pesquisa
+      label: Pesquisa %{resource}

data/config/locales/administrate.pt.yml

@@ -24,3 +24,6 @@ pt:
         not_supported: Relações polimórficas nos formulários não são suportadas.
       has_one:
         not_supported: Relações um para muitos nos formulários não são suportadas.
+    search:
+      clear: Limpar pesquisa
+      label: Pesquisa %{resource}

data/config/locales/administrate.ru.yml

@@ -23,3 +23,6 @@ ru:
         not_supported: Полиморфные отношения в формах не поддерживаются.
       has_one:
         not_supported: HasOne отношения в формах не поддерживаются.
+    search:
+      clear: Очистить поиск
+      label: Поиск %{resource}

data/config/locales/administrate.sv.yml

@@ -23,3 +23,6 @@ sv:
         not_supported: Formulär med polymorfiska relationer stöds inte.
       has_one:
         not_supported: Formulär med HasOne relationer stöds inte.
+    search:
+      clear: Rensa sökningen
+      label: Sök %{resource}

data/config/locales/administrate.uk.yml

@@ -23,3 +23,6 @@ uk:
         not_supported: Поліморфні відношення у формах не підтримуються.
       has_one:
         not_supported: HasOne відношення у формах не підтримуються.
+    search:
+      clear: Очистити пошук
+      label: пошук %{resource}

data/config/locales/administrate.vi.yml

@@ -23,3 +23,6 @@ vi:
         not_supported: Quan hệ Polymorphic chưa được hỗ trợ.
       has_one:
         not_supported: Quan hệ HasOne chưa được hỗ trợ.
+    search:
+      clear: Tìm kiếm rõ ràng
+      label: Tìm kiếm %{resource}

data/config/locales/administrate.zh-CN.yml

@@ -23,3 +23,6 @@ zh-CN:
         not_supported: Polymorphic 关系暂不支持
       has_one:
         not_supported: HasOne 关系暂不支持.
+    search:
+      clear: 清除搜索
+      label: 搜索 %{resource}

data/config/locales/administrate.zh-TW.yml

@@ -23,3 +23,6 @@ zh-TW:
         not_supported: 表單尚未支援 Polymorphic 關聯。
       has_one:
         not_supported: 表單尚未支援 HasOne 關聯。
+    search:
+      clear: 清除搜索
+      label: 搜索 %{resource}

data/docs/customizing_controller_actions.md

@@ -28,5 +28,15 @@ class Admin::FoosController < Admin::ApplicationController
   # def find_resource(param)
   #   Foo.find_by!(slug: param)
   # end
+  #
+  # Override this if you have certain roles that require a subset
+  # this will be used to set the records shown on the `index` action.
+  # def scoped_resource
+  #  if current_user.super_admin?
+  #    resource_class
+  #  else
+  #    resource_class.with_less_stuff
+  #  end
+  # end
 end
 ```

data/docs/customizing_page_views.md

@@ -12,7 +12,7 @@ call the generators with no arguments.
 ```bash
 rails generate administrate:views:index
  # -> app/views/admin/application/index.html.erb
- # -> app/views/admin/application/_table.html.erb
+ # -> app/views/admin/application/_collection.html.erb
 
 rails generate administrate:views:show
  # -> app/views/admin/application/show.html.erb
@@ -43,7 +43,7 @@ pass in the resource name to the view generators.
 ```bash
 rails generate administrate:views:index User
  # -> app/views/admin/users/index.html.erb
- # -> app/views/admin/users/_table.html.erb
+ # -> app/views/admin/users/_collection.html.erb
 
 rails generate administrate:views:show User
  # -> app/views/admin/users/show.html.erb

data/lib/administrate/engine.rb

@@ -2,7 +2,6 @@ require "datetime_picker_rails"
 require "jquery-rails"
 require "kaminari"
 require "momentjs-rails"
-require "normalize-rails"
 require "sass-rails"
 require "selectize-rails"
 require "sprockets/railtie"
@@ -23,13 +22,6 @@ module Administrate
     @@javascripts = []
     @@stylesheets = []
 
-    Engine.config.assets.precompile << %w(
-      administrate/cancel.svg
-      administrate/dropdown.svg
-      administrate/search.svg
-      administrate/sort_arrow.svg
-    )
-
     def self.add_javascript(script)
       @@javascripts << script
     end

data/lib/administrate/field/base.rb

@@ -20,6 +20,7 @@ module Administrate
         @attribute = attribute
         @data = data
         @page = page
+        @resource = options.delete(:resource)
         @options = options
       end
 
@@ -39,7 +40,7 @@ module Administrate
         "/fields/#{self.class.field_type}/#{page}"
       end
 
-      attr_reader :attribute, :data, :page
+      attr_reader :attribute, :data, :page, :resource
 
       protected
 

data/lib/administrate/field/deferred.rb

@@ -11,7 +11,8 @@ module Administrate
       attr_reader :deferred_class, :options
 
       def new(*args)
-        deferred_class.new(*args, options)
+        new_options = args.last.respond_to?(:merge) ? args.pop : {}
+        deferred_class.new(*args, options.merge(new_options))
       end
 
       def ==(other)

data/lib/administrate/field/has_many.rb

@@ -26,7 +26,9 @@ module Administrate
       end
 
       def selected_options
-        data && data.map { |object| object.send(primary_key) }
+        return if data.empty?
+
+        data.map { |object| object.send(primary_key) }
       end
 
       def limit
@@ -46,6 +48,10 @@ module Administrate
         data.count(:all) > limit
       end
 
+      def data
+        @data ||= associated_class.none 
+      end
+
       private
 
       def includes