administrate 1.0.0.beta1 → 1.0.0.beta2

data/app/assets/builds/administrate-internal/docs.css.map

@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../stylesheets/administrate-internal/docs.scss"],"names":[],"mappings":"AAYA;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;EAGE;EACA;;;AAGF;EACE,OAhCK;EAiCL;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE,kBA3DI;EA4DJ,OA1DM;EA2DN;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE,kBAxES;EAyET,OAxES;EAyET;;AAEA;EAAe,OA1EN;;AA2ET;EAAc,OA5EL;;AA6ET;EAAiB,OA3ET;;AA4ER;EAAe,OA1ER;;AA2EP;EAAgB,OA5EN;;AA8EV;AAAA;EACe,OAhFP;;AAkFR;EAAY,OAjFF","file":"docs.css"}
+{"version":3,"sourceRoot":"","sources":["../../stylesheets/administrate-internal/docs.scss"],"names":[],"mappings":"AAYA;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;EAGE;EACA;;;AAGF;EACE,OAhCK;EAiCL;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE,kBA3DI;EA4DJ,OA1DM;EA2DN;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE,kBAxES;EAyET,OAxES;EAyET;;AAEA;EAAe,OA1EN;;AA2ET;EAAc,OA5EL;;AA6ET;EAAiB,OA3ET;;AA4ER;EAAe,OA1ER;;AA2EP;EAAgB,OA5EN;;AA8EV;AAAA;EACe,OAhFP;;AAkFR;EAAY,OAjFF","file":"docs.css","sourcesContent":["$blue: #53adc6;\n$red: #cf726e;\n$green: #5bc89e;\n$white: #f0f0f0;\n\n$code-black: #202020;\n$code-white: #e0e0dc;\n$code-green: #b0bf82;\n$code-blue: #8fbdcc;\n$code-yellow: #f8d29d;\n$code-red: #b95c56;\n\nhtml,\nbody {\n  font-family: 'Lato', serif;\n  font-size: 18px;\n  line-height: 1.62em;\n  margin: 0;\n}\n\nimg {\n  max-width: 100%;\n}\n\nh1,\nh2,\nh3 {\n  font-family: 'Fjalla One', sans-serif;\n  margin-top: 2em;\n}\n\na {\n  color: $blue;\n  text-decoration: none;\n}\n\n.content {\n  margin-bottom: 2em;\n  margin-left: auto;\n  margin-right: auto;\n  margin-top: 2em;\n  width: 60em;\n\n  .sidebar {\n    float: left;\n    width: 20em;\n\n    &-links {\n      list-style: none;\n      padding-left: 0;\n    }\n  }\n\n  .main {\n    float: right;\n    width: 40em;\n  }\n}\n\n.flash-wrapper {\n  background-color: $red;\n  color: $white;\n  padding: 1em;\n\n  .flash {\n    margin-left: auto;\n    margin-right: auto;\n    width: 40em;\n  }\n}\n\ncode {\n  font-family: \"Source Code Pro\";\n  font-size: 0.8rem;\n  padding: 0.4em 0.2em 0;\n\n  &.hljs {\n    background-color: $code-black;\n    color: $code-white;\n    padding-left: 1rem;\n\n    .hljs-string { color: $code-green; }\n    .hljs-subst { color: $code-white; }\n    .hljs-constant { color: $code-blue; }\n    .hljs-symbol { color: $code-red; }\n    .hljs-keyword { color: $code-yellow; }\n\n    .hljs-title,\n    .hljs-parent { color: $code-blue; }\n\n    .hljs-tag { color: $code-yellow; }\n  }\n}\n"]}

data/app/assets/javascripts/administrate/application.js

@@ -1,8 +1,8 @@
 import "./add_jquery";
+import "trix";
+import "@rails/actiontext";
 
-import {} from "jquery-ujs";
+import "@hotwired/turbo-rails";
 import "selectize/dist/js/selectize.min.js";
 
