activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/Gemfile

@@ -7,6 +7,11 @@ require File.expand_path 'spec/support/detect_rails_version', File.dirname(__FIL
 rails_version = detect_rails_version
 gem 'rails', rails_version
 
+jquery_ui_rails_version = rails_version > "4" ? "~> 5.0" : "~> 4.0"
+gem 'jquery-ui-rails', jquery_ui_rails_version
+
+gem 'execjs', '~> 2.4.0' # ~> 2.5.0 works only for Ruby > 2.0
+
 # Optional dependencies
 gem 'cancan'
 gem 'devise'
@@ -18,37 +23,39 @@ gem 'rake', require: false
 gem 'parallel_tests'
 
 # Debugging
-gem 'pry'                  # Easily debug from your console with `binding.pry`
+gem 'pry'                                   # Easily debug from your console with `binding.pry`
 
 group :development do
   # Debugging
-  gem 'better_errors'      # Web UI to debug exceptions. Go to /__better_errors to access the latest one
-  gem 'binding_of_caller'  # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2
+  gem 'better_errors'                       # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+  gem 'binding_of_caller', platforms: :mri  # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2
 
   # Performance
-  gem 'rack-mini-profiler' # Inline app profiler. See ?pp=help for options.
-  gem 'flamegraph'         # Flamegraph visualiztion: ?pp=flamegraph
+  gem 'rack-mini-profiler'                  # Inline app profiler. See ?pp=help for options.
+  gem 'flamegraph', platforms: :mri         # Flamegraph visualiztion: ?pp=flamegraph
 
   # Documentation
-  gem 'yard'               # Documentation generator
-  gem 'redcarpet'          # Markdown implementation (for yard)
+  gem 'yard'                                # Documentation generator
+  gem 'redcarpet', platforms: :mri          # Markdown implementation (for yard)
+  gem 'kramdown', platforms: :jruby         # Markdown implementation (for yard)
 end
 
 group :test do
   gem 'capybara'
-  gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
-  gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
+  gem 'simplecov', require: false           # Test coverage generator. Go to /coverage/ after running tests
+  gem 'coveralls', require: false           # Test coverage website. Go to https://coveralls.io
   gem 'cucumber-rails', require: false
   gem 'database_cleaner'
   gem 'guard-rspec'
   gem 'jasmine'
   gem 'jslint_on_rails'
   gem 'launchy'
-  gem 'rails-i18n' # Provides default i18n for many languages
+  gem 'rails-i18n'                          # Provides default i18n for many languages
   gem 'rspec'
   gem 'rspec-rails', '~> 3.1.0'
   gem 'i18n-spec'
   gem 'shoulda-matchers'
-  gem 'sqlite3'
+  gem 'sqlite3', platforms: :mri
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'poltergeist'
 end

data/LICENSE

@@ -18,8 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Iconic Icons are designed by P.J. Onori and are shared under
-the Creative Commons Attribution-Share Alike 3.0 license:
-http://creativecommons.org/licenses/by-sa/3.0/us
-http://somerandomdude.com/projects/iconic/

data/README.md

@@ -84,7 +84,6 @@ Tool                  | Description
 [Arbre]               | Ruby -> HTML, just like that.
 [Devise]              | Powerful, extensible user authentication
 [Formtastic]          | A Rails form builder plugin with semantically rich and accessible markup
-[Iconic Icons]        | An excellent SVG icon set designed by P.J. Onori
 [Inherited Resources] | Simplifies controllers with pre-built RESTful controller actions
 [Kaminari]            | Elegant pagination for any sort of collection
 [Ransack]             | Provides a simple search API to query your data
@@ -92,7 +91,6 @@ Tool                  | Description
 [Arbre]: https://github.com/activeadmin/arbre
 [Devise]: https://github.com/plataformatec/devise
 [Formtastic]: https://github.com/justinfrench/formtastic
-[Iconic Icons]: http://somerandomdude.com/projects/iconic
 [Inherited Resources]: https://github.com/josevalim/inherited_resources
 [Kaminari]: https://github.com/amatsuda/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack

data/activeadmin.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n").sort
   s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.add_dependency 'arbre',               '~> 1.0', '>= 1.0.2'
   s.add_dependency 'bourbon'
   s.add_dependency 'coffee-rails'
@@ -20,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'formtastic_i18n'
   s.add_dependency 'inherited_resources', '~> 1.6'
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'jquery-ui-rails',     '~> 5.0'
+  s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'kaminari',            '~> 0.15'
   s.add_dependency 'rails',               '>= 3.2', '< 5.0'
   s.add_dependency 'ransack',             '~> 1.3'

data/app/assets/javascripts/active_admin/application.js.coffee

@@ -1,10 +1,15 @@
 # Initializers
 $(document).on 'ready page:load', ->
   # jQuery datepickers (also evaluates dynamically added HTML)
-  $(document).on 'focus', '.datepicker:not(.hasDatepicker)', ->
+  $(document).on 'focus', 'input.datepicker:not(.hasDatepicker)', ->
+    $input = $(@)
+
+    # Only applying datepicker to compatible browsers
+    return if $input[0].type is 'date'
+
     defaults = dateFormat: 'yy-mm-dd'
-    options = $(@).data 'datepicker-options'
-    $(@).datepicker $.extend(defaults, options)
+    options = $input.data 'datepicker-options'
+    $input.datepicker $.extend(defaults, options)
 
   # Clear Filters button
   $('.clear_filters_btn').click ->

data/app/assets/javascripts/active_admin/base.js.coffee

@@ -1,11 +1,6 @@
 #= require jquery
-#= require jquery-ui/datepicker
-#= require jquery-ui/dialog
-#= require jquery-ui/sortable
-#= require jquery-ui/widget
-#= require jquery-ui/tabs
+#= require ./jquery_ui
 #= require jquery_ujs
-#
 #= require_self
 #= require_tree ./lib
 #= require_tree ./ext

data/app/assets/javascripts/active_admin/jquery_ui.js.erb

@@ -0,0 +1,11 @@
+<% jquery_ui_path = if Jquery::Ui::Rails::VERSION >= "5"
+                      "jquery-ui/"
+                    else
+                      "jquery.ui."
+                    end
+%>
+<% require_asset "#{jquery_ui_path}datepicker" %>
+<% require_asset "#{jquery_ui_path}dialog" %>
+<% require_asset "#{jquery_ui_path}sortable" %>
+<% require_asset "#{jquery_ui_path}widget" %>
+<% require_asset "#{jquery_ui_path}tabs" %>

data/app/assets/javascripts/active_admin/lib/flash.js.coffee

@@ -7,7 +7,7 @@ ActiveAdmin.flash =
     reference: ->
       @reference
     constructor: (@message, @type = "notice", close_after) ->
-      @reference = jQuery("<div>").addClass("flash flash_#{type}").text(message)
+      @reference = jQuery("<div>").addClass("flash flash_#{@type}").text(@message)
       jQuery ".flashes"
         .append @reference
       @close_after close_after if close_after?

data/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee

@@ -16,18 +16,26 @@ ActiveAdmin.modal_dialog = (message, inputs, callback)->
       <#{wrapper} name="#{name}" class="#{klass}" type="#{type}">""" +
         (if opts then (
           for v in opts
+            $elem = $("<#{elem}/>")
             if $.isArray v
-              "<#{elem} value=#{v[1]}>#{v[0]}</#{elem}>"
+              $elem.text(v[0]).val(v[1])
             else
-              "<#{elem}>#{v}</#{elem}>"
+              $elem.text(v)
+            $elem.wrap('<div>').parent().html()
         ).join '' else '') +
       "</#{wrapper}>" +
     "</li>"
     [wrapper, elem, opts, type, klass] = [] # unset any temporary variables
 
   html += "</ul></form>"
-  $(html).appendTo('body').dialog
+
+  form = $(html).appendTo('body')
+  $('body').trigger 'modal_dialog:before_open', [form]
+
+  form.dialog
     modal: true
+    open: (event, ui) ->
+      $('body').trigger 'modal_dialog:after_open', [form]
     dialogClass: 'active_admin_dialog'
     buttons:
       OK: ->

data/app/assets/javascripts/active_admin/lib/per_page.js.coffee

@@ -18,8 +18,12 @@ class ActiveAdmin.PerPage
     params = {}
     re = /([^&=]+)=([^&]*)/g
     while m = re.exec(query)
-      params[decodeURIComponent(m[1])] = decodeURIComponent(m[2])
+      params[@_decode(m[1])] = @_decode(m[2])
     params
+   
+  _decode: (value) ->
+    #replace "+" before decodeURIComponent
+    decodeURIComponent(value.replace(/\+/g, '%20')) 
 
 $.widget.bridge 'perPage', ActiveAdmin.PerPage
 

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

@@ -9,7 +9,6 @@
 @import "active_admin/components/comments";
 @import "active_admin/components/flash_messages";
 @import "active_admin/components/date_picker";
-@import "active_admin/components/popovers";
 @import "active_admin/components/tables";
 @import "active_admin/components/batch_actions";
 @import "active_admin/components/modal_dialog";
@@ -35,10 +34,8 @@
 
 body {
   @include sans-family;
-  line-height: 150%;
+  line-height: 1.5;
   font-size: 72%;
   background: $body-background-color;
-  margin: 0;
-  padding: 0;
   color: $text-color;
 }

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

@@ -59,7 +59,6 @@ form {
   .has_many_container {
     .handle {
       position: absolute;
-      @include icon-size(3em);
       top: calc(50% - 3em / 2);
       right: 2px;
       padding: 0;
@@ -119,7 +118,14 @@ form {
   }
 
   /* Text Fields */
-  input[type=text], input[type=password], input[type=email], input[type=number], input[type=url], input[type=tel], textarea {
+  input[type=text],
+  input[type=password],
+  input[type=email],
+  input[type=number],
+  input[type=url],
+  input[type=tel],
+  input[type=date],
+  textarea {
     width: calc(80% - #{$text-input-total-padding});
     border: $border-width solid #c9d0d6;
     @include rounded;
@@ -134,6 +140,10 @@ form {
     }
   }
 
+  input[type=date] {
+    width: calc(100% - #{$text-input-total-padding});
+  }
+
   fieldset > ol > li {
 
     /* Hints */
@@ -235,13 +245,8 @@ form {
     float:left;
     padding: 0;
 
-    &.cancel {
-      a {
-        @include light-button; @include icon(#777, 9px);
-      }
-    }
+    &.cancel a { @include light-button; }
   }
-
 }
 
 // -------------------------------------- Sidebar Forms

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

@@ -1,8 +1,3 @@
-td, p {
-  @include icon(#B3BCC1, 0.8em);
-  span.icon { margin: 0 3px; }
-}
-
 a.member_link {
   margin-right: 7px;
   white-space: nowrap;

data/app/assets/stylesheets/active_admin/mixins/_all.scss

@@ -2,7 +2,6 @@
 @import "active_admin/mixins/reset";
 @import "active_admin/mixins/gradients";
 @import "active_admin/mixins/shadows";
-@import "active_admin/mixins/icons";
 @import "active_admin/mixins/rounded";
 @import "active_admin/mixins/buttons";
 @import "active_admin/mixins/sections";

data/app/assets/stylesheets/active_admin/mixins/_sections.scss

@@ -10,7 +10,6 @@
   line-height: 18px;
   margin-bottom: 0.5em;
   color: $section-header-text-color;
-  @include icon($section-header-text-color, 1.0em);
 
   padding: 5px 10px 3px 10px;
 }

data/app/assets/stylesheets/active_admin/mixins/_typography.scss

@@ -1,3 +1,3 @@
 @mixin sans-family {
-  font-family: Helvetica, Arial, sans-serif;
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }

data/app/assets/stylesheets/active_admin/mixins/_variables.scss

@@ -1,6 +1,6 @@
 // Variables used throughout Active Admin.
 // They can be overridden by prepending your own
-// to 'app/assets/stylesheets/active_admin.css.scss'.
+// to 'app/assets/stylesheets/active_admin.scss'.
 
 // Colors
 $body-background-color: #FFF !default;

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -34,12 +34,7 @@
       & > a, & > .dropdown_menu > a {
         @include light-button;
         padding: 12px 17px 10px;
-        span.icon { vertical-align: bottom; margin-right: 4px;}
         margin: 0px;
-
-        &:hover{
-          @include icon-color(#000);
-        }
       }
     }
   }

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

@@ -14,6 +14,10 @@
 
   <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
 
+  <% ActiveAdmin.application.meta_tags_for_logged_out_pages.each do |name, content| %>
+    <%= tag(:meta, name: name, content: content) %>
+  <% end %>
+
   <%= csrf_meta_tag %>
 </head>
 <body class="active_admin logged_out <%= controller.action_name %>">

data/config/locales/ar.yml

@@ -31,6 +31,10 @@ ar:
         ends_with: "ينتهي ب"
         greater_than: "اكثر من"
         less_than: "اقل من"
+    search_status:
+      headline: "المجال:"
+      current_filters: "المُرشحات الحاليّة:"
+      no_current_filters: "بدون"
     status_tag:
       "yes": "نعم"
       "no": "لا"
@@ -38,7 +42,8 @@ ar:
     logout: "تسجيل الخروج"
     powered_by: "تنفيذ %{active_admin} %{version}"
     sidebars:
-      filters: "التصنيفات"
+      filters: "المُرشحات"
+      search_status: "حالات البحث"
     pagination:
       empty: "لا يوجد %{model} "
       one: "عرض <b>1</b> %{model}"
@@ -83,7 +88,7 @@ ar:
       username:
         title: "اسم المستخدم"
       email:
-        title: "إايميل"
+        title: "البريد الإلكترونيّ"
       subdomain:
         title: "فرعي"
       password:
@@ -108,9 +113,16 @@ ar:
         title: ""
         submit: "إعادة ارسال تعليمات التأكيد"
       links:
+        sign_up: "التسجيل"
         sign_in: "دخول"
         forgot_your_password: "هل نسيت كلمة المرور؟"
         sign_in_with_omniauth_provider: "تسجيل الدخول ب %{provider}"
+        resend_unlock_instructions: "إعادة إرسال تعليمات تنشيط الحساب"
+        resend_confirmation_instructions: "إعادة إرسال تعليمات تأكيد الحساب"
+    unsupported_browser:
+      headline: "يُرجى مُلاحظة أن أكتف أدمن لم تعد تدعم المُتصفّح إنترنت اكسبلورر الإصدار الثامن وما قبله"
+      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: "إن كنت تستخدم الإصدار التاسع من إنترنت إكسبلورر فتأكّد من أن <a href=\"http://windows.microsoft.com/en-US/windows7/webpages-look-incorrect-in-Internet-Explorer\">turn off \"Compatibility View\"</a>."
     access_denied:
       message: "غير مصرح لك"
     index_list:

data/config/locales/de-CH.yml

@@ -72,6 +72,8 @@
       title: "Kommentar"
       resource: "Resource"
       add: "Kommentar hinzufügen"
+      delete: "Löschen"
+      delete_confirmation: "Sind Sie sicher dass sie diesen Kommentar löschen wollen?"
       no_comments_yet: "Es gibt noch keine Kommentare."
       title_content: "Kommentare (%{count})"
       errors:

data/config/locales/de.yml

@@ -31,6 +31,10 @@ de:
         ends_with: "Endet mit"
         greater_than: "Größer als"
         less_than: "Kleiner als"
+    search_status:
+      headline: "Anwendungsbereich:"
+      current_filters: "Aktuelle Filter:"
+      no_current_filters: "Keine"
     status_tag:
       "yes": "Ja"
       "no": "Nein"
@@ -39,6 +43,7 @@ de:
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filter"
+      search_status: "Suchstatus"
     pagination:
       empty: "Keine %{model} gefunden"
       one: "Zeige <b>1</b> %{model}"
@@ -73,6 +78,8 @@ de:
       author: "Autor"
       title: "Kommentar"
       add: "Kommentar hinzufügen"
+      delete: "Löschen"
+      delete_confirmation: "Sind Sie sicher dass sie diesen Kommentar löschen wollen?"
       resource: "Res­sour­ce"
       no_comments_yet: "Es gibt noch keine Kommentare."
       author_missing: "Unbekannt"
@@ -101,6 +108,9 @@ de:
       change_password:
         title: "Ändern Sie Ihr Passwort"
         submit: "Mein Passwort ändern"
+      unlock:
+        title: "Entsperrungsanweisung erneut senden"
+        submit: "Entsperrungsanweisung erneut senden"
       resend_confirmation_instructions:
         title: "Anleitung zur Bestätigung noch mal schicken"
         submit: "Anleitung zur Bestätigung noch mal schicken"
@@ -117,3 +127,8 @@ de:
       turn_off_compatibility_view: "Wenn sie IE 9 oder neuer benutzen, stellen sie sicher das sie den <a href=\"http://windows.microsoft.com/en-US/windows7/webpages-look-incorrect-in-Internet-Explorer\">\"Kompatibilitätsansicht\" ausgeschaltet</a> haben."
     access_denied:
       message: "Sie haben nicht die Berechtigung um diese Aktion auszuführen."
+    index_list:
+      table: "Tabelle"
+      block: "Liste"
+      grid: "Gitter"
+      blog: "Blog"