administrate 0.11.0 → 0.17.0

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

@@ -23,34 +23,14 @@ It renders the `_table` partial to display details about the resources.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
 %>
 
-<% content_for(:title) do %>
-  <%= display_resource_name(page.resource_name) %>
-<% 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_resource",
-        name: page.resource_name.titleize.downcase
-      ),
-      [:new, namespace, page.resource_path],
-      class: "button",
-    ) if valid_action?(:new) && show_action?(:new, new_resource) %>
-  </div>
-</header>
+<%=
+  render("index_header",
+    resources: resources,
+    search_term: search_term,
+    page: page,
+    show_search_bar: show_search_bar,
+  )
+%>
 
 <section class="main-content__body main-content__body--flush">
   <%= render(
@@ -62,5 +42,5 @@ It renders the `_table` partial to display details about the resources.
     table_title: "page-title"
   ) %>
 
-  <%= paginate resources %>
+  <%= paginate resources, param_name: '_page' %>
 </section>

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

@@ -38,7 +38,7 @@ as well as a link to its edit page.
       <dt class="attribute-label" id="<%= attribute.name %>">
       <%= t(
         "helpers.label.#{resource_name}.#{attribute.name}",
-        default: attribute.name.titleize,
+        default: page.resource.class.human_attribute_name(attribute.name),
       ) %>
       </dt>
 

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

@@ -20,7 +20,7 @@ that displays all possible records to associate with.
   <%= f.label field.permitted_attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(field.permitted_attribute) do %>
-    <%= options_for_select(field.associated_resource_options, field.selected_option) %>
-  <% end %>
+  <%= f.select(field.permitted_attribute,
+               options_for_select(field.associated_resource_options, field.selected_option),
+               include_blank: field.include_blank_option) %>
 </div>

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.associated_class) %>
+  <% if valid_action?(:show, field.associated_class) && show_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.associated_class) %>
+  <% if valid_action?(:show, field.associated_class) && show_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/has_one/_index.html.erb

@@ -15,7 +15,7 @@ By default, the relationship is rendered as a link to the associated object.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasOne
 %>
 
-<% if field.data %>
+<% if field.linkable? %>
   <%= link_to(
     field.display_associated_resource,
     [namespace, field.data],

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.
 
-All fields of has_one relationship would be rendered
+All show page attributes of has_one relationship would be rendered
 
 ## Local variables:
 
@@ -15,7 +15,7 @@ All fields of has_one relationship would be rendered
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasOne
 %>
 
-<% if field.data %>
+<% if field.linkable? %>
   <fieldset class="attribute--nested">
     <legend>
       <%= link_to(
@@ -23,7 +23,7 @@ All fields of has_one relationship would be rendered
         [namespace, field.data],
       ) %>
     </legend>
-    <% field.nested_form.attributes.each do |attribute| -%>
+    <% field.nested_show.attributes.each do |attribute| -%>
       <div>
       <dt class="attribute-label">
         <%= t(
@@ -32,7 +32,7 @@ All fields of has_one relationship would be rendered
         ) %>
       </dt>
       <dd class="attribute-data attribute-data--<%= attribute.html_class %>">
-        <%= attribute.data %>
+        <%= render_field attribute, { page: page } %>
       </dd>
       </div>
     <% end -%>

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

@@ -19,5 +19,5 @@ By default, the input is a text field.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_field field.attribute %>
+  <%= f.number_field field.attribute, step: "any" %>
 </div>

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

@@ -17,7 +17,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.data.class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

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,27 @@ 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,
+      ),
+      include_blank: field.include_blank_option
+    ) %>
+  <% else %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :to_s,
+        :to_s,
+        field.data,
+      ),
+      include_blank: field.include_blank_option
+    ) %>
+  <% 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

@@ -2,7 +2,7 @@
 # Time Form Partial
 
 This partial renders an input element for time attributes.
-By default, the input is a select field for the time attributes.
+By default, the input is a text field that is augmented with [DateTimePicker].
 
 ## Local variables:
 
@@ -12,11 +12,12 @@ By default, the input is a select field for the time attributes.
   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' } %>
+  <%= f.text_field field.attribute, data: { type: 'time' }, value: field.data&.strftime("%H:%M:%S") %>
 </div>

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

@@ -14,4 +14,6 @@ By default, the attribute is rendered as a text tag.
 
 %>
 
