administrate 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73036f129507204033611e21b5a8633f80ac5b07
-  data.tar.gz: becbcb0e63d0b48e7d8c58cc722e51c57ab04640
+  metadata.gz: ecd4d11ba0fe55d836d185b1b88372b69fd661df
+  data.tar.gz: e0a491ee47a85a797d6a01df24091ab1ecb1473f
 SHA512:
-  metadata.gz: ceed2a386fcf599d33808087ffa25acfd4416356901028206506aa2095bb5b6777dd712a961d952f99220bcc9f6b189ab215ba46779fa8b1172f6528ce1fb460
-  data.tar.gz: c35a39f4b91ed15dc22b533013d6fa407c6197878e8cf4085037a25f5a9816ffc0d6de4cae4a4afe89da956bbff3bacbb11bca0c4bbfd0f4c00b53959d635461
+  metadata.gz: 0dba9aaf579c9814dabe44f50ee80cf4774a08a6aa502fdbddb34e0b518099fc0b5f598907626ff677ba34ac14c5edf77f519ecf0117a956d23dc69295d8401a
+  data.tar.gz: efecd0357a76bc8099c82e65b377b6cbff4fc30128e9f62728f54ed5359de8b38e3f342f57754e41196a1a2a643aad4603fb401de3f2669d2bb7e9a08019f213

data/app/assets/stylesheets/administrate/application.scss

@@ -1,6 +1,6 @@
 @charset "utf-8";
 
-@import "normalize-rails";
+@import "normalize";
 
 @import "selectize";
 @import "datetime_picker";

data/app/assets/stylesheets/administrate/base/_forms.scss

@@ -51,7 +51,7 @@ textarea {
   background-color: $white;
   border: $base-border;
   border-radius: $base-border-radius;
-  padding: $base-spacing / 3;
+  padding: 0.5em;
   transition: border-color $base-duration $base-timing;
   width: 100%;
 
@@ -72,6 +72,10 @@ textarea {
       border: $base-border;
     }
   }
+
+  &::placeholder {
+    font-style: italic;
+  }
 }
 
 textarea {

data/app/assets/stylesheets/administrate/components/_attributes.scss

@@ -19,3 +19,8 @@
   margin-left: 2rem;
   width: calc(85% - 1rem);
 }
+
+.attribute--nested {
+  border: $base-border;
+  padding: $small-spacing;
+}

data/app/assets/stylesheets/administrate/components/_cells.scss

@@ -27,15 +27,15 @@
 
 .cell-label__sort-indicator {
   display: inline-block;
-  height: 1em;
   overflow: hidden;
   position: absolute;
   right: 0;
 
   svg {
     fill: $hint-grey;
-    height: 100%;
+    height: 13px;
     transition: transform $base-duration $base-timing;
+    width: 13px;
   }
 }
 

data/app/assets/stylesheets/administrate/components/_field-unit.scss

@@ -19,3 +19,18 @@
   margin-left: 2rem;
   width: 45%;
 }
+
+.field-unit--nested {
+  border: $base-border;
+  margin-left: 7.5%;
+  padding: $small-spacing;
+  width: 50%;
+
+  .field-unit__field {
+    width: calc(75% - 1rem);
+  }
+
+  .field-unit__label {
+    width: calc(25% - 1rem);
+  }
+}

data/app/assets/stylesheets/administrate/components/_main-content.scss

@@ -21,10 +21,9 @@
   align-items: center;
   border-bottom: $base-border;
   display: flex;
-  justify-content: space-between;
 }
 
 .main-content__page-title {
   font-size: 1.6em;
-  margin-right: 1rem;
+  margin-right: auto;
 }

data/app/assets/stylesheets/administrate/components/_search.scss

@@ -1,81 +1,46 @@
+$_search-icon-size: 1rem;
+
 .search {
-  align-items: center;
-  border-bottom: $base-border;
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  padding-left: $base-spacing;
-  padding-right: $base-spacing;
+  margin-left: auto;
+  margin-right: 2rem;
+  max-width: 20rem;
   position: relative;
   width: 100%;
 }
 
