administrate 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a8554f3a353107a488efb3fec4ef4b30f8c936
-  data.tar.gz: 7d0941da63a83224d077819a1d7976ded1d40288
+  metadata.gz: ab74a9176bf14060fc26e4346b4fca17b2672371
+  data.tar.gz: 990b4f062e37a68c7be97ee5104323d00e99a4ad
 SHA512:
-  metadata.gz: f0b5072a78e97d7d320ae833c63e5f3d17294c2344a7597e392c1c8ca2eea89445bfbb23cb7943b09392457842b448589be7244c29df8a7306ba7bc7d89df9a7
-  data.tar.gz: e67b6690e0ba8d3fbbe579d780f4780998e49bc27d67585cafae7f1741b7fd63e3028c477e95433f23083733dbd07b1e3b9bc3888d67ec4a9f16de52e89bd894
+  metadata.gz: 4f04b6bea3d168597600b14b390ec6ea6bc14836cf3236b34a0982b4067468c161b8014f253e8d4ca7ccac898aaac8ca9093dcf7143cc32aa51b8f6d54834c98
+  data.tar.gz: ec346e46a0ed10bbd38d14f5bffc2859fd8047467a1be90360a9b8fdc3dc8d7ebc67aa7472d9537c99527e7fd10960806a58502b88d7f6e4fddcb86e529adc72

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

