administrate 0.1.2 → 0.1.3

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

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

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

@@ -14,7 +14,7 @@ and renders all form fields for a resource's editable attributes.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Form
 %>
 
-<%= form_for([Administrate::NAMESPACE, page.resource], html: { class: "form" }) do |f| %>
+<%= form_for([namespace, page.resource], html: { class: "form" }) do |f| %>
   <% if page.resource.errors.any? %>
     <div id="error_explanation">
       <h2>
@@ -30,13 +30,11 @@ and renders all form fields for a resource's editable attributes.
     </div>
   <% end %>
 
-  <div class="form-inputs">
-    <% page.attributes.each do |attribute| -%>
-      <div class="form-field form-field--<%= attribute.html_class %>">
-        <%= render_field attribute, f: f %>
-      </div>
-    <% end -%>
-  </div>
+  <% page.attributes.each do |attribute| -%>
+    <div class="field-unit field-unit--<%= attribute.html_class %>">
+      <%= render_field attribute, f: f %>
+    </div>
+  <% end -%>
 
   <div class="form-actions">
     <%= f.submit %>

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

@@ -12,7 +12,7 @@ as defined by the DashboardManifest.
     <li>
       <%= link_to(
         display_resource_name(resource),
-        [Administrate::NAMESPACE, resource],
+        [namespace, resource],
         class: "sidebar__link sidebar__link--#{nav_link_state(resource)}"
       ) %>
     </li>

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

@@ -18,11 +18,11 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
 <% content_for(:title) { "Edit #{page.page_title}" } %>
 
 <header class="header">
-  <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <div class="header-actions">
+  <h1 class="header__heading"><%= content_for(:title) %></h1>
+  <div class="header__actions">
     <%= link_to(
       "Show #{page.page_title}",
-      [Administrate::NAMESPACE, page.resource],
+      [namespace, page.resource],
       class: "button",
     ) %>
   </div>

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

@@ -8,7 +8,7 @@ It renders the `_table` partial to display details about the resources.
 ## Local variables:
 
 - `page`:
-  An instance of [Administrate::Page::Table][1].
+  An instance of [Administrate::Page::Collection][1].
   Contains helper methods to help display a table,
   and knows which attributes should be displayed in the resource's table.
 - `resources`:
@@ -18,7 +18,7 @@ It renders the `_table` partial to display details about the resources.
 - `search_term`:
   A string containing the term the user has searched for, if any.
 
-[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Table
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
 %>
 
 <% content_for(:title) do %>
@@ -28,7 +28,7 @@ It renders the `_table` partial to display details about the resources.
 <% content_for(:search) do %>
   <form class="search">
     <span class="search__icon">
-      <%= inline_svg "administrate/search.svg" %>
+      <%= svg_tag "administrate/search.svg", "search", width: 16, height: 16 %>
     </span>
     <input
       type="text"
@@ -36,6 +36,7 @@ It renders the `_table` partial to display details about the resources.
       class="search__input"
       placeholder="Search"
       value="<%= search_term %>"
+      aria-label="Search"
     />
     <span class="search__hint">
       Press enter to search
@@ -44,11 +45,11 @@ It renders the `_table` partial to display details about the resources.
 <% end %>
 
 <header class="header">
-  <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <div class="header-actions">
+  <h1 class="header__heading" id="page-title"><%= content_for(:title) %></h1>
+  <div class="header__actions">
     <%= link_to(
       "New #{page.resource_name.titleize.downcase}",
-      [:new, Administrate::NAMESPACE, page.resource_name],
+      [:new, namespace, page.resource_name],
       class: "button",
     ) %>
   </div>

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

@@ -18,8 +18,8 @@ to do the heavy lifting.
 <% content_for(:title) { "New #{page.resource_name.titleize}" } %>
 
 <header class="header">
-  <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <div class="header-actions">
+  <h1 class="header__heading"><%= content_for(:title) %></h1>
+  <div class="header__actions">
     <%= link_to 'Back', :back, class: "button" %>
   </div>
 </header>

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

@@ -19,11 +19,11 @@ as well as a link to its edit page.
 <% content_for(:title) { page.page_title } %>
 
 <header class="header">
-  <h1 class="header-heading"><%= content_for(:title) %></h1>
-  <div class="header-actions">
+  <h1 class="header__heading"><%= content_for(:title) %></h1>
+  <div class="header__actions">
     <%= link_to(
       "Edit",
-      [:edit, Administrate::NAMESPACE, page.resource],
+      [:edit, namespace, page.resource],
       class: "button",
     ) %>
   </div>

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

@@ -16,7 +16,11 @@ that displays all possible records to associate with.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/BelongsTo
 %>
 
-<%= f.label field.permitted_attribute %>
-<%= f.select(field.permitted_attribute) do %>
-  <%= options_for_select(field.associated_resource_options, field.selected_option) %>
-<% end %>
+<div class="field-unit__label">
+  <%= 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 %>
+</div>

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

@@ -18,6 +18,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [Administrate::NAMESPACE, field.data],
+    [namespace, field.data],
   ) %>
 <% end %>

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

