administrate 0.19.0 → 1.0.0

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,28 +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 |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 %>
-  </dl>
-</section>
+<%= 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>
+
+            <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+                ><%= render_field attribute, page: page %></dd>
+          <% end %>
+        </fieldset>
+      <% end %>
+    </dl>
+  </section>
+<% end %>
+
+<%= 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

@@ -16,14 +16,14 @@ and is augmented with [Selectize].
   Contains helper methods for displaying a collection select box.
 
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasMany
-[Selectize]: http://brianreavis.github.io/selectize.js
+[Selectize]: https://github.com/selectize/selectize.js
 %>
 
 <div class="field-unit__label">
   <%= 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/has_one/_form.html.erb

@@ -19,10 +19,26 @@ The form will be rendered as nested_from to parent relationship.
 <%= f.fields_for field.attribute, field.data || field.nested_form.resource.class.new do |has_one_f| %>
   <fieldset class="field-unit--nested">
     <legend><%= t "helpers.label.#{f.object_name}.#{field.name}", default: field.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>
+    <% field.nested_form.attributes.each do |title, attributes| -%>
+
+      <fieldset class="<%= "field-unit--nested" if title.present? %>">
+        <% if title.present? %>
+          <legend><%= t "helpers.label.#{f.object_name}.#{title}", default: title %></legend>
+        <% end %>
+
+        <% attributes.each do |attribute| %>
+          <div class="field-unit field-unit--<%= attribute.html_class %>">
+            <%= render_field attribute, f: has_one_f %>
+          </div>
+          <% hint_key = "administrate.field_hints.#{field.name}.#{attribute.name}" %>
+          <% if I18n.exists?(hint_key) -%>
+            <div class="field-unit__hint">
+              <%= I18n.t(hint_key) %>
+            </div>
+          <% end -%>
+        <% end %>
+      </fieldset>
+
     <% end -%>
   </fieldset>
 <% end %>

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

@@ -24,18 +24,24 @@ All show page attributes of has_one relationship would be rendered
         [namespace, field.data],
       ) %>
     </legend>
-    <% field.nested_show.attributes.each do |attribute| -%>
-      <div>
-      <dt class="attribute-label">
-        <%= t(
-          "helpers.label.#{field.associated_class_name.underscore}.#{attribute.name}",
-          default: attribute.name.titleize,
-        ) %>
-      </dt>
-      <dd class="attribute-data attribute-data--<%= attribute.html_class %>">
-        <%= render_field attribute, { page: page } %>
-      </dd>
-      </div>
+    <% field.nested_show.attributes.each do |title, attributes| -%>
+      <fieldset class="<%= "field-unit--nested" if title.present? %>">
+        <% if title.present? %>
+          <legend><%= t "helpers.label.#{namespace}.#{title}", default: title %></legend>
+        <% end %>
+
+        <% attributes.each do |attribute| %>
+          <dt class="attribute-label">
+            <%= t(
+              "helpers.label.#{field.associated_class_name.underscore}.#{attribute.name}",
+              default: attribute.name.titleize,
+            ) %>
+          </dt>
+          <dd class="attribute-data attribute-data--<%= attribute.html_class %>">
+            <%= render_field attribute, { page: page } %>
+          </dd>
+        <% end %>
+      </fieldset>
     <% end -%>
   </fieldset>
 <% end %>

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, nil, {}, 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,22 @@
+<%#
+# Rich Text Form Partial
+
+This partial renders a trix-editor element for ActionText::RichText attributes.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate trix-editor fields.
+- `field`:
+  An instance of [Administrate::Field::RichText][1].
+  A wrapper around the tmie attributes pulled from the model.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/RichText
+%>
+
+<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>

data/docs/customizing_controller_actions.md

@@ -93,3 +93,17 @@ To set custom redirects after the actions `create`, `update` and `destroy` you c
       [namespace, requested_resource.some_other_resource]
     end
 ```
+
+## Creating Records
+
+You can perform actions after creation by passing a `block` to `super` in the
+`create` method. The block will only be called if the resource is successfully
+created.
+
+```ruby
+def create
+  super do |resource|
+    # do something with the newly created resource
+  end
+end
+```