-<%= field.data.strftime("%I:%M%p").to_s %>
+<% if field.data %>
+  <%= field.time %>
+<% end %>

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

@@ -14,4 +14,6 @@ By default, the attribute is rendered as a text tag.
 
 %>
 
-<%= field.data.strftime("%I:%M%p").to_s %>
+<% if field.data %>
+  <%= field.time %>
+<% end %>

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>

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

@@ -0,0 +1,20 @@
+<%#
+# Url Index Partial
+
+This partial renders a URL address,
+to be displayed on a resource's index page.
+
+By default, the value is rendered as an `a` element.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Url][1].
+  A wrapper around the email pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
+%>
+
+<%= content_tag :a, href: field.data do %>
+  <%= field.data %>
+<% end %>

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

@@ -0,0 +1,20 @@
+<%#
+# Url Show Partial
+
+This partial renders a URL address,
+to be displayed on a resource's show page.
+
+By default, the value is rendered as an `a` element.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Url][1].
+  A wrapper around the email pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
+%>
+
+<%= content_tag :a, href: field.data do %>
+  <%= field.data %>
+<% end %>

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

@@ -19,10 +19,11 @@ By default, it renders:
   <meta name="ROBOTS" content="NOODP">
   <meta name="viewport" content="initial-scale=1">
   <title>
-    <%= content_for(:title) %> - <%= Rails.application.class.parent_name.titlecase %>
+    <%= content_for(:title) %> - <%= application_title %>
   </title>
   <%= render "stylesheet" %>
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag if defined?(csp_meta_tag) %>
 </head>
 <body>
   <%= render "icons" %>

data/config/locales/administrate.ar.yml

@@ -23,6 +23,8 @@ ar:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: العودة إلى التطبيق
     search:
       clear: مسح البحث
       label: بحث %{resource}

data/config/locales/administrate.bs.yml

@@ -22,6 +22,8 @@ bs:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Natrag na aplikaciju
     search:
       clear: Izbriši pretraživanje
       label: Pretraga %{resource}

data/config/locales/administrate.ca.yml

@@ -23,6 +23,8 @@ ca:
     form:
       error: error
       errors: "%{pluralized_errors} han impedit que %{resource_name} es guardés amb èxit:"
+    navigation:
+      back_to_app: Torna a l'aplicació
     search:
       clear: Esborrar la cerca
       label: Cerca %{resource}

data/config/locales/administrate.da.yml

@@ -23,6 +23,8 @@ da:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Tilbage til app
     search:
       clear: Ryd søgning
       label: Søg %{resource}

data/config/locales/administrate.de.yml

@@ -23,6 +23,8 @@ de:
     form:
       error: error
       errors: "%{pluralized_errors} haben das Speichern dieses %{resource_name} verhindert:"
+    navigation:
+      back_to_app: Zurück zur App
     search:
       clear: Suche zurücksetzen
       label: "%{resource} durchsuchen"

data/config/locales/administrate.en.yml

@@ -23,6 +23,8 @@ en:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Back to app
     search:
       clear: Clear search
       label: Search %{resource}

data/config/locales/administrate.es.yml

@@ -22,7 +22,9 @@ es:
         none: Ninguno
     form:
       error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      errors: "%{pluralized_errors} no permitieron guardar este %{resource_name}:"
+    navigation:
+      back_to_app: Regresar a la aplicación
     search:
       clear: Borrar búsqueda
       label: Buscar %{resource}

data/config/locales/administrate.fi.yml

@@ -0,0 +1,30 @@
+---
+fi:
+  administrate:
+    actions:
+      confirm: Oletko varma?
+      destroy: Poista
+      edit: Muokkaa
+      edit_resource: Muokkaa %{name}
+      show_resource: Näytä %{name}
+      new_resource: Uusi %{name}
+      back: Takaisin
+    controller:
+      create:
+        success: "%{resource} luotiin onnistuneesti."
+      destroy:
+        success: "%{resource} poistettiin onnistuneesti."
+      update:
+        success: "%{resource} päivitettiin onnistuneesti."
+    fields:
+      has_many:
+        more: Näytetään %{count}/%{total_count}
+        none: Ei yhtään
+    form:
+      error: virhe
+      errors: "%{pluralized_errors} estivät tätä %{resource_name} tallentumasta:"
+    navigation:
+      back_to_app: Takaisin sovellukseen
+    search:
+      clear: Tyhjennä haku
+      label: Etsi %{resource}