@@ -18,6 +18,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [Administrate::NAMESPACE, field.data],
+    [namespace, field.data],
   ) %>
 <% end %>

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

@@ -15,5 +15,9 @@ By default, the input is a checkbox.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Boolean
 %>
 
-<%= f.label field.attribute %>
-<%= f.check_box field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.check_box field.attribute %>
+</div>

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

@@ -16,5 +16,9 @@ By default, the input is a text field that is augmented with [DateTimePicker].
 [DateTimePicker]: https://github.com/Eonasdan/bootstrap-datetimepicker
 %>
 
-<%= f.label field.attribute %>
-<%= f.text_field field.attribute, class: "datetimepicker" %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute, class: "datetimepicker" %>
+</div>

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

@@ -15,5 +15,9 @@ By default, the input is a text box.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Email
 %>
 
-<%= f.label field.attribute %>
-<%= f.email_field field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.email_field field.attribute %>
+</div>

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

@@ -19,8 +19,11 @@ and is augmented with [Selectize].
 [Selectize]: http://brianreavis.github.io/selectize.js
 %>
 
-<%= f.label field.attribute_key, field.attribute %>
-
-<%= f.select(field.attribute_key, nil, {}, multiple: true) do %>
-  <%= options_for_select(field.associated_resource_options, field.selected_options) %>
-<% end %>
+<div class="field-unit__label">
+  <%= f.label field.attribute_key, field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.select(field.attribute_key, nil, {}, multiple: true) do %>
+    <%= options_for_select(field.associated_resource_options, field.selected_options) %>
+  <% end %>
+</div>

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

@@ -17,6 +17,8 @@ so this partial renders a message to that effect.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasOne
 %>
 
-<%= f.label field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
 
 <%= t("administrate.fields.has_one.not_supported") %>

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

@@ -18,6 +18,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [Administrate::NAMESPACE, field.data],
+    [namespace, field.data],
   ) %>
 <% end %>

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

@@ -18,6 +18,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [Administrate::NAMESPACE, field.data],
+    [namespace, field.data],
   ) %>
 <% end %>

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

@@ -15,5 +15,9 @@ By default, the input is a text field for the image's URL.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Image
 %>
 
-<%= f.label field.attribute %>
-<%= f.text_field field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute %>
+</div>

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

@@ -15,5 +15,9 @@ By default, the input is a text field.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Number
 %>
 
-<%= f.label field.attribute %>
-<%= f.text_field field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute %>
+</div>

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

@@ -18,6 +18,8 @@ so this partial renders a message to that effect.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Polymorphic
 %>
 
-<%= f.label field.name %>
+<div class="field-unit__label">
+  <%= f.label field.name %>
+</div>
 
 <%= t("administrate.fields.polymorphic.not_supported") %>

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

@@ -19,6 +19,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [Administrate::NAMESPACE, field.data]
+    [namespace, field.data]
   ) %>
 <% end %>

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

@@ -19,6 +19,6 @@ By default, the relationship is rendered as a link to the associated object.
 <% if field.data %>
   <%= link_to(
     field.display_associated_resource,
-    [Administrate::NAMESPACE, field.data],
+    [namespace, field.data],
   ) %>
 <% end %>

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

@@ -15,5 +15,9 @@ By default, the input is a text field.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/String
 %>
 
-<%= f.label field.attribute %>
-<%= f.text_field field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_field field.attribute %>
+</div>

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