@@ -2,12 +2,17 @@ $(function() {
   var keycodes = { space: 32, enter: 13 };
 
   var visitDataUrl = function(event) {
-    if (event.type=="click" ||
+    if (event.type == "click" ||
         event.keyCode == keycodes.space ||
         event.keyCode == keycodes.enter) {
 
-      if(!event.target.href) {
-        window.location = $(event.target).closest("tr").data("url");
+      if (event.target.href) {
+        return;
+      }
+
+      var dataUrl = $(event.target).closest("tr").data("url");
+      if (dataUrl) {
+        window.location = dataUrl;
       }
     }
   };

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

@@ -7,7 +7,7 @@
 }
 
 .preserve-whitespace {
-  white-space: pre;
+  white-space: pre-wrap;
   word-wrap: break-word;
 }
 

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

@@ -1,15 +1,27 @@
-@each $flash-type, $flash-color in $flash-colors {
-  .flash--#{$flash-type} {
-    background-color: $flash-color;
-    color: darken($flash-color, 60%);
-    padding: $small-spacing $base-spacing;
+$base-spacing: 1.5em !default;
+$flashes: (
+  "alert": #fff6bf,
+  "error": #fbe3e4,
+  "notice": #e5edf8,
+  "success": #e6efc2,
+) !default;
+
+@each $flash-type, $color in $flashes {
+  .flash-#{$flash-type} {
+    background-color: $color;
+    color: shade($color, 60%);
+    display: block;
+    margin-bottom: $base-spacing / 2;
+    padding: $base-spacing / 2;
+    text-align: center;
 
     a {
-      color: darken($flash-color, 70%);
+      color: shade($color, 70%);
+      text-decoration: underline;
 
       &:focus,
       &:hover {
-        color: darken($flash-color, 90%);
+        color: shade($color, 90%);
       }
     }
   }

data/app/controllers/administrate/application_controller.rb

@@ -80,6 +80,17 @@ module Administrate
       end
     end
 
+    helper_method :valid_action?
+    def valid_action?(name, resource = resource_name)
+      !!routes.detect do |controller, action|
+        controller == resource.to_s.pluralize && action == name.to_s
+      end
+    end
+
+    def routes
+      @routes ||= Namespace.new(namespace).routes
+    end
+
     def records_per_page
       params[:per_page] || 20
     end
@@ -101,11 +112,7 @@ module Administrate
     end
 
     def resource_params
-      params.require(resource_name).permit(*permitted_attributes)
-    end
-
-    def permitted_attributes
-      dashboard.permitted_attributes
+      params.require(resource_name).permit(dashboard.permitted_attributes)
     end
 
     delegate :resource_class, :resource_name, :namespace, to: :resource_resolver

data/app/helpers/administrate/application_helper.rb

@@ -1,5 +1,7 @@
 module Administrate
   module ApplicationHelper
+    PLURAL_MANY_COUNT = 2.1
+
     def render_field(field, locals = {})
       locals.merge!(field: field)
       render locals: locals, partial: field.to_partial_path
@@ -12,7 +14,7 @@ module Administrate
         constantize.
         model_name.
         human(
-          count: 0,
+          count: PLURAL_MANY_COUNT,
           default: resource_name.to_s.pluralize.titleize,
         )
     end
@@ -20,13 +22,15 @@ module Administrate
     def svg_tag(asset, svg_id, options = {})
       svg_attributes = {
         "xlink:href".freeze => "#{asset_url(asset)}##{svg_id}",
-        height: options[:height],
-        width: options[:width],
-      }.delete_if { |_key, value| value.nil? }
+        height: "100%",
+        width: "100%",
+      }
       xml_attributes = {
         "xmlns".freeze => "http://www.w3.org/2000/svg".freeze,
         "xmlns:xlink".freeze => "http://www.w3.org/1999/xlink".freeze,
-      }
+        height: options[:height],
+        width: options[:width],
+      }.delete_if { |_key, value| value.nil? }
 
       content_tag :svg, xml_attributes do
         content_tag :use, nil, svg_attributes
@@ -34,7 +38,7 @@ module Administrate
     end
 
     def sanitized_order_params
-      params.permit(:search, :id, :order, :page, :per_page, :direction)
+      params.permit(:search, :id, :order, :page, :per_page, :direction, :orders)
     end
 
     def clear_search_params

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

@@ -47,16 +47,17 @@ to display a collection of resources in an HTML table.
           <% end %>
         </th>
       <% end %>
-      <th colspan="2" scope="col"></th>
+      <% [valid_action?(:edit), valid_action?(:destroy)].count(true).times do %>
+        <th scope="col"></th>
+      <% end %>
     </tr>
   </thead>
 
   <tbody>
     <% resources.each do |resource| %>
       <tr class="table__row"
-          role="link"
           tabindex="0"
-          data-url="<%= polymorphic_path([namespace, resource]) -%>"
+          <%= %(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 %>">
@@ -68,19 +69,23 @@ to display a collection of resources in an HTML table.
           </td>
         <% end %>
 
-        <td><%= link_to(
-          t("administrate.actions.edit"),
-          [:edit, namespace, resource],
-          class: "action-edit",
-        ) %></td>
+        <% if valid_action? :edit %>
+          <td><%= link_to(
+            t("administrate.actions.edit"),
+            [:edit, namespace, resource],
+            class: "action-edit",
+          ) %></td>
+        <% end %>
 
-        <td><%= link_to(
-          t("administrate.actions.destroy"),
-          [namespace, resource],
-          class: "table__action--destroy",
-          method: :delete,
-          data: { confirm: t("administrate.actions.confirm") }
-        ) %></td>
+        <% if valid_action? :destroy %>
+          <td><%= link_to(
+            t("administrate.actions.destroy"),
+            [namespace, resource],
+            class: "table__action--destroy",
+            method: :delete,
+            data: { confirm: t("administrate.actions.confirm") }
+          ) %></td>
+        <% end %>
       </tr>
     <% end %>
   </tbody>

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 %></div>
     <% end -%>
   </div>
 <% end %>

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

@@ -24,7 +24,7 @@ and renders all form fields for a resource's editable attributes.
 
       <ul>
         <% page.resource.errors.full_messages.each do |message| %>
-          <li><%= message %></li>
+          <li class="flash-error"><%= message %></li>
         <% end %>
       </ul>
     </div>

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

@@ -15,16 +15,16 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Form
 %>
 
-<% content_for(:title) { "Edit #{page.page_title}" } %>
+<% 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">
     <%= link_to(
-      "Show #{page.page_title}",
+      "#{t("administrate.actions.show")} #{page.page_title}",
       [namespace, page.resource],
       class: "button",
-    ) %>
+    ) if valid_action? :show %>
   </div>
 </header>
 

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

@@ -37,10 +37,10 @@ It renders the `_table` partial to display details about the resources.
   <h1 class="header__heading" id="page-title"><%= content_for(:title) %></h1>
   <div class="header__actions">
     <%= link_to(
-      "New #{page.resource_name.titleize.downcase}",
+      "#{t("administrate.actions.new")} #{page.resource_name.titleize.downcase}",
       [:new, namespace, page.resource_name],
       class: "button",
-    ) %>
+    ) if valid_action? :new %>
   </div>
 </header>
 

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

@@ -15,12 +15,12 @@ to do the heavy lifting.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Form
 %>
 
-<% content_for(:title) { "New #{page.resource_name.titleize}" } %>
+<% 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">
-    <%= link_to 'Back', :back, class: "button" %>
+    <%= link_to t("administrate.actions.back"), :back, class: "button" %>
   </div>
 </header>
 

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

@@ -16,16 +16,16 @@ as well as a link to its edit page.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Show
 %>
 
-<% content_for(:title) { page.page_title } %>
+<% 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">
     <%= link_to(
-      "Edit",
+      "#{t("administrate.actions.edit")} #{page.page_title}",
       [:edit, namespace, page.resource],
       class: "button",
-    ) %>
+    ) if valid_action? :edit %>
   </div>
 </header>
 

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

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

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

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

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