-import "./components/associative";
-import "./components/select";
-import "./components/table";
+import "./controllers";

data/app/assets/javascripts/administrate/controllers/application.js

@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus";
+
+const application = Application.start();
+
+// Configure Stimulus development experience
+application.debug = false;
+window.Stimulus   = application;
+
+export { application };

data/app/assets/javascripts/administrate/controllers/index.js

@@ -0,0 +1,7 @@
+import { application } from "./application";
+
+import SelectController from "./select_controller";
+import TableController from "./table_controller";
+
+application.register("select", SelectController);
+application.register("table", TableController);

data/app/assets/javascripts/administrate/controllers/select_controller.js

@@ -0,0 +1,8 @@
+import { Controller } from "@hotwired/stimulus";
+import $ from "jquery";
+
+export default class extends Controller {
+  connect() {
+    $(this.element).selectize({});
+  }
+};

data/app/assets/javascripts/administrate/{components/table.js → controllers/table_controller.js}

@@ -1,7 +1,10 @@
-$(function() {
-  var keycodes = { space: 32, enter: 13 };
+import { Controller } from "@hotwired/stimulus";
+import $ from "jquery";
 
-  var visitDataUrl = function(event) {
+var keycodes = { space: 32, enter: 13 };
+
+export default class extends Controller {
+  visitDataUrl(event) {
     if (event.type == "click" ||
         event.keyCode == keycodes.space ||
         event.keyCode == keycodes.enter) {
@@ -13,11 +16,8 @@ $(function() {
       var dataUrl = $(event.target).closest("tr").data("url");
       var selection = window.getSelection().toString();
       if (selection.length === 0 && dataUrl) {
-        window.location = window.location.protocol + '//' + window.location.host + dataUrl;
+        Turbo.visit(dataUrl);
       }
     }
-  };
-
-  $("table").on("click", ".js-table-row", visitDataUrl);
-  $("table").on("keydown", ".js-table-row", visitDataUrl);
-});
+  }
+};

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

@@ -2,6 +2,7 @@
 
 @import "reset/normalize";
 
+@import "trix/dist/trix";
 @import "selectize/dist/css/selectize";
 @import "selectize/dist/css/selectize.default";
 
@@ -26,5 +27,3 @@
 @import "components/navigation";
 @import "components/pagination";
 @import "components/search";
-
-@import "utilities/text-color";

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

@@ -13,6 +13,11 @@ figure {
   margin: 0;
 }
 
+/* stylelint-disable selector-no-qualifying-type, selector-class-pattern */
+form.button_to { // we don't control this class name
+  display: contents;
+}
+
 img,
 picture {
   margin: 0;

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

@@ -21,11 +21,22 @@ p {
   margin: 0 0 $small-spacing;
 }
 
-a {
+a,
+.link:is(
+  button,
+  [type="button"],
+  [type="reset"],
+  [type="submit"]
+) {
   color: $action-color;
   text-decoration-skip-ink: auto;
   transition: color $base-duration $base-timing;
 
+  /* stylelint-disable selector-no-qualifying-type */
+  &.link--danger {
+    color: $red;
+  }
+
   &:hover {
     color: mix($black, $action-color, 25%);
   }

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

@@ -1,5 +1,7 @@
 button,
-input,
+[type="button"],
+[type="reset"],
+[type="submit"],
 .button {
   appearance: none;
   background-color: $action-color;
@@ -20,23 +22,23 @@ input,
   vertical-align: middle;
   white-space: nowrap;
 
-  &:hover {
+  &:disabled {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+
+  &:not(.link):hover {
     background-color: mix($black, $action-color, 20%);
     color: $white;
   }
 
-  &:focus {
+  &:not(.link):focus {
     outline: $focus-outline;
     outline-offset: $focus-outline-offset;
   }
 
-  &:disabled {
-    cursor: not-allowed;
-    opacity: 0.5;
-
-    &:hover {
-      background-color: $action-color;
-    }
+  &:not(.link):disabled:hover {
+    background-color: $action-color;
   }
 }
 

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

@@ -17,10 +17,9 @@
 }
 
 .field-unit__field {
+  flex-grow: 1;
   float: left;
   margin-left: 2rem;
-  max-width: 50rem;
-  width: 100%;
 
   .optgroup-header {
     font-weight: $bold-font-weight;
@@ -41,7 +40,7 @@
   width: 100%;
 
   .field-unit__field {
-    width: 100%;
+    flex-grow: 1;
   }
 
   .field-unit__label {

data/app/assets/stylesheets/administrate/reset/_normalize.scss

@@ -100,7 +100,13 @@ pre {
  * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
  */
 
-a {
+a,
+.link:is(
+  button,
+  [type="button"],
+  [type="reset"],
+  [type="submit"]
+) {
   background-color: transparent; /* 1 */
   -webkit-text-decoration-skip: objects; /* 2 */
 }

data/app/controllers/administrate/application_controller.rb

@@ -60,7 +60,8 @@ module Administrate
       if requested_resource.update(resource_params)
         redirect_to(
           after_resource_updated_path(requested_resource),
-          notice: translate_with_resource("update.success")
+          notice: translate_with_resource("update.success"),
+          status: :see_other
         )
       else
         render :edit, locals: {
@@ -75,7 +76,7 @@ module Administrate
       else
         flash[:error] = requested_resource.errors.full_messages.join("<br/>")
       end
-      redirect_to after_resource_destroyed_path(requested_resource)
+      redirect_to after_resource_destroyed_path(requested_resource), status: :see_other
     end
 
     private

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

@@ -18,7 +18,7 @@ to display a collection of resources in an HTML table.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
 %>
 
-<table aria-labelledby="<%= table_title %>">
+<table aria-labelledby="<%= table_title %>" data-controller="table" data-action="click->table#visitDataUrl keydown->table#visitDataUrl">
   <thead>
     <tr>
       <% collection_presenter.attribute_types.each do |attr_name, attr_type| %>

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

@@ -7,11 +7,11 @@
 <% end %>
 
 <% if existing_action?(collection_presenter.resource_name, :destroy) %>
-  <td><%= link_to(
+  <td><%= button_to(
     t("administrate.actions.destroy"),
     [namespace, resource],
-    class: "text-color-red",
+    class: "link link--danger",
     method: :delete,
-    data: { confirm: t("administrate.actions.confirm") }
+    data: { turbo_confirm: t("administrate.actions.confirm") }
   ) if accessible_action?(resource, :destroy) %></td>
 <% end %>

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

@@ -7,6 +7,8 @@
     <%= content_for(:title) %>
   </h1>
 
+  <%= content_for(:header_middle) %>
+
   <% if show_search_bar %>
     <%= render(
       "search",
@@ -25,4 +27,6 @@
       class: "button",
     ) if accessible_action?(new_resource, :new) %>
   </div>
+
+  <%= content_for(:header_last) %>
 </header>

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

@@ -8,7 +8,7 @@ by providing a `content_for(:javascript)` block.
 %>
 
 <% Administrate::Engine.javascripts.each do |js_path| %>
-  <%= javascript_include_tag js_path %>
+  <%= javascript_include_tag js_path, "data-turbo-track": "reload", defer: true %>
 <% end %>
 
 <%= yield :javascript %>

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

@@ -22,6 +22,8 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
     <%= content_for(:title) %>
   </h1>
 
+  <%= content_for(:header_middle) %>
+
   <div>
     <%= link_to(
       t("administrate.actions.show_resource", name: page.page_title),
@@ -29,8 +31,18 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
       class: "button",
     ) if accessible_action?(page.resource, :show) %>
   </div>
+
+  <%= content_for(:header_last) %>
 </header>
 
-<section class="main-content__body">
-  <%= render "form", page: page %>
-</section>
+<%= content_for(:before_main) %>
+
+<% if content_for?(:main) %>
+  <%= content_for(:main) %>
+<% else %>
+  <section class="main-content__body">
+    <%= render "form", page: page %>
+  </section>
+<% end %>
+
+<%= content_for(:after_main) %>

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

@@ -32,15 +32,23 @@ It renders the `_table` partial to display details about the resources.
   )
 %>
 
-<section class="main-content__body main-content__body--flush">
-  <%= render(
-    "collection",
-    collection_presenter: page,
-    collection_field_name: resource_name,
-    page: page,
-    resources: resources,
-    table_title: "page-title"
-  ) %>
+<%= content_for(:before_main) %>
+
+<% if content_for?(:main) %>
+  <%= content_for(:main) %>
+<% else %>
+  <section class="main-content__body main-content__body--flush">
+    <%= render(
+      "collection",
+      collection_presenter: page,
+      collection_field_name: resource_name,
+      page: page,
+      resources: resources,
+      table_title: "page-title"
+    ) %>
+
+    <%= render("pagination", resources: resources) %>
+  </section>
+<% end %>
 
-  <%= render("pagination", resources: resources) %>
-</section>
+<%= content_for(:after_main) %>

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

@@ -27,11 +27,23 @@ to do the heavy lifting.
     <%= content_for(:title) %>
   </h1>
 
+  <%= content_for(:header_middle) %>
+
   <div>
     <%= link_to t("administrate.actions.back"), :back, class: "button" %>
   </div>
+
+  <%= content_for(:header_last) %>
 </header>
 
-<section class="main-content__body">
-  <%= render "form", page: page %>
-</section>
+<%= content_for(:before_main) %>
+
+<% if content_for?(:main) %>
+  <%= content_for(:main) %>
+<% else %>
+  <section class="main-content__body">
+    <%= render "form", page: page %>
+  </section>
+<% end %>
+
+<%= content_for(:after_main) %>

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

@@ -23,6 +23,8 @@ as well as a link to its edit page.
     <%= content_for(:title) %>
   </h1>
 
+  <%= content_for(:header_middle) %>
+
   <div>
     <%= link_to(
       t("administrate.actions.edit_resource", name: page.page_title),
@@ -30,36 +32,46 @@ as well as a link to its edit page.
       class: "button",
     ) if accessible_action?(page.resource, :edit) %>
 
-    <%= link_to(
+    <%= button_to(
       t("administrate.actions.destroy"),
       [namespace, page.resource],
       class: "button button--danger",
       method: :delete,
-      data: { confirm: t("administrate.actions.confirm") }
+      data: { turbo_confirm: t("administrate.actions.confirm") }
     ) if accessible_action?(page.resource, :destroy) %>
   </div>
+
+  <%= content_for(:header_last) %>
 </header>
 
-<section class="main-content__body">
-  <dl>
-    <% page.attributes.each do |title, attributes| %>
-      <fieldset class="<%= "field-unit--nested" if title.present? %>">
-        <% if title.present? %>
-          <legend><%= t "helpers.label.#{page.resource_name}.#{title}", default: title %></legend>
-        <% end %>
+<%= content_for(:before_main) %>
+
+<% if content_for?(:main) %>
+  <%= content_for(:main) %>
+<% else %>
+  <section class="main-content__body">
+    <dl>
+      <% page.attributes.each do |title, attributes| %>
+        <fieldset class="<%= "field-unit--nested" if title.present? %>">
+          <% if title.present? %>
+            <legend><%= t "helpers.label.#{page.resource_name}.#{title}", default: title %></legend>
+          <% end %>
+
+          <% attributes.each do |attribute| %>
+            <dt class="attribute-label" id="<%= attribute.name %>">
+            <%= t(
+              "helpers.label.#{resource_name}.#{attribute.name}",
+              default: page.resource.class.human_attribute_name(attribute.name),
+            ) %>
+            </dt>
 
-        <% attributes.each do |attribute| %>
-          <dt class="attribute-label" id="<%= attribute.name %>">
-          <%= t(
-            "helpers.label.#{resource_name}.#{attribute.name}",
-            default: page.resource.class.human_attribute_name(attribute.name),
-          ) %>
-          </dt>
+            <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+                ><%= render_field attribute, page: page %></dd>
+          <% end %>
+        </fieldset>
+      <% end %>
+    </dl>
+  </section>
+<% end %>
 
-          <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-              ><%= render_field attribute, page: page %></dd>
-        <% end %>
-      </fieldset>
-    <% end %>
-  </dl>
-</section>
+<%= content_for(:after_main) %>

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

@@ -17,10 +17,11 @@ that displays all possible records to associate with.
 %>
 
 <div class="field-unit__label">
-  <%= f.label field.permitted_attribute %>
+  <%= f.label field.attribute, for: "#{f.object_name}_#{field.permitted_attribute}" %>
 </div>
 <div class="field-unit__field">
   <%= f.select(field.permitted_attribute,
                options_for_select(field.associated_resource_options, field.selected_option),
-               include_blank: field.include_blank_option) %>
+               {include_blank: field.include_blank_option},
+               data: {controller: field.html_controller}) %>
 </div>

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

@@ -23,7 +23,7 @@ and is augmented with [Selectize].
   <%= f.label field.attribute, for: "#{f.object_name}_#{field.attribute_key}" %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(field.attribute_key, nil, {}, multiple: true) do %>
+  <%= f.select(field.attribute_key, nil, {}, multiple: true, data: {controller: field.html_controller}) do %>
     <%= options_for_select(field.associated_resource_options, field.selected_options) %>
   <% end %>
 </div>

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

@@ -22,7 +22,7 @@ This partial renders an input element for polymorphic relationships.
 
   <div class="field-unit__field">
     <%= pf.hidden_field(:type, value: field.class.name) %>
-    <%= pf.select(:value) do %>
+    <%= pf.select(:value, {}, data: {controller: field.html_controller}) do %>
       <%= grouped_options_for_select(field.associated_resource_grouped_options, field.selected_global_id, prompt: true) %>
     <% end %>
   </div>

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

@@ -0,0 +1,6 @@
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.rich_text_area(field.attribute) %>
+</div>

data/app/views/fields/rich_text/_index.html.erb

@@ -0,0 +1,18 @@
+<%#
+# RichText Index Partial
+
+This partial renders a rich_text attribute
+to be displayed on a resource's index page.
+
+By default, the attribute is rendered as a plain text truncated string.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::RichText][1].
+  A wrapper around the RichText pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/RichText
+%>
+
+<%= field.truncate %>

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

@@ -0,0 +1,18 @@
+<%#
+# RichText Show Partial
+
+This partial renders a rich_text attribute,
+to be displayed on a resource's show page.
+
+By default, the attribute is rendered as HTML.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::RichText][1].
+  A wrapper around the RichText object pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/RichText
+%>
+
+<%= field.data %>

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

@@ -26,7 +26,8 @@ to be displayed on a resource's edit form page.
         field.selectable_options,
         field.data,
       ),
-      include_blank: field.include_blank_option
+      {include_blank: field.include_blank_option},
+      data: {controller: field.html_controller}
     )
   %>
 </div>

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

@@ -18,5 +18,5 @@ This partial renders a textarea element for a text attribute.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_area field.attribute %>
+  <%= f.text_area field.attribute, field.options.fetch(:input_options, {}) %>
 </div>

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

@@ -24,6 +24,7 @@ By default, it renders:
   <%= render "stylesheet" %>
   <%= csrf_meta_tags %>
   <%= csp_meta_tag if defined?(csp_meta_tag) %>
+  <%= render "javascript" %>
 </head>
 <body>
   <%= render "icons" %>
@@ -36,7 +37,5 @@ By default, it renders:
       <%= yield %>
     </main>
   </div>
-
-  <%= render "javascript" %>
 </body>
 </html>