@@ -14,5 +14,9 @@ This partial renders a textarea element for a text attribute.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Text
 %>
 
-<%= f.label field.attribute %>
-<%= f.text_area field.attribute %>
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.text_area field.attribute %>
+</div>

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

@@ -13,31 +13,31 @@ By default, it renders:
 %>
 
 <!DOCTYPE html>
-<html>
+<html lang="<%= I18n.locale %>">
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
   <meta name="viewport" content="initial-scale=1" />
   <title><%= content_for(:title) %> | <%= Rails.application.class.parent_name.titlecase %></title>
-  <%= stylesheet_link_tag "//fonts.googleapis.com/css?family=Lato:300,400,900", media: "all" %>
   <%= stylesheet_link_tag "administrate/application", media: "all" %>
   <%= csrf_meta_tags %>
 </head>
 
-<body class="administrate">
-  <main class="main">
+<body>
+
+  <div class="app-container">
+
     <div class="sidebar">
       <%= render "sidebar" -%>
     </div>
 
-    <div class="container">
+    <main class="main-content" role="main">
       <%= content_for(:search) %>
-      <div class="content">
-        <%= render "flashes" -%>
-        <%= yield %>
-      </div>
-    </div>
-  </main>
+      <%= render "flashes" -%>
+      <%= yield %>
+    </main>
+
+  </div>
 
   <%= render "javascript" %>
 </body>

data/app/views/layouts/docs.html.erb

@@ -0,0 +1,39 @@
+<html>
+<head>
+  <%= stylesheet_link_tag "docs", media: "all" %>
+  <link href='//fonts.googleapis.com/css?family=Lato|Source+Code+Pro|Fjalla+One' rel='stylesheet' type='text/css'>
+  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
+</head>
+
+<body>
+  <div class="content">
+    <div class="sidebar">
+      <h1>Administrate</h1>
+
+      <ul class="sidebar-links">
+        <li><a href="/">Home</a></li>
+        <li><a href="https://github.com/thoughtbot/administrate/issues/new">Feedback</a></li>
+      </ul>
+
+      <h3>Documentation</h3>
+
+      <ul class="sidebar-links">
+        <li><a href="/">README</a></li>
+        <li><a href="/getting_started">Getting Started</a></li>
+        <li><a href="/customizing_dashboards">Customizing Dashboards</a></li>
+        <li><a href="/customizing_page_views">Customizing Page Views</a></li>
+        <li><a href="/customizing_attribute_partials">Customizing Attribute Partials</a></li>
+        <li><a href="/adding_custom_field_types">Adding Custom Field Types</a></li>
+        <li><a href="/customizing_controller_actions">Customizing Controller Actions</a></li>
+      </ul>
+    </div>
+
+    <div class="main">
+      <%= yield %>
+    </div>
+  </div>
+
+  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
+  <script>hljs.initHighlightingOnLoad();</script>
+</body>
+</html>

data/config/locales/administrate.de.yml

@@ -2,7 +2,7 @@
 de:
   administrate:
     actions:
-      confirm: Sind sie sicher?
+      confirm: Sind Sie sicher?
       destroy: Löschen
       edit: Editieren
       show: Anzeigen
@@ -20,4 +20,4 @@ de:
       polymorphic:
         not_supported: Polymorphe Beziehungen werden nicht unterstützt.
       has_one:
-        not_supported: HasOne-beziehungen werden nicht unterstützt.
+        not_supported: HasOne Beziehungen werden nicht unterstützt.

data/config/locales/administrate.it.yml

@@ -0,0 +1,23 @@
+---
+it:
+  administrate:
+    actions:
+      confirm: Sei sicuro?
+      destroy: Elimina
+      edit: Modifica
+      show: Visualizza
+    controller:
+      create:
+        success: "%{resource} è stato creato con successo."
+      destroy:
+        success: "%{resource} è stato eliminato con successo."
+      update:
+        success: "%{resource} è stato modificato con successo."
+    fields:
+      has_many:
+        more: Visualizzo %{count} di %{total_count}
+        none: Nessuno
+      polymorphic:
+        not_supported: Associazioni polimorfiche non ancora supportate. Spiacenti!
+      has_one:
+        not_supported: Associazioni HasOne non ancora supportate. Spiacenti!