@@ -22,17 +22,11 @@ from the associated resource class's dashboard.
   <%= render(
     "collection",
     collection_presenter: field.associated_collection,
-    resources: field.resources
+    resources: field.resources(params[field.name])
   ) %>
 
   <% if field.more_than_limit? %>
-    <span>
-      <%= t(
-        'administrate.fields.has_many.more',
-        count: field.limit,
-        total_count: field.data.count(:all),
-      ) %>
-    </span>
+    <%= paginate field.resources(params[field.name]), param_name: "#{field.name}" %>
   <% end %>
 
 <% else %>

data/config/locales/administrate.ar.yml

@@ -6,6 +6,8 @@ ar:
       destroy: "حذف"
       edit: "تعديل"
       show: "إظهار"
+      new: "جديد"
+      back: "الى الخلف"
     controller:
       create:
         success: ".بنجاح %{resource} لقد تم إنشاء"

data/config/locales/administrate.da.yml

@@ -6,6 +6,8 @@ da:
       destroy: Slet
       edit: Rediger
       show: Vis
+      new: Ny
+      back: Tilbage
     controller:
       create:
         success: "%{resource} blev oprettet."

data/config/locales/administrate.de.yml

@@ -6,6 +6,8 @@ de:
       destroy: Löschen
       edit: Editieren
       show: Anzeigen
+      new: Neu
+      back: Zurück
     controller:
       create:
         success: "%{resource} wurde erfolgreich erstellt."

data/config/locales/administrate.en.yml

@@ -6,6 +6,8 @@ en:
       destroy: Destroy
       edit: Edit
       show: Show
+      new: New
+      back: Back
     controller:
       create:
         success: "%{resource} was successfully created."

data/config/locales/administrate.es.yml

@@ -6,6 +6,8 @@ es:
       destroy: Destruir
       edit: Editar
       show: Mostrar
+      new: Nuevo
+      back: Volver
     controller:
       create:
         success: "%{resource} fue creado exitosamente."

data/config/locales/administrate.fr.yml

@@ -6,6 +6,8 @@ fr:
       destroy: Supprimer
       edit: Modifier
       show: Détails
+      new: Création
+      back: Précédent
     controller:
       create:
         success: "%{resource} a été correctement créé(e)."

data/config/locales/administrate.it.yml

@@ -6,6 +6,8 @@ it:
       destroy: Elimina
       edit: Modifica
       show: Visualizza
+      new: Nuovo
+      back: Indietro
     controller:
       create:
         success: "%{resource} è stato creato con successo."

data/config/locales/administrate.ja.yml

@@ -6,6 +6,8 @@ ja:
       destroy: 削除
       edit: 編集
       show: 参照
+      new: 目新しい
+      back: バック
     controller:
       create:
         success: "%{resource}を作成しました。"

data/config/locales/administrate.ko.yml

@@ -0,0 +1,25 @@
+---
+ko:
+  administrate:
+    actions:
+      confirm: 괜찮습니까?
+      destroy: 삭제
+      edit: 편집
+      show: 보여주기
+      new: 새로운
+      back: 뒤로
+    controller:
+      create:
+        success: "%{resource} 가 성공적으로 생성되었습니다."
+      destroy:
+        success: "%{resource} 가 성공적으로 삭제되었습니다."
+      update:
+        success: "%{resource} 가 성공적으로 갱신되었습니다."
+    fields:
+      has_many:
+        more: "%{total_count} 개 중에서 %{count} 개"
+        none: 없음
+      polymorphic:
+        not_supported: 상속 관계에 대한 양식은 제공되지 않습니다.
+      has_one:
+        not_supported: 일대일 관계에 대한 양식은 제공되지 않습니다.