administrate 0.9.0 → 0.14.0

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

@@ -14,7 +14,7 @@ This partial renders flash messages on every page.
 <% if flash.any? %>
   <div class="flashes">
     <% flash.each do |key, value| -%>
-      <div class="flash flash-<%= key %>"><%= value %></div>
+      <div class="flash flash-<%= key %>"><%= value.html_safe %></div>
     <% end -%>
   </div>
 <% end %>

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

@@ -21,7 +21,7 @@ and renders all form fields for a resource's editable attributes.
         <%= t(
           "administrate.form.errors",
           pluralized_errors: pluralize(page.resource.errors.count, t("administrate.form.error")),
-          resource_name: display_resource_name(page.resource_name)
+          resource_name: display_resource_name(page.resource_name).singularize
         ) %>
       </h2>
 
@@ -34,7 +34,7 @@ and renders all form fields for a resource's editable attributes.
   <% end %>
 
   <% page.attributes.each do |attribute| -%>
-    <div class="field-unit field-unit--<%= attribute.html_class %>">
+    <div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
       <%= render_field attribute, f: f %>
     </div>
   <% end -%>

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

@@ -8,11 +8,13 @@ as defined by the routes in the `admin/` namespace
 %>
 
 <nav class="navigation" role="navigation">
-  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
+  <%= link_to(t("administrate.navigation.back_to_app"), root_url, class: "button button--alt") if defined?(root_url) %>
+
+  <% Administrate::Namespace.new(namespace).resources_with_index_route.each do |resource| %>
     <%= link_to(
       display_resource_name(resource),
-      [namespace, resource_index_route_key(resource)],
+      resource_index_route(resource),
       class: "navigation__link navigation__link--#{nav_link_state(resource)}"
-    ) %>
+    ) if valid_action?(:index, resource) && show_action?(:index, model_from_resource(resource)) %>
   <% end %>
 </nav>

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

@@ -56,6 +56,8 @@ It renders the `_table` partial to display details about the resources.
   <%= render(
     "collection",
     collection_presenter: page,
+    collection_field_name: resource_name,
+    page: page,
     resources: resources,
     table_title: "page-title"
   ) %>

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

@@ -43,7 +43,7 @@ as well as a link to its edit page.
       </dt>
 
       <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-          ><%= render_field attribute %></dd>
+          ><%= render_field attribute, page: page %></dd>
     <% end %>
   </dl>
 </section>

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

@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.attribute) %>
+  <% if valid_action?(:show, field.associated_class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

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

@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.attribute) %>
+  <% if valid_action?(:show, field.associated_class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

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

@@ -0,0 +1,24 @@
+<%#
+# Date Form Partial
+
+This partial renders an input element for a date attribute.
+By default, the input is a text field that is augmented with [DateTimePicker].
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Date][1].
+  A wrapper around the Date value pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Date
+[DateTimePicker]: https://github.com/Eonasdan/bootstrap-datetimepicker
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute, data: { type: 'date' }  %>
+</div>

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

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

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

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

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

@@ -20,5 +20,5 @@ By default, the input is a text field that is augmented with [DateTimePicker].
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_field field.attribute, class: "datetimepicker" %>
+  <%= f.text_field field.attribute, data: { type: 'datetime' }  %>
 </div>

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

@@ -17,5 +17,5 @@ as a localized date & time string.
 %>
 
 <% if field.data %>
-  <%= field.date %>
+  <%= field.datetime %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%#
 # HasMany Form Partial
 
-This partial renders an input element for belongs_to relationships.
+This partial renders an input element for has_many relationships.
 By default, the input is a collection select box
 that displays all possible records to associate with.
 The collection select box supports multiple inputs,
@@ -20,7 +20,7 @@ and is augmented with [Selectize].
 %>
 
 <div class="field-unit__label">
-  <%= f.label field.attribute_key, field.attribute %>
+  <%= 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 %>

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

@@ -19,15 +19,18 @@ from the associated resource class's dashboard.
 %>
 
 <% if field.resources.any? %>
+  <% order = field.order_from_params(params.fetch(field.name, {})) %>
+  <% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
   <%= render(
     "collection",
-    collection_presenter: field.associated_collection,
-    resources: field.resources(params[field.name]),
-    table_title: field.name
+    collection_presenter: field.associated_collection(order),
+    collection_field_name: field.name,
+    page: page,
+    resources: field.resources(page_number, order),
+    table_title: field.name,
   ) %>
