administrate 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99e940d39ae750c539424f5430bd5f07c1d33a5
-  data.tar.gz: 8d9917e0b8332333309afdefe113cac7c3b0caee
+  metadata.gz: 73036f129507204033611e21b5a8633f80ac5b07
+  data.tar.gz: becbcb0e63d0b48e7d8c58cc722e51c57ab04640
 SHA512:
-  metadata.gz: 32889166105790ee128bef195cba90618686b5a00d90a0c48195faa46d4b580c48032ce48145cf713348029048a288f51018cce289fa16402c43b0d89286fc49
-  data.tar.gz: 4abd94bd39f09afb5b0054338b076e0f144f2d4b27473a2051d0a03c37fe4de7ca97b55d4c8b0ce80471900fe08ef3db8b2bce802a51a4298b6695373072d313
+  metadata.gz: ceed2a386fcf599d33808087ffa25acfd4416356901028206506aa2095bb5b6777dd712a961d952f99220bcc9f6b189ab215ba46779fa8b1172f6528ce1fb460
+  data.tar.gz: c35a39f4b91ed15dc22b533013d6fa407c6197878e8cf4085037a25f5a9816ffc0d6de4cae4a4afe89da956bbff3bacbb11bca0c4bbfd0f4c00b53959d635461

data/app/assets/javascripts/administrate/components/table.js

@@ -18,6 +18,6 @@ $(function() {
     }
   };
 
-  $("table").on("click", ".table__row", visitDataUrl);
-  $("table").on("keydown", ".table__row", visitDataUrl);
+  $("table").on("click", ".js-table-row", visitDataUrl);
+  $("table").on("keydown", ".js-table-row", visitDataUrl);
 });

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

@@ -1,12 +1,11 @@
 @charset "utf-8";
 
 @import "normalize-rails";
-@import "bourbon";
-@import "neat";
 
 @import "selectize";
 @import "datetime_picker";
 
+@import "library/clearfix";
 @import "library/data-label";
 @import "library/variables";
 
@@ -23,9 +22,9 @@
 @import "components/field-unit";
 @import "components/flashes";
 @import "components/form-actions";
-@import "components/header";
 @import "components/main-content";
+@import "components/navigation";
 @import "components/pagination";
 @import "components/search";
-@import "components/sidebar";
-@import "components/table";
+
+@import "utilities/text-color";

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