-.search__clear,
-.search__icon {
-  svg {
-    height: 1em;
-    width: 1em;
-  }
-}
-
-.search__icon {
-  path {
-    fill: $hint-grey;
-    transition: fill $base-duration $base-timing;
-  }
-
-  &--active {
-    svg {
-      fill: $action-color;
-    }
-  }
+.search__input {
+  border-radius: 100rem;
+  padding-left: $_search-icon-size * 2.5;
+  padding-right: $_search-icon-size * 2.5;
 }
 
-.search__clear {
-  z-index: 2;
-
-  path {
-    fill: $hint-grey;
-  }
-
-  &:hover path {
-    fill: $action-color;
-  }
+.search__eyeglass-icon {
+  fill: $grey-7;
+  height: $_search-icon-size;
+  left: $_search-icon-size;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: $_search-icon-size;
 }
 
-.search__input {
-  appearance: none;
-  border: 0;
-  box-shadow: none;
-  flex-grow: 1;
-  margin: 0;
-  padding: ($small-spacing * 1.5) $small-spacing;
-
-  &:focus {
-    box-shadow: none;
-  }
+.search__clear-link {
+  height: $_search-icon-size;
+  position: absolute;
+  right: $_search-icon-size * 0.75;
+  top: 50%;
+  transform: translateY(-50%);
+  width: $_search-icon-size;
 }
 
-.search__hint {
-  color: $hint-grey;
-  left: 0;
-  opacity: 0;
+.search__clear-icon {
+  fill: $grey-5;
+  height: $_search-icon-size;
   position: absolute;
-  top: 1em;
-  transition: opacity $base-duration $base-timing;
-  z-index: 1;
-
-  svg {
-    height: 100%;
-    width: 100%;
-  }
+  transition: fill $base-duration $base-timing;
+  width: $_search-icon-size;
 
-  path,
-  rect {
+  &:hover {
     fill: $action-color;
   }
-
-  &--active {
-    opacity: 1;
-  }
 }

data/app/assets/stylesheets/administrate/library/_variables.scss

@@ -1,43 +1,44 @@
 // Typography
 $base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
   "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-  sans-serif;
-$heading-font-family: $base-font-family;
+  sans-serif !default;
+$heading-font-family: $base-font-family !default;
 
-$base-font-size: 1em;
+$base-font-size: 1em !default;
 
-$bold-font-weight: 700;
+$bold-font-weight: 700 !default;
 
-$base-line-height: 1.5;
-$heading-line-height: 1.2;
+$base-line-height: 1.5 !default;
+$heading-line-height: 1.2 !default;
 
 // Other Sizes
-$base-border-radius: 4px;
-$base-spacing: $base-line-height * 1em;
-$small-spacing: $base-spacing / 2;
+$base-border-radius: 4px !default;
+$base-spacing: $base-line-height * 1em !default;
+$small-spacing: $base-spacing / 2 !default;
 
 // Colors
-$white: #fff;
-$black: #000;
+$white: #fff !default;
+$black: #000 !default;
 
-$blue: #1976d2;
-$red: #d32f2f;
-$light-yellow: #f0cd66;
-$light-green: #4ab471;
+$blue: #1976d2 !default;
+$red: #d32f2f !default;
+$light-yellow: #f0cd66 !default;
+$light-green: #4ab471 !default;
 
-$grey-0: #f6f7f7;
-$grey-1: #dfe0e1;
-$grey-2: #cfd8dc;
-$grey-7: #293f54;
+$grey-0: #f6f7f7 !default;
+$grey-1: #dfe0e1 !default;
+$grey-2: #cfd8dc !default;
+$grey-5: #adb5bd !default;
+$grey-7: #293f54 !default;
 
-$hint-grey: #7b808c;
+$hint-grey: #7b808c !default;
 
 // Font Colors
-$base-font-color: $grey-7;
-$action-color: $blue;
+$base-font-color: $grey-7 !default;
+$action-color: $blue !default;
 
 // Background Colors
-$base-background-color: $grey-0;
+$base-background-color: $grey-0 !default;
 
 // Focus
 $focus-outline-color: transparentize($action-color, 0.4);
@@ -54,9 +55,9 @@ $flash-colors: (
 );
 
 // Border
-$base-border-color: $grey-1;
-$base-border: 1px solid $base-border-color;
+$base-border-color: $grey-1 !default;
+$base-border: 1px solid $base-border-color !default;
 
 // Transitions
-$base-duration: 250ms;
-$base-timing: ease-in-out;
+$base-duration: 250ms !default;
+$base-timing: ease-in-out !default;

data/app/controllers/administrate/application_controller.rb

@@ -4,7 +4,9 @@ module Administrate
 
     def index
       search_term = params[:search].to_s.strip
-      resources = Administrate::Search.new(resource_resolver, search_term).run
+      resources = Administrate::Search.new(scoped_resource,
+                                           dashboard_class,
+                                           search_term).run
       resources = resources.includes(*resource_includes) if resource_includes.any?
       resources = order.apply(resources)
       resources = resources.page(params[:page]).per(records_per_page)
@@ -78,9 +80,9 @@ module Administrate
     end
 
     helper_method :valid_action?
-    def valid_action?(name, resource = resource_name)
+    def valid_action?(name, resource = resource_class)
       !!routes.detect do |controller, action|
-        controller == resource.to_s.pluralize && action == name.to_s
+        controller == resource.to_s.underscore.pluralize && action == name.to_s
       end
     end
 
@@ -97,7 +99,7 @@ module Administrate
     end
 
     def dashboard
-      @_dashboard ||= resource_resolver.dashboard_class.new
+      @_dashboard ||= dashboard_class.new
     end
 
     def requested_resource
@@ -105,7 +107,11 @@ module Administrate
     end
 
     def find_resource(param)
-      resource_class.find(param)
+      scoped_resource.find(param)
+    end
+
+    def scoped_resource
+      resource_class.default_scoped
     end
 
     def resource_includes
@@ -113,10 +119,12 @@ module Administrate
     end
 
     def resource_params
-      params.require(resource_name).permit(dashboard.permitted_attributes)
+      params.require(resource_class.model_name.param_key).
+        permit(dashboard.permitted_attributes)
     end
 
-    delegate :resource_class, :resource_name, :namespace, to: :resource_resolver
+    delegate :dashboard_class, :resource_class, :resource_name, :namespace,
+      to: :resource_resolver
     helper_method :namespace
     helper_method :resource_name
 

data/app/helpers/administrate/application_helper.rb

@@ -19,21 +19,11 @@ module Administrate
         )
     end
 
-    def svg_tag(asset, svg_id, options = {})
-      svg_attributes = {
-        "xlink:href".freeze => "#{asset_url(asset)}##{svg_id}",
-        height: "100%",
-        width: "100%",
-      }
-      xml_attributes = {
-        "xmlns".freeze => "http://www.w3.org/2000/svg".freeze,
-        "xmlns:xlink".freeze => "http://www.w3.org/1999/xlink".freeze,
-        height: options[:height],
-        width: options[:width],
-      }.delete_if { |_key, value| value.nil? }
-
-      content_tag :svg, xml_attributes do
-        content_tag :use, nil, svg_attributes
+    def sort_order(order)
+      case order
+      when "asc" then "ascending"
+      when "desc" then "descending"
+      else "none"
       end
     end
 

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

@@ -18,36 +18,36 @@ to display a collection of resources in an HTML table.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
 %>
 
-<table aria-labelledby="page-title">
+<table aria-labelledby="<%= table_title %>">
   <thead>
     <tr>
       <% collection_presenter.attribute_types.each do |attr_name, attr_type| %>
         <th class="cell-label
         cell-label--<%= attr_type.html_class %>
-        cell-label--<%= collection_presenter.ordered_html_class(attr_name) %>
-        " scope="col">
+        cell-label--<%= collection_presenter.ordered_html_class(attr_name) %>"
+        scope="col"
+        role="columnheader"
+        aria-sort="<%= sort_order(collection_presenter.ordered_html_class(attr_name)) %>">
         <%= link_to(sanitized_order_params.merge(
           collection_presenter.order_params_for(attr_name)
         )) do %>
         <%= t(
-          "helpers.label.#{resource_name}.#{attr_name}",
+          "helpers.label.#{collection_presenter.resource_name}.#{attr_name}",
           default: attr_name.to_s,
         ).titleize %>
 
             <% if collection_presenter.ordered_by?(attr_name) %>
               <span class="cell-label__sort-indicator cell-label__sort-indicator--<%= collection_presenter.ordered_html_class(attr_name) %>">
-                <%= svg_tag(
-                  "administrate/sort_arrow.svg",
-                  "sort_arrow",
-                  width: "13",
-                  height: "13"
-                ) %>
+                <svg aria-hidden="true">
+                  <use xlink:href="#icon-up-caret" />
+                </svg>
               </span>
             <% end %>
           <% end %>
         </th>
       <% end %>
-      <% [valid_action?(:edit), valid_action?(:destroy)].count(true).times do %>
+      <% [valid_action?(:edit, collection_presenter.resource_name),
+          valid_action?(:destroy, collection_presenter.resource_name)].count(true).times do %>
         <th scope="col"></th>
       <% end %>
     </tr>
@@ -57,7 +57,9 @@ to display a collection of resources in an HTML table.
     <% resources.each do |resource| %>
       <tr class="js-table-row"
           tabindex="0"
-          <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) if valid_action? :show -%>
+          <% if valid_action? :show, collection_presenter.resource_name %>
+            <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) %>
+          <% end %>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
@@ -69,7 +71,7 @@ to display a collection of resources in an HTML table.
           </td>
         <% end %>
 
-        <% if valid_action? :edit %>
+        <% if valid_action? :edit, collection_presenter.resource_name %>
           <td><%= link_to(
             t("administrate.actions.edit"),
             [:edit, namespace, resource],
@@ -77,7 +79,7 @@ to display a collection of resources in an HTML table.
           ) %></td>
         <% end %>
 
-        <% if valid_action? :destroy %>
+        <% if valid_action? :destroy, collection_presenter.resource_name %>
           <td><%= link_to(
             t("administrate.actions.destroy"),
             [namespace, resource],