activeadmin 1.0.0.pre5 → 1.0.0

data/Rakefile

@@ -45,7 +45,7 @@ end
 # Import all our rake tasks
 FileList['tasks/**/*.rake'].each { |task| import task }
 
-task default: :test
+task default: [:test, :lint]
 
 begin
   require 'jasmine'

data/activeadmin.gemspec

@@ -16,18 +16,18 @@ Gem::Specification.new do |s|
 
   s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.1'
 
-  s.add_dependency 'arbre',               '~> 1.0', '>= 1.0.2'
+  s.add_dependency 'arbre',               '>= 1.1.1'
   s.add_dependency 'bourbon'
   s.add_dependency 'coffee-rails'
   s.add_dependency 'formtastic',          '~> 3.1'
   s.add_dependency 'formtastic_i18n'
-  s.add_dependency 'inherited_resources', '~> 1.6'
+  s.add_dependency 'inherited_resources', '~> 1.7'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'kaminari',            '>= 0.15', '< 2.0'
-  s.add_dependency 'railties',            '>= 3.2', '< 5.1'
+  s.add_dependency 'railties',            '>= 4.2', '< 5.2'
   s.add_dependency 'ransack',             '~> 1.3'
   s.add_dependency 'sass-rails'
   s.add_dependency 'sprockets',           '< 4.1'

data/app/assets/stylesheets/active_admin/_forms.scss

@@ -242,6 +242,16 @@ form {
     input[type=submit], input[type=button], button { margin-right: 10px; }
   }
 