@@ -7,13 +7,14 @@ fieldset {
 
 legend {
   font-weight: $bold-font-weight;
-  margin-bottom: $small-spacing / 2;
+  margin: 0;
   padding: 0;
 }
 
 label {
   display: block;
   font-weight: $bold-font-weight;
+  margin: 0;
 }
 
 input,
@@ -23,9 +24,16 @@ select {
   font-size: $base-font-size;
 }
 
+input,
+select,
+textarea {
+  display: block;
+  font-family: $base-font-family;
+  font-size: 16px;
+}
+
 [type="color"],
 [type="date"],
-[type="datetime"],
 [type="datetime-local"],
 [type="email"],
 [type="month"],
@@ -38,31 +46,26 @@ select {
 [type="url"],
 [type="week"],
 input:not([type]),
-textarea,
-select[multiple] {
+textarea {
+  appearance: none;
   background-color: $white;
   border: $base-border;
   border-radius: $base-border-radius;
-  box-shadow: none;
-  box-sizing: border-box;
-  font-family: $base-font-family;
-  font-size: $base-font-size;
   padding: $base-spacing / 3;
   transition: border-color $base-duration $base-timing;
   width: 100%;
 
   &:hover {
-    border-color: shade($base-border-color, 20%);
+    border-color: mix($black, $base-border-color, 20%);
   }
 
   &:focus {
     border-color: $action-color;
-    box-shadow: none;
     outline: none;
   }
 
   &:disabled {
-    background-color: shade($base-background-color, 5%);
+    background-color: mix($black, $white, 5%);
     cursor: not-allowed;
 
     &:hover {
@@ -75,10 +78,6 @@ textarea {
   resize: vertical;
 }
 
-[type="search"] {
-  appearance: none;
-}
-
 [type="checkbox"],
 [type="radio"] {
   display: inline;
@@ -92,3 +91,13 @@ textarea {
 select {
   width: 100%;
 }
+
+[type="checkbox"],
+[type="radio"],
+[type="file"],
+select {
+  &:focus {
+    outline: $focus-outline;
+    outline-offset: $focus-outline-offset;
+  }
+}

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

@@ -1,27 +1,55 @@
 table {
-  border-collapse: separate;
+  border-collapse: collapse;
+  font-size: 0.9em;
+  text-align: left;
   width: 100%;
-}
 
-th {
-  border-bottom: 1px solid shade($base-border-color, 25%);
-  text-align: left;
+  a {
+    color: inherit;
+    text-decoration: none;
+  }
 }
 
-th,
-td {
-  padding: $small-spacing;
-  vertical-align: middle;
+thead {
+  font-weight: $bold-font-weight;
 }
 
-td {
+tr {
   border-bottom: $base-border;
+}
+
+tbody tr {
+  &:hover {
+    background-color: $base-background-color;
+    cursor: pointer;
+  }
+
+  &:focus {
+    outline: $focus-outline;
+    outline-offset: -($focus-outline-width);
+  }
+}
+
+td,
+th {
   font-feature-settings: "kern", "liga", "clig", "calt", "lnum", "tnum";
   font-kerning: normal;
   font-variant-ligatures: common-ligatures, contextual;
   font-variant-numeric: lining-nums, tabular-nums;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  word-wrap: normal;
+  padding: 0.75rem;
+  vertical-align: middle;
+}
+
+td:first-child,
+th:first-child {
+  padding-left: 2rem;
+}
+
+td:last-child,
+th:last-child {
+  padding-right: 2rem;
+}
+
+td img {
+  max-height: 2rem;
 }

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

@@ -23,13 +23,16 @@ p {
 
 a {
   color: $action-color;
-  text-decoration: none;
+  text-decoration-skip: ink;
   transition: color $base-duration $base-timing;
 
-  &:active,
-  &:focus,
   &:hover {
-    color: shade($action-color, 25%);
+    color: mix($black, $action-color, 25%);
+  }
+
+  &:focus {
+    outline: $focus-outline;
+    outline-offset: $focus-outline-offset;
   }
 }
 

data/app/assets/stylesheets/administrate/components/_app-container.scss

@@ -1,7 +1,9 @@
 .app-container {
-  @include margin(null auto);
   align-items: stretch;
   display: flex;
-  max-width: 100em;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 100rem;
   min-height: 100vh;
+  padding: $base-spacing;
 }

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

@@ -1,9 +1,11 @@
 .attribute-label {
   @include data-label;
-  @include span-columns(2 of 12);
   clear: left;
+  float: left;
+  margin-bottom: $base-spacing;
   margin-top: 0;
   text-align: right;
+  width: calc(15% - 1rem);
 }
 
 .preserve-whitespace {
@@ -12,7 +14,8 @@
 }
 
 .attribute-data {
-  @include span-columns(10 of 12);
-  @include omega;
+  float: left;
   margin-bottom: $base-spacing;
+  margin-left: 2rem;
+  width: calc(85% - 1rem);
 }

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

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

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

@@ -1,5 +1,5 @@
 .cell-label {
-  @include data-label;
+  position: relative;
 
   &:hover {
     a {
@@ -13,10 +13,10 @@
   }
 
   a {
-    @include fill-parent;
     color: inherit;
     display: inline-block;
     transition: color $base-duration $base-timing;
+    width: 100%;
   }
 }
 
@@ -33,9 +33,9 @@
   right: 0;
 
   svg {
+    fill: $hint-grey;
     height: 100%;
     transition: transform $base-duration $base-timing;
-    fill: $hint-grey;
   }
 }
 

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

@@ -1,17 +1,21 @@
 .field-unit {
-  @include clearfix;
-  @include fill-parent;
+  @include administrate-clearfix;
   align-items: center;
   display: flex;
   margin-bottom: $base-spacing;
   position: relative;
+  width: 100%;
 }
 
 .field-unit__label {
-  @include span-columns(2 of 12);
+  float: left;
+  margin-left: 1rem;
   text-align: right;
+  width: calc(15% - 1rem);
 }
 
 .field-unit__field {
-  @include span-columns(5 of 12);
+  float: left;
+  margin-left: 2rem;
+  width: 45%;
 }

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

@@ -9,19 +9,19 @@ $flashes: (
 @each $flash-type, $color in $flashes {
   .flash-#{$flash-type} {
     background-color: $color;
-    color: shade($color, 60%);
+    color: mix($black, $color, 60%);
     display: block;
     margin-bottom: $base-spacing / 2;
     padding: $base-spacing / 2;
     text-align: center;
 
     a {
-      color: shade($color, 70%);
+      color: mix($black, $color, 70%);
       text-decoration: underline;
 
       &:focus,
       &:hover {
-        color: shade($color, 90%);
+        color: mix($black, $color, 90%);
       }
     }
   }

data/app/assets/stylesheets/administrate/components/_form-actions.scss

@@ -1,4 +1,3 @@
 .form-actions {
-  @include shift(2);
-  margin-bottom: $base-spacing * 4;
+  margin-left: calc(15% + 2rem);
 }

data/app/assets/stylesheets/administrate/components/_main-content.scss

@@ -1,6 +1,30 @@
 .main-content {
   background-color: $white;
-  box-shadow: 0 2px 4px rgba($grey-7, 0.24), 0 2px 6px rgba($grey-7, 0.12);
-  flex: 1;
-  overflow-y: auto;
+  border-radius: $base-border-radius;
+  box-shadow: 0 0 6px 0 rgba($black, 0.12),
+              0 2px 2px rgba($black, 0.2);
+  flex: 1 1 100%;
+  padding-bottom: 10vh;
+}
+
+.main-content__header,
+.main-content__body {
+  padding: 1rem 2rem;
+}
+
+.main-content__body--flush {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.main-content__header {
+  align-items: center;
+  border-bottom: $base-border;
+  display: flex;
+  justify-content: space-between;
+}
+
+.main-content__page-title {
+  font-size: 1.6em;
+  margin-right: 1rem;
 }

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

@@ -0,0 +1,33 @@
+$_navigation-link-padding: 0.6em;
+
+.navigation {
+  flex: 1 0 10rem;
+  padding-bottom: $base-spacing;
+  padding-right: calc(#{$base-spacing} - #{$_navigation-link-padding});
+  padding-top: $base-spacing;
+}
+
+.navigation__link {
+  background-color: transparent;
+  color: $base-font-color;
+  display: block;
+  line-height: 1;
+  margin-left: -($_navigation-link-padding);
+  padding: $_navigation-link-padding;
+  transition: background-color $base-duration $base-timing,
+              color $base-duration $base-timing;
+
+  &:not(:last-of-type) {
+    margin-bottom: $small-spacing;
+  }
+
+  &:hover {
+    background-color: mix($black, $base-background-color, 5%);
+    border-radius: $base-border-radius;
+    color: $base-font-color;
+  }
+}
+
+.navigation__link--active {
+  font-weight: $bold-font-weight;
+}

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

@@ -1,6 +1,7 @@
 .pagination {
-  @include margin($base-spacing null ($base-spacing * 4));
-  @include padding(null $base-spacing);
+  margin-top: $base-spacing;
+  padding-left: $base-spacing;
+  padding-right: $base-spacing;
   text-align: center;
 
   .first,

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

@@ -1,10 +1,11 @@
 .search {
-  @include padding(null $base-spacing);
   align-items: center;
   border-bottom: $base-border;
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
+  padding-left: $base-spacing;
+  padding-right: $base-spacing;
   position: relative;
   width: 100%;
 }
@@ -12,7 +13,8 @@
 .search__clear,
 .search__icon {
   svg {
-    @include size(1em);
+    height: 1em;
+    width: 1em;
   }
 }
 
@@ -55,14 +57,17 @@
 }
 
 .search__hint {
-  @include position(absolute, 1em 0 null null);
   color: $hint-grey;
+  left: 0;
   opacity: 0;
+  position: absolute;
+  top: 1em;
   transition: opacity $base-duration $base-timing;
   z-index: 1;
 
   svg {
-    @include size(100%);
+    height: 100%;
+    width: 100%;
   }
 
   path,

data/app/assets/stylesheets/administrate/library/_clearfix.scss

@@ -0,0 +1,7 @@
+@mixin administrate-clearfix {
+  &::after {
+    clear: both;
+    content: "";
+    display: block;
+  }
+}

data/app/assets/stylesheets/administrate/library/_data-label.scss

@@ -1,6 +1,6 @@
 @mixin data-label {
   color: $hint-grey;
-  font-size: modular-scale(-1);
+  font-size: 0.8em;
   font-weight: 400;
   letter-spacing: 0.0357em;
   position: relative;

data/app/assets/stylesheets/administrate/library/_variables.scss

@@ -6,14 +6,13 @@ $heading-font-family: $base-font-family;
 
 $base-font-size: 1em;
 
-$bold-font-weight: 600;
+$bold-font-weight: 700;
 
 $base-line-height: 1.5;
 $heading-line-height: 1.2;
 
 // Other Sizes
-$modular-scale-ratio: $minor-third;
-$base-border-radius: 3px;
+$base-border-radius: 4px;
 $base-spacing: $base-line-height * 1em;
 $small-spacing: $base-spacing / 2;
 
@@ -21,8 +20,8 @@ $small-spacing: $base-spacing / 2;
 $white: #fff;
 $black: #000;
 
-$blue: #2a94d6;
-$light-red: #c77067;
+$blue: #1976d2;
+$red: #d32f2f;
 $light-yellow: #f0cd66;
 $light-green: #4ab471;
 
@@ -40,11 +39,17 @@ $action-color: $blue;
 // Background Colors
 $base-background-color: $grey-0;
 
+// Focus
+$focus-outline-color: transparentize($action-color, 0.4);
+$focus-outline-width: 3px;
+$focus-outline: $focus-outline-width solid $focus-outline-color;
+$focus-outline-offset: 1px;
+
 // Flash Colors
 $flash-colors: (
   alert: $light-yellow,
-  error: $light-red,
-  notice: tint($blue, 50%),
+  error: $red,
+  notice: mix($white, $blue, 50%),
   success: $light-green
 );
 
@@ -54,4 +59,4 @@ $base-border: 1px solid $base-border-color;
 
 // Transitions
 $base-duration: 250ms;
-$base-timing: $ease-out-cubic;
+$base-timing: ease-in-out;

data/app/assets/stylesheets/administrate/utilities/_text-color.scss

@@ -0,0 +1,3 @@
+.text-color-red {
+  color: $red;
+}

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 class="collection-data" aria-labelledby="page-title">
+<table aria-labelledby="page-title">
   <thead>
     <tr>
       <% collection_presenter.attribute_types.each do |attr_name, attr_type| %>
@@ -55,14 +55,14 @@ to display a collection of resources in an HTML table.
 
   <tbody>
     <% resources.each do |resource| %>
-      <tr class="table__row"
+      <tr class="js-table-row"
           tabindex="0"
           <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) if valid_action? :show -%>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
             <a href="<%= polymorphic_path([namespace, resource]) -%>"
-               class="action-show table__link-plain"
+               class="action-show"
                >
               <%= render_field attribute %>
             </a>
@@ -81,7 +81,7 @@ to display a collection of resources in an HTML table.
           <td><%= link_to(
             t("administrate.actions.destroy"),
             [namespace, resource],
-            class: "table__action--destroy",
+            class: "text-color-red",
             method: :delete,
             data: { confirm: t("administrate.actions.confirm") }
           ) %></td>

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

@@ -0,0 +1,18 @@
+<%#
+# Navigation
+
+This partial is used to display the navigation in Administrate.
+By default, the navigation contains navigation links
+for all resources in the admin dashboard,
+as defined by the routes in the `admin/` namespace
+%>
+
+<nav class="navigation" role="navigation">
+  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
+    <%= link_to(
+      display_resource_name(resource),
+      [namespace, resource.path],
+      class: "navigation__link navigation__link--#{nav_link_state(resource)}"
+    ) %>
+  <% end %>
+</nav>

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

@@ -1,4 +1,4 @@
-<form class="search">
+<form class="search" role="search">
   <span class="search__icon">
     <%= svg_tag "administrate/search.svg", "search", width: 16, height: 16 %>
   </span>

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

@@ -17,9 +17,12 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
 
 <% content_for(:title) { "#{t("administrate.actions.edit")} #{page.page_title}" } %>
 
-<header class="header">
-  <h1 class="header__heading"><%= content_for(:title) %></h1>
-  <div class="header__actions">
+<header class="main-content__header" role="banner">
+  <h1 class="main-content__page-title">
+    <%= content_for(:title) %>
+  </h1>
+
+  <div>
     <%= link_to(
       "#{t("administrate.actions.show")} #{page.page_title}",
       [namespace, page.resource],
@@ -28,4 +31,6 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
   </div>
 </header>
 
-<%= render "form", page: page %>
+<section class="main-content__body">
+  <%= render "form", page: page %>
+</section>

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

@@ -33,9 +33,12 @@ It renders the `_table` partial to display details about the resources.
   <% end %>
 <% end %>
 
-<header class="header">
-  <h1 class="header__heading" id="page-title"><%= content_for(:title) %></h1>
-  <div class="header__actions">
+<header class="main-content__header" role="banner">
+  <h1 class="main-content__page-title" id="page-title">
+    <%= content_for(:title) %>
+  </h1>
+
+  <div>
     <%= link_to(
       "#{t("administrate.actions.new")} #{page.resource_name.titleize.downcase}",
       [:new, namespace, page.resource_path],
@@ -44,6 +47,7 @@ It renders the `_table` partial to display details about the resources.
   </div>
 </header>
 
-<%= render "collection", collection_presenter: page, resources: resources %>
-
-<%= paginate resources %>
+<section class="main-content__body main-content__body--flush">
+  <%= render "collection", collection_presenter: page, resources: resources %>
+  <%= paginate resources %>
+</section>

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

@@ -17,11 +17,16 @@ to do the heavy lifting.
 
 <% content_for(:title) { "#{t("administrate.actions.new")} #{page.resource_name.titleize}" } %>
 
-<header class="header">
-  <h1 class="header__heading"><%= content_for(:title) %></h1>
-  <div class="header__actions">
+<header class="main-content__header" role="banner">
+  <h1 class="main-content__page-title">
+    <%= content_for(:title) %>
+  </h1>
+
+  <div>
     <%= link_to t("administrate.actions.back"), :back, class: "button" %>
   </div>
 </header>
 
-<%= render 'form', page: page %>
+<section class="main-content__body">
+  <%= render "form", page: page %>
+</section>

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

@@ -18,9 +18,12 @@ as well as a link to its edit page.
 
 <% content_for(:title) { "#{t("administrate.actions.show")} #{page.page_title}" } %>
 
-<header class="header">
-  <h1 class="header__heading"><%= content_for(:title) %></h1>
-  <div class="header__actions">
+<header class="main-content__header" role="banner">
+  <h1 class="main-content__page-title">
+    <%= content_for(:title) %>
+  </h1>
+
+  <div>
     <%= link_to(
       "#{t("administrate.actions.edit")} #{page.page_title}",
       [:edit, namespace, page.resource],
@@ -29,16 +32,18 @@ as well as a link to its edit page.
   </div>
 </header>
 
-<dl>
-  <% page.attributes.each do |attribute| %>
-    <dt class="attribute-label">
-    <%= t(
-      "helpers.label.#{resource_name}.#{attribute.name}",
-      default: attribute.name.titleize,
-    ) %>
-    </dt>
-
-    <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-        ><%= render_field attribute %></dd>
-  <% end %>
-</dl>
+<section class="main-content__body">
+  <dl>
+    <% page.attributes.each do |attribute| %>
+      <dt class="attribute-label">
+      <%= t(
+        "helpers.label.#{resource_name}.#{attribute.name}",
+        default: attribute.name.titleize,
+      ) %>
+      </dt>
+
+      <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+          ><%= render_field attribute %></dd>
+    <% end %>
+  </dl>
+</section>

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

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

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

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

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

@@ -21,4 +21,6 @@ so this partial renders a message to that effect.
   <%= f.label field.attribute %>
 </div>
 
-<%= t("administrate.fields.has_one.not_supported") %>
+<div class="field-unit__field">
+  <%= t("administrate.fields.has_one.not_supported") %>
+</div>

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

@@ -22,4 +22,6 @@ so this partial renders a message to that effect.
   <%= f.label field.name %>
 </div>
 
-<%= t("administrate.fields.polymorphic.not_supported") %>
+<div class="field-unit__field">
+  <%= t("administrate.fields.polymorphic.not_supported") %>
+</div>

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

@@ -5,38 +5,34 @@ This view template is used as the layout
 for every page that Administrate generates.
 
 By default, it renders:
-- Sidebar for navigation
+- Navigation
 - Content for a search bar
   (if provided by a `content_for` block in a nested page)
 - Flashes
-- Links to stylesheets and Javascripts
+- Links to stylesheets and JavaScripts
 %>
 
 <!DOCTYPE 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>
+  <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>
   <%= render "stylesheet" %>
   <%= csrf_meta_tags %>
 </head>
-
 <body>
-
   <div class="app-container">
-
-    <div class="sidebar">
-      <%= render "sidebar" -%>
-    </div>
+    <%= render "navigation" -%>
 
     <main class="main-content" role="main">
       <%= content_for(:search) %>
       <%= render "flashes" -%>
       <%= yield %>
     </main>
-
   </div>
 
   <%= render "javascript" %>

data/docs/customizing_dashboards.md

@@ -61,6 +61,7 @@ specify, including:
 - `Field::Polymorphic`
 - `Field::Select`
 - `Field::String`
+- `Field::Text`
 
 ## Customizing Fields
 

data/docs/customizing_page_views.md

@@ -72,7 +72,7 @@ It's so easy that pass in the "layout" key word to the view generators.
 ```bash
 rails generate administrate:views:layout
  # -> app/views/layouts/admin/application.html.erb
- # -> app/views/admin/application/_sidebar.html.erb
+ # -> app/views/admin/application/_navigation.html.erb
  # -> app/views/admin/application/_javascript.html.erb
  # -> app/views/admin/application/_flashes.html.erb
 ```

data/lib/administrate/engine.rb

@@ -1,9 +1,7 @@
-require "bourbon"
 require "datetime_picker_rails"
 require "jquery-rails"
 require "kaminari"
 require "momentjs-rails"
-require "neat"
 require "normalize-rails"
 require "sass-rails"
 require "selectize-rails"

data/lib/administrate/field/date_time.rb

@@ -3,6 +3,19 @@ require_relative "base"
 module Administrate
   module Field
     class DateTime < Base
+      def date
+        I18n.localize(data.to_date, format: format)
+      end
+
+      def datetime
+        I18n.localize(data, format: format, default: data)
+      end
+
+      private
+
+      def format
+        options.fetch(:format, :default)
+      end
     end
   end
 end

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.0".freeze
 end

data/lib/generators/administrate/views/layout_generator.rb

@@ -12,7 +12,7 @@ module Administrate
             "app/views/layouts/admin/application.html.erb",
           )
 
-          call_generator("administrate:views:sidebar")
+          call_generator("administrate:views:navigation")
           copy_resource_template("_javascript")
           copy_resource_template("_flashes")
         end

data/lib/generators/administrate/views/{sidebar_generator.rb → navigation_generator.rb}

@@ -3,11 +3,11 @@ require "administrate/view_generator"
 module Administrate
   module Generators
     module Views
-      class SidebarGenerator < Administrate::ViewGenerator
+      class NavigationGenerator < Administrate::ViewGenerator
         source_root template_source_path
 
-        def copy_sidebar
-          copy_resource_template("_sidebar")
+        def copy_navigation
+          copy_resource_template("_navigation")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -85,20 +85,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: bourbon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta.6
 - !ruby/object:Gem::Dependency
   name: datetime_picker_rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,20 +141,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: neat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: normalize-rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +226,14 @@ files:
 - app/assets/stylesheets/administrate/components/_field-unit.scss
 - app/assets/stylesheets/administrate/components/_flashes.scss
 - app/assets/stylesheets/administrate/components/_form-actions.scss
-- app/assets/stylesheets/administrate/components/_header.scss
 - app/assets/stylesheets/administrate/components/_main-content.scss
+- app/assets/stylesheets/administrate/components/_navigation.scss
 - app/assets/stylesheets/administrate/components/_pagination.scss
 - app/assets/stylesheets/administrate/components/_search.scss
-- app/assets/stylesheets/administrate/components/_sidebar.scss
-- app/assets/stylesheets/administrate/components/_table.scss
+- app/assets/stylesheets/administrate/library/_clearfix.scss
 - app/assets/stylesheets/administrate/library/_data-label.scss
 - app/assets/stylesheets/administrate/library/_variables.scss
+- app/assets/stylesheets/administrate/utilities/_text-color.scss
 - app/assets/stylesheets/docs.scss
 - app/controllers/administrate/application_controller.rb
 - app/helpers/administrate/application_helper.rb
@@ -269,8 +241,8 @@ files:
 - app/views/administrate/application/_flashes.html.erb
 - app/views/administrate/application/_form.html.erb
 - app/views/administrate/application/_javascript.html.erb
+- app/views/administrate/application/_navigation.html.erb
 - app/views/administrate/application/_search.html.erb
-- app/views/administrate/application/_sidebar.html.erb
 - app/views/administrate/application/_stylesheet.html.erb
 - app/views/administrate/application/edit.html.erb
 - app/views/administrate/application/index.html.erb
@@ -392,9 +364,9 @@ files:
 - lib/generators/administrate/views/form_generator.rb
 - lib/generators/administrate/views/index_generator.rb
 - lib/generators/administrate/views/layout_generator.rb
+- lib/generators/administrate/views/navigation_generator.rb
 - lib/generators/administrate/views/new_generator.rb
 - lib/generators/administrate/views/show_generator.rb
-- lib/generators/administrate/views/sidebar_generator.rb
 - lib/generators/administrate/views/views_generator.rb
 - lib/tasks/administrate_tasks.rake
 homepage: https://administrate-prototype.herokuapp.com/

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

@@ -1,15 +0,0 @@
-.header {
-  align-items: flex-start;
-  display: flex;
-  justify-content: space-between;
-  padding: $base-spacing;
-}
-
-.header__heading {
-  font-size: modular-scale(3);
-  margin-top: 0;
-}
-
-.header__actions {
-  margin-left: $base-spacing;
-}

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

@@ -1,22 +0,0 @@
-.sidebar {
-  flex: 0 0 auto;
-  max-width: 12em;
-  overflow-y: auto;
-  padding: 0 $base-spacing $base-spacing;
-}
-
-.sidebar__link {
-  color: $base-font-color;
-  display: block;
-  padding-top: $base-spacing;
-  transition: color 0.05s linear;
-
-  &:hover {
-    color: $blue;
-  }
-}
-
-.sidebar__link--active {
-  color: $blue;
-  font-weight: $bold-font-weight;
-}

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

@@ -1,31 +0,0 @@
-.collection-data {
-  @include padding(null $base-spacing);
-}
-
-.table__row {
-  background-color: $white;
-  border-left: 2px solid transparent;
-  transition: background-color $base-duration $base-timing;
-
-  &:hover {
-    background-color: $base-background-color;
-    border-left-color: $blue;
-    cursor: pointer;
-  }
-
-  img {
-    max-height: 2em;
-  }
-}
-
-.table__action--destroy {
-  color: $light-red;
-}
-
-.table__link-plain {
-  color: inherit;
-
-  &:hover {
-    color: inherit;
-  }
-}

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

@@ -1,20 +0,0 @@
-<%#
-# Sidebar
-
-This partial is used to display the sidebar in Administrate.
-By default, the sidebar contains navigation links
-for all resources in the admin dashboard,
-as defined by the routes in the `admin/` namespace
-%>
-
-<ul class="sidebar__list">
-  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
-    <li>
-      <%= link_to(
-        display_resource_name(resource),
-        [namespace, resource.path],
-        class: "sidebar__link sidebar__link--#{nav_link_state(resource)}"
-      ) %>
-    </li>
-  <% end %>
-</ul>