data/config/locales/administrate.fr.yml

@@ -2,7 +2,7 @@
 fr:
   administrate:
     actions:
-      confirm: Êtes-vous sûr ?
+      confirm: Êtes-vous sûr(e) ?
       destroy: Supprimer
       edit: Modifier
       edit_resource: Modifier %{name}
@@ -22,7 +22,9 @@ fr:
         none: Aucun
     form:
       error: erreur
-      errors: "%{pluralized_errors} ont empêchés %{resource_name} d'être sauvergardé :"
+      errors: "%{pluralized_errors} ont empêché %{resource_name} d'être sauvegardé(e) :"
+    navigation:
+      back_to_app: Retour à l'application
     search:
       clear: Effacer la recherche
       label: Chercher %{resource}

data/config/locales/administrate.id.yml

@@ -23,6 +23,8 @@ id:
     form:
       error: error
       errors: "%{pluralized_errors} membuat %{resource_name} tidak bisa tersimpan:"
+    navigation:
+      back_to_app: Kembali ke aplikasi
     search:
       clear: Kosongkan pencarian
       label: Cari %{resource}

data/config/locales/administrate.it.yml

@@ -23,6 +23,8 @@ it:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Torna all'app
     search:
       clear: Cancella ricerca
       label: Ricerca %{resource}

data/config/locales/administrate.ja.yml

@@ -23,6 +23,8 @@ ja:
     form:
       error: エラー
       errors: "%{pluralized_errors}のため%{resource_name}を保存できません。"
+    navigation:
+      back_to_app: アプリに戻る
     search:
       clear: 検索をクリアする
       label: サーチ %{resource}

data/config/locales/administrate.ko.yml

@@ -4,25 +4,27 @@ ko:
     actions:
       confirm: 괜찮습니까?
       destroy: 삭제
-      edit: 편집
-      edit_resource: 편집 %{name}
-      show_resource: 보여주기 %{name}
-      new_resource: 새로운 %{name}
+      edit: 수정
+      edit_resource: 수정 %{name}
+      show_resource: "%{name}"
+      new_resource: 새 %{name}
       back: 뒤로
     controller:
       create:
-        success: "%{resource} 가 성공적으로 생성되었습니다."
+        success: "%{resource}가 성공적으로 생성되었습니다."
       destroy:
-        success: "%{resource} 가 성공적으로 삭제되었습니다."
+        success: "%{resource}가 성공적으로 삭제되었습니다."
       update:
-        success: "%{resource} 가 성공적으로 갱신되었습니다."
+        success: "%{resource}가 성공적으로 수정되었습니다."
     fields:
       has_many:
-        more: "%{total_count} 개 중에서 %{count} 개"
+        more: "%{total_count}개 중에서 %{count}개"
         none: 없음
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: 에러
+      errors: "%{pluralized_errors}로 인하여 %{resource_name}을(를) 저장하는데 실패하였습니다."
+    navigation:
+      back_to_app: 앱으로 돌아 가기
     search:
       clear: 검색 초기화
       label: "%{resource} 검색"

data/config/locales/administrate.nl.yml

@@ -11,18 +11,20 @@ nl:
       back: Terug
     controller:
       create:
-        success: "%{resource} was succesvol aangemaakt."
+        success: "%{resource} is succesvol aangemaakt."
       destroy:
-        success: "%{resource} was succesvol verwijderd."
+        success: "%{resource} is succesvol verwijderd."
       update:
-        success: "%{resource} was succesvol geupdated."
+        success: "%{resource} is succesvol geupdated."
     fields:
       has_many:
         more: Resultaat %{count} van %{total_count}
         none: Geen
     form:
       error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      errors: "%{pluralized_errors} maakten het onmogelijk %{resource_name} op:"
+    navigation:
+      back_to_app: Terug naar app
     search:
-      clear: CDuidelijke zoek
+      clear: Wissen
       label: Zoeken %{resource}

data/config/locales/administrate.pl.yml

@@ -23,6 +23,8 @@ pl:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Powrót do aplikacji
     search:
       clear: Wyczyść wyszukiwanie
       label: Szukanie %{resource}