-
   <% if field.more_than_limit? %>
-    <%= paginate field.resources(params[field.name]), param_name: "#{field.name}" %>
+    <%= paginate field.resources(page_number), param_name: "#{field.name}[page]" %>
   <% end %>
 
 <% else %>

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

@@ -18,7 +18,7 @@ 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><%= field.nested_form.resource_name.titleize %></legend>
+    <legend><%= t "helpers.label.#{f.object_name}.#{field.nested_form.resource_name}", default: 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 %>

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

@@ -0,0 +1,23 @@
+<%#
+# Password Form Partial
+
+This partial renders an input element for a password attribute.
+By default, the input is a password field.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Password][1].
+  A wrapper around the Password.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Password
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.password_field field.attribute, value: field.data %>
+</div>

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

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

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

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

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

@@ -3,9 +3,6 @@
 
 This partial renders an input element for polymorphic relationships.
 
-At the moment, polymorphic form fields are not supported,
-so this partial renders a message to that effect.
-
 ## Local variables:
 
 - `f`:

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

@@ -1,5 +1,5 @@
 <%#
-# Select Index Partial
+# Select Form Partial
 
 This partial renders a selectable text attribute,
 to be displayed on a resource's edit form page.
@@ -19,13 +19,25 @@ to be displayed on a resource's edit form page.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(
-    field.attribute,
-    options_from_collection_for_select(
-      field.selectable_options,
-      :to_s,
-      :to_s,
-      field.data.presence,
-    )
-  ) %>
+  <% if field.selectable_options.first&.is_a?(Array) %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :last,
+        :first,
+        field.data.presence,
+      )
+    ) %>
+  <% else %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :to_s,
+        :to_s,
+        field.data.presence,
+      )
+    ) %>
+  <% end %>
 </div>

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

@@ -4,7 +4,7 @@
 This partial renders a string attribute,
 to be displayed on a resource's show page.
 
-By default, the attribute is rendered as an unformatted string.
+By default, the attribute is rendered as text with whitespace preserved.
 
 ## Local variables:
 
@@ -15,4 +15,4 @@ By default, the attribute is rendered as an unformatted string.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/String
 %>
 
-<%= field.data %>
+<div class="preserve-whitespace"><%= field.data %></div>

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

@@ -4,8 +4,7 @@
 This partial renders a text attribute,
 to be displayed on a resource's show page.
 
-By default, the attribute is rendered as text with
-whitespace preserved.
+By default, the attribute is rendered as text with whitespace preserved.
 
 ## Local variables:
 
@@ -16,4 +15,4 @@ whitespace preserved.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Text
 %>
 
-<span class="preserve-whitespace"><%= field.data %></span>
+<div class="preserve-whitespace"><%= field.data %></div>

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

@@ -0,0 +1,23 @@
+<%#
+# Time Form Partial
+
+This partial renders an input element for time attributes.
+By default, the input is a text field that is augmented with [DateTimePicker].
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Time][1].
+  A wrapper around the tmie attributes pulled from the model.
+
+[DateTimePicker]: https://github.com/Eonasdan/bootstrap-datetimepicker
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute, data: { type: 'time' }, value: field.data&.strftime("%H:%M:%S") %>
+</div>

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

@@ -0,0 +1,17 @@
+<%#
+# Time Index Partial
+
+This partial renders an time attribute
+to be displayed on a resource's index page.
+
+By default, the attribute is rendered as a text tag.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Time][1].
+  A wrapper around the time attributes pulled from the model.
+
+%>
+
+<%= field.data.strftime("%I:%M%p").to_s %>

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

@@ -0,0 +1,17 @@
+<%#
+# Time Show Partial
+
+This partial renders an time attribute,
+to be displayed on a resource's show page.
+
+By default, the attribute is rendered as a text tag.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Time][1].
+  A wrapper around the time attributes pulled from the model.
+
+%>
+
+<%= field.data.strftime("%I:%M%p").to_s %>

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

@@ -0,0 +1,23 @@
+<%#
+# Url Form Partial
+
+This partial renders an input element for URL.
+By default, the input is a text box.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Url][1].
+  A wrapper around the URL pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.url_field field.attribute %>
+</div>