+  .buttons .actions .create_another {
+    float: none;
+    margin-bottom: 10px;
+
+    label {
+      float: none;
+      display: inline;
+    }
+  }
+
   fieldset.buttons li, fieldset.actions li {
     float:left;
     padding: 0;

data/config/locales/ca.yml

@@ -11,7 +11,7 @@ ca:
     delete_confirmation: "Segur que vols eliminar-ho?"
     new_model: "Crear %{model}"
     edit_model: "Editar %{model}"
-    delete_model: "eliminar %{model}"
+    delete_model: "Eliminar %{model}"
     details: "Detalls de %{model}"
     cancel: "Cancel·lar"
     empty: "Buit"

data/config/locales/da.yml

@@ -7,7 +7,8 @@ da:
     view: "Vis"
     edit: "Rediger"
     delete: "Slet"
-    delete_confirmation: "Er du sikker på at du ønsker at slette?"
+    delete_confirmation: "Er du sikker på, at du ønsker at slette?"
+    create_another: "Opret endnu en %{model}"
     new_model: "Ny(t) %{model}"
     edit_model: "Rediger %{model}"
     delete_model: "Slet %{model}"
@@ -26,11 +27,16 @@ da:
         clear: "Ryd filtre"
       predicates:
         contains: "Indeholder"
-        equals: "lig"
+        equals: "Lig"
         starts_with: "Begynder med"
         ends_with: "Slutter med"
-        greater_than: "større end"
-        less_than: "mindre end"
+        greater_than: "Større end"
+        less_than: "Mindre end"
+    search_status:
+      headline: "Søgestatus:"
+      current_scope: "Perspektiv:"
+      current_filters: "Valgte filtre:"
+      no_current_filters: "Ingen"
     status_tag:
       "yes": "Ja"
       "no": "Nej"
@@ -39,12 +45,14 @@ da:
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtre"
+      search_status: "Søgestatus"
     pagination:
       empty: "Ingen %{model} fundet"
       one: "Viser <b>1</b> %{model}"
       one_page: "Viser <b>alle %{n}</b> %{model}"
       multiple: "Viser %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> af <b>%{total}</b> i alt"
       multiple_without_total: "Viser %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Per side: "
       entry:
         one: "post"
         other: "poster"
@@ -61,24 +69,39 @@ da:
       succesfully_destroyed:
         one: "Vellykket ødelagt 1 %{model}"
         other: "Vellykket ødelagt %{count} %{plural_model}"
-      selection_toggle_explanation: "(Skift Selection)"
+      selection_toggle_explanation: "(Skift valg)"
       link: "Opret en"
       action_label: "%{title} Valgte"
       labels:
         destroy: "Slet"
     comments:
-      resource_type: "resource type"
-      author_type: "forfatter type"
-      body: "krop"
-      author: "forfatter"
+      created_at: "Oprettet"
+      resource_type: "Resource type"
+      author_type: "Forfatter type"
+      body: "Krop"
+      author: "Forfatter"
       title: "Kommentar"
       add: "Tilføj Kommentar"
+      delete: "Slet kommentar"
+      delete_confirmation: "Er du sikker på du vil slette disse kommentarer?"
       resource: "Resource"
       no_comments_yet: "Ingen kommentarer endnu."
+      author_missing: "Anonym"
       title_content: "Kommentarer (%{count})"
       errors:
         empty_text: "Kommentar blev ikke gemt, tekst var tom."
     devise:
+      username:
+        title: "Brugernavn"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Underdomæne"
+      password:
+        title: "Kodeord"
+      sign_up:
+        title: "Opret bruger"
+        submit: "Opret bruger"
       login:
         title: "Login"
         remember_me: "Husk mig"
@@ -90,12 +113,22 @@ da:
         title: "Skift din adgangskode"
         submit: "Skift min adgangskode"
       unlock:
-        title: "Send oplåsnings instruktioner igen"
-        submit: "Send oplåsnings instruktioner igen"
+        title: "Send oplåsningsinstruktioner igen"
+        submit: "Send oplåsningsinstruktioner igen"
+      resend_confirmation_instructions:
+        title: "Send bekræftigelsesinstruktioner igen"
+        submit: "Send bekræftigelsesinstruktioner igen"
       links:
+        sign_up: "Opret bruger"
         sign_in: "Log ind"
         forgot_your_password: "Glemt din adgangskode?"
         sign_in_with_omniauth_provider: "Log ind med %{provider}"
+        resend_unlock_instructions: "Send oplåsningsinstruktioner igen"
+        resend_confirmation_instructions: "Send oplåsningsinstruktioner igen"
+    unsupported_browser:
+      headline: "Vær venligst opmærksom på, at ActiveAdmin ikke længere understøtter Internet Explorer version 8 eller tidligere."
+      recommendation: "Vi anbefaler at du opgraderer til den nyeste <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, eller <a href=\"https://mozilla.org/firefox/\">Firefox</a>."
+      turn_off_compatibility_view: "Hvis du bruger IE 9 eller senere, så vær sikker på, at du <a href=\"http://windows.microsoft.com/en-US/windows7/webpages-look-incorrect-in-Internet-Explorer\">slår \"Compatibility View\" fra</a>."
     access_denied:
       message: "Du har ikke rettigheder til at udføre denne handling."
     index_list:
@@ -103,4 +136,3 @@ da:
       block: "Liste"
       grid: "Gitter"
       blog: "Blog"
-

data/config/locales/el.yml

@@ -33,7 +33,7 @@ el:
         less_than: "Μικρότερο από"
     status_tag:
       "yes": "Ναι"
-      "no": "Δεν"
+      "no": "Όχι"
     main_content: "Παρακαλώ υλοποιήστε την %{model}#main_content για να εμφανίσετε περιεχόμενο."
     logout: "Αποσύνδεση"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
     edit: "Edit"
     delete: "Delete"
     delete_confirmation: "Are you sure you want to delete this?"
+    create_another: "Create another %{model}"
     new_model: "New %{model}"
     edit_model: "Edit %{model}"
     delete_model: "Delete %{model}"
@@ -51,6 +52,7 @@ en:
       one_page: "Displaying <b>all %{n}</b> %{model}"
       multiple: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{total}</b> in total"
       multiple_without_total: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Per page: "
       entry:
         one: "entry"
         other: "entries"

data/config/locales/fr.yml

@@ -51,6 +51,7 @@ fr:
       one_page: "Affichage des <b>%{n}</b> %{model}"
       multiple: "Affichage de %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> sur un total de <b>%{total}</b>"
       multiple_without_total: "Affichage de %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Par page: "
       entry:
         one: "entrée"
         other: "entrées"
@@ -73,14 +74,18 @@ fr:
       labels:
         destroy: "Supprimer"
     comments:
+      created_at: "Créé le"
+      resource_type: "Type de ressource"
+      author_type: "Profil de l'auteur"
       body: "Corps"
       author: "Auteur"
       title: "Commentaire"
       add: "Ajouter un commentaire"
+      delete: "Supprimer ce commentaire"
+      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
       resource: "Ressource"
-      resource_type: "Type de ressource"
-      author_type: "Profil de l'auteur"
       no_comments_yet: "Aucun commentaire actuellement"
+      author_missing: "Anonyme"
       title_content: "Commentaires (%{count})"
       errors:
         empty_text: "Le commentaire n'a pas été enregistré puisque le texte était vide."
@@ -93,6 +98,9 @@ fr:
         title: "Sous-domaine"
       password:
         title: "Mot de passe"
+      sign_up:
+        title: "S'inscrire"
+        submit: "S'inscrire"
       login:
         title: "Connexion"
         remember_me: "Garder ma session ouverte"
@@ -103,13 +111,19 @@ fr:
       change_password:
         title: "Changez votre mot de passe"
         submit: "Changer mon mot de passe"
+      unlock:
+        title: "Renvoyer les informations de déverrouillage"
+        submit: "Renvoyer les informations de déverrouillage"
       resend_confirmation_instructions:
         title: "Renvoyer les instructions de confirmation"
         submit: "Renvoyer les instructions de confirmation"
       links:
+        sign_up: "Inscrivez-vous"
         sign_in: "Connectez-vous"
         forgot_your_password: "Vous avez oublié votre mot de passe ?"
         sign_in_with_omniauth_provider: "Connectez-vous avec %{provider}"
+        resend_unlock_instructions: "Renvoyer les informations de déverrouillage"
+        resend_confirmation_instructions: "Renvoyer les instructions de confirmation"
     access_denied:
       message: "Vous n'êtes pas autorisé à exécuter cette action"
     index_list:

data/config/locales/ja.yml

@@ -51,6 +51,7 @@ ja:
       one_page: "<b>全 %{n}</b> 件の %{model} を表示しています"
       multiple: "全 <b>%{total}</b> 件中 <b>%{from}&nbsp;-&nbsp;%{to}</b> 件の %{model} を表示しています"
       multiple_without_total: "<b>%{from}&nbsp;-&nbsp;%{to}</b> 件の %{model} を表示しています"
+      per_page: "表示件数: "
       entry:
         one: "レコード"
         other: "レコード"

data/config/locales/zh-CN.yml

@@ -108,5 +108,9 @@
         sign_in: "登录"
         forgot_your_password: "忘记了密码？"
         sign_in_with_omniauth_provider: "登入%{provider}"
+    unsupported_browser:
+      headline: "很抱歉，ActiveAdmin 已不再支持 Internet Explorer 8 以下版本的浏览器。"
+      recommendation: "建议您升级到最新版本的<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>，<a href=\"https://chrome.google.com/\">Google Chrome</a>，或是 <a href=\"https://mozilla.org/firefox/\">Firefox</a>。"
+      turn_off_compatibility_view: "如果您使用的是 IE 9 或更新的版本，请确认<a href=\"https://support.microsoft.com/zh-cn/help/17472/windows-internet-explorer-11-fix-site-display-problems-compatibility-view\">已关闭“兼容性视图”</a>。"
     access_denied:
       message: "您无权处理此操作"

data/docs/12-arbre-components.md

@@ -151,3 +151,26 @@ status_tag 'active', :ok
 status_tag 'active', :ok, class: 'important', id: 'status_123', label: 'on'
 # => <span class='status_tag active ok important' id='status_123'>on</span>
 ```
+
+## Tabs
+
+The Tabs component is helpful for saving page real estate. The first tab will be
+the one open when the page initially loads and the rest hidden. You can click
+each tab to toggle back and forth between them. Arbre supports unlimited number
+of tabs.
+
+```ruby
+tabs do
+  tab :active do
+    table_for orders.active do
+      ...
+    end
+  end
+
+  tab :inactive do
+    table_for orders.inactive do
+      ...
+    end
+  end
+end
+```

data/docs/14-gotchas.md

@@ -101,7 +101,7 @@ YourModel.solr_search
 
 ### Rails 5 scaffold generators
 
-Active Admin requires the `inherited_resources` gem which may break scaffolding under Rails 5 as it replaces the default scaffold generator. The solution is to configure the default controller in `config/application.rb` as outlined in [josevalim/inherited_resources#195](https://github.com/josevalim/inherited_resources/issues/195)
+Active Admin requires the `inherited_resources` gem which may break scaffolding under Rails 5 as it replaces the default scaffold generator. The solution is to configure the default controller in `config/application.rb` as outlined in [activeadmin/inherited_resources#195](https://github.com/activeadmin/inherited_resources/issues/195)
 
 ```
 module SampleApp

data/docs/2-resource-customization.md

@@ -19,9 +19,6 @@ end
 
 ## Setting up Strong Parameters
 
-Rails 4 replaces `attr_accessible` with [Strong Parameters](https://github.com/rails/strong_parameters),
-which moves attribute whitelisting from the model to the controller.
-
 Use the `permit_params` method to define which attributes may be changed:
 
 ```ruby
@@ -316,8 +313,8 @@ end
 
 ## Customizing resource retrieval
 
-Our controllers are built on [Inherited Resources](https://github.com/josevalim/inherited_resources),
-so you can use [all of its features](https://github.com/josevalim/inherited_resources#overwriting-defaults).
+Our controllers are built on [Inherited Resources](https://github.com/activeadmin/inherited_resources),
+so you can use [all of its features](https://github.com/activeadmin/inherited_resources#overwriting-defaults).
 
 If you need to customize the collection properties, you can overwrite the `scoped_collection` method.
 

data/docs/5-forms.md

@@ -173,3 +173,22 @@ You can arrange content in tabs as shown below:
     f.actions
   end
 ```
+
+## Customize the Create Another checkbox
+
+In order to simplify creating multiple resources you may enable ActiveAdmin to show nice "Create Another" checkbox alongside of Create Model
+button. It may be enabled for the whole application:
+ 
+```ruby
+ActiveAdmin.setup do |config|
+  config.create_another = true
+end
+```
+
+or for the particular resource:
+
+```ruby
+ActiveAdmin.register Post do
+  config.create_another = true
+end
+```

data/docs/6-show-pages.md

@@ -78,31 +78,3 @@ ActiveAdmin.register Book do
   end
 end
 ```
-
-# Tabs
-
-You can arrange content in tabs as shown below:
-
-```ruby
-  ActiveAdmin.register Order do 
-    show do
-      tabs do
-        tab 'Overview' do
-          attributes_table do
-            row(:status) { status_tag(order.status) }
-            row(:paid) { number_to_currency(order.amount_paid_in_dollars) }
-          end
-        end
-        
-        tab 'Payments' do
-          table_for order.payments do
-            column('Payment Type') { |p| p.payment_type.titleize }
-            column('Received On', :created_at)
-            column('Payment Details & Notes', :notes)
-            column('Amount') { |p| number_to_currency(p.amount_in_dollars) }
-          end
-        end
-      end
-    end
-  end
-```

data/docs/9-batch-actions.md

@@ -147,7 +147,6 @@ end
 When you have dynamic form inputs you can pass a proc instead:
 
 ```ruby
-# NOTE: multi-pluck is new to Rails 4
 batch_action :doit, form: -> { {user: User.pluck(:name, :id)} } do |ids, inputs|
   User.find(inputs[:user])
   # ...

data/docs/CNAME

@@ -1 +1 @@
-activeadmin.info
+github-docs.activeadmin.info

data/docs/_includes/head.html

@@ -1,7 +1,7 @@
 <head>
     <title>Active Admin | The administration framework for Ruby on Rails</title>
-    <link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:extralight,light,regular,bold' rel='stylesheet' type='text/css'>
-    <link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
+    <link href='//fonts.googleapis.com/css?family=Yanone+Kaffeesatz:extralight,light,regular,bold' rel='stylesheet' type='text/css'>
+    <link href='//fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
     <link href="{{ site.baseurl }}/stylesheets/main.css" media="screen" rel="stylesheet" type="text/css" />
-    <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
-</head>
+    <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
+</head>

data/docs/_includes/toc.html

@@ -27,7 +27,7 @@
     </ol>
     <li><a href='{{ site.baseurl }}/3-index-pages.html'>Customizing the Index Page</a></li>
     <ol class='level-2'>
-        <li><a href='{{ site.baseurl }}/3-index-pages/create-an-index.html'>Create an Index</a></li>
+        <li><a href='{{ site.baseurl }}/3-index-pages/custom-index.html'>Custom Index</a></li>
         <li><a href='{{ site.baseurl }}/3-index-pages/index-as-block.html'>Index as a Block</a></li>
         <li><a href='{{ site.baseurl }}/3-index-pages/index-as-blog.html'>Index as Blog</a></li>
         <li><a href='{{ site.baseurl }}/3-index-pages/index-as-grid.html'>Index as a Grid</a></li>
@@ -78,6 +78,7 @@
         <li><a href='{{ site.baseurl }}/12-arbre-components.html#columns'>Columns</a></li>
         <li><a href='{{ site.baseurl }}/12-arbre-components.html#table-for'>Table For</a></li>
         <li><a href='{{ site.baseurl }}/12-arbre-components.html#status-tag'>Status tag</a></li>
+        <li><a href='{{ site.baseurl }}/12-arbre-components.html#tabs'>Tabs</a></li>
     </ol>
     <li><a href='{{ site.baseurl }}/13-authorization-adapter.html'>Authorization Adapter</a></li>
     <ol class='level-2'>

data/docs/documentation.md

@@ -14,7 +14,7 @@ little effort.
 ### Getting Started
 
 Active Admin is released as a Ruby Gem. The gem is to be installed within a Ruby on Rails 4 application. To
-        install, simply add the following to your Gemfile:</p>
+        install, simply add the following to your Gemfile:
 
 ```ruby
 # Gemfile
@@ -50,7 +50,7 @@ $> rails generate active_admin:resource
         [MyModelName]
 ```
 
-This creates a file at <tt>app/admin/my_model_names.rb</tt> for configuring the resource. Refresh your web browser to see the interface.</p>
+This creates a file at <tt>app/admin/my_model_names.rb</tt> for configuring the resource. Refresh your web browser to see the interface.
 
 ### Next Steps