activeadmin 0.6.0 → 0.6.1

data/app/assets/stylesheets/active_admin/mixins/_icons.css.scss

@@ -1,7 +1,6 @@
-body.active_admin {
-  span.icon { vertical-align: middle; display: inline-block; }
-  span.icon svg { vertical-align: baseline; }
-}
+span.icon { vertical-align: middle; display: inline-block; }
+span.icon svg { vertical-align: baseline; }
+
 
 @mixin icon-color ($color) {
   span.icon svg {
@@ -19,6 +18,4 @@ body.active_admin {
   @include icon-size($size);
 }
 
-body.active_admin {
-  @include icon-size(0.8em);
-}
+@include icon-size(0.8em);

data/app/assets/stylesheets/active_admin/mixins/_reset.css.scss

@@ -1,29 +1,29 @@
 // FROM The Compass Framework (compass-style.org)
 //
 // Copyright (c) 2009 Christopher M. Eppstein
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
 // the Software without restriction, including without limitation the rights to
 // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 // the Software, and to permit persons to whom the Software is furnished to do so,
 // subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software. No attribution is required by
 // products that make use of this software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 // FOR A PARTICULAR PURPOSE AND 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.
-// 
+//
 // Except as contained in this notice, the name(s) of the above copyright holders
 // shall not be used in advertising or otherwise to promote the sale, use or other
 // dealings in this Software without prior written authorization.
-// 
+//
 // Contributors to this project agree to grant all rights to the copyright holder
 // of the primary product. Attribution is maintained in the source control history
 // of the product.

data/app/assets/stylesheets/active_admin/mixins/_rounded.css.scss

@@ -1,6 +1,6 @@
-@mixin rounded($radius: 3px) { 
-  -webkit-border-radius: $radius; 
-  -moz-border-radius: $radius; 
+@mixin rounded($radius: 3px) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
   border-radius: $radius;
 }
 

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

@@ -2,7 +2,7 @@
   @include secondary-gradient;
   @include text-shadow;
   border: solid 1px #cdcdcd;
-  @include border-colors(#e6e6e6, #d4d4d4, #cdcdcd);  
+  @include border-colors(#e6e6e6, #d4d4d4, #cdcdcd);
   box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 0 1px #FFF inset;
 
   font-size: 1.0em;
@@ -11,8 +11,8 @@
   margin-bottom: 0.5em;
   color: $section-header-text-color;
   @include icon($section-header-text-color, 1.0em);
-  
-  padding: 5px 10px 3px 10px; 
+
+  padding: 5px 10px 3px 10px;
 }
 
 @mixin section-background {
@@ -24,11 +24,11 @@
 @mixin section {
   @include section-background;
   margin-bottom: 20px;
-  
+
   > h3 { @include section-header; }
-  
+
   > div { padding: 3px $section-padding $section-padding $section-padding; }
-  
+
   hr {
     border: none;
     border-bottom: 1px solid #E8E8E8;

data/app/assets/stylesheets/active_admin/mixins/_shadows.css.scss

@@ -1,18 +1,18 @@
-@mixin shadow($x: 0, $y: 1px, $blur: 2px, $color: rgba(0,0,0,0.37)) { 
-  box-shadow: $x $y $blur $color; 
-  -moz-box-shadow: $x $y $blur $color; 
+@mixin shadow($x: 0, $y: 1px, $blur: 2px, $color: rgba(0,0,0,0.37)) {
+  box-shadow: $x $y $blur $color;
+  -moz-box-shadow: $x $y $blur $color;
   -webkit-box-shadow: $x $y $blur $color;
 }
 
 @mixin no-shadow {
-  box-shadow: none; 
-  -moz-box-shadow: none; 
+  box-shadow: none;
+  -moz-box-shadow: none;
   -webkit-box-shadow: none;
 }
 
-@mixin inset-shadow($x: 0, $y: 1px, $blur: 2px, $color: #aaa) { 
-  box-shadow: inset $x $y $blur $color; 
-  -moz-box-shadow: inset $x $y $blur $color; 
+@mixin inset-shadow($x: 0, $y: 1px, $blur: 2px, $color: #aaa) {
+  box-shadow: inset $x $y $blur $color;
+  -moz-box-shadow: inset $x $y $blur $color;
   -webkit-box-shadow: inset $x $y $blur $color;
 }
 

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

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

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

@@ -23,4 +23,4 @@
   border-right-color: $sides;
   border-bottom-color: $bottom;
   border-left-color: $sides;
-}
+}

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

@@ -3,6 +3,7 @@
 // to 'app/assets/stylesheets/active_admin.css.scss'.
 
 // Colors
+$body-background-color: #FFF;
 $primary-color: #5E6469 !default;
 $secondary-color: #f0f0f0 !default;
 $text-color: #323537 !default;
@@ -10,9 +11,15 @@ $link-color: #38678b !default;
 $section-header-text-color: $primary-color !default;
 $current-menu-item-background: lighten($primary-color, 12%) !default;
 $hover-menu-item-background: lighten($primary-color, 12%) !default;
-$table-stripe-color: lighten($primary-color, 57%) !default; 
+$table-stripe-color: lighten($primary-color, 57%) !default;
 $table-selected-color: #d9e4ec !default;
 $error-color: #932419 !default;
+$blank-slate-primary-color: #AAA;
+$breadcrumbs-color: #8a949e;
+$breadcrumbs-separator-color: #aab2ba;
+$required-field-marker-color: #aaa;
+$form-label-color: $section-header-text-color;
+$page-header-text-color: #cdcdcd;
 
 // Sizes
 $horizontal-page-margin: 30px !default;
@@ -22,3 +29,4 @@ $cell-horizontal-padding: 12px !default;
 $section-padding: 15px !default;
 $text-input-horizontal-padding: 10px !default;
 
+$blank-slate-border: 1px dashed #DADADA

data/app/assets/stylesheets/active_admin/pages/_logged_out.scss

@@ -1,4 +1,4 @@
-&.logged_out {
+body.logged_out {
   background: #e8e9ea;
 
   #content_wrapper{

data/app/assets/stylesheets/active_admin/print.css.scss

@@ -9,11 +9,9 @@ $text-color: black;
 @include global-reset;
 
 // Partials
-body.active_admin {
-  @import "active_admin/typography";
-}
+@import "active_admin/typography";
 
-body.active_admin {
+body {
   font-family: Helvetica, Arial, sans-serif;
   line-height: 150%;
   font-size: 72%;
@@ -24,8 +22,6 @@ body.active_admin {
   color: $text-color;
 }
 
-body.active_admin {
-
 a {
   color: $text-color;
   text-decoration: none;
@@ -286,5 +282,3 @@ form {
     }
   }
 }
-
-}

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

@@ -1,14 +1,14 @@
 #footer {
-  padding: 30px 30px;  
-  font-size: 0.8em; 
-  clear: both; 
+  padding: 30px 30px;
+  font-size: 0.8em;
+  clear: both;
 
-  p { 
+  p {
     padding-top: 10px
   }
 }
 
-// -------------------------------------- Index Footer (Under Table) 
+// -------------------------------------- Index Footer (Under Table)
 #index_footer { padding-top: 5px; text-align: right; font-size: 0.85em; }
 
 .index_content { clear: both; }

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

@@ -3,24 +3,24 @@
   width: 100%;
 }
 
-#active_admin_content { 
-  margin: 0; 
-  padding: 25px $horizontal-page-margin; 
-  
-  #main_content_wrapper { 
-    float: left; 
-    width: 100%; 
+#active_admin_content {
+  margin: 0;
+  padding: 25px $horizontal-page-margin;
 
-    #main_content{ 
-      margin-right: 300px; 
+  #main_content_wrapper {
+    float: left;
+    width: 100%;
+
+    #main_content{
+      margin-right: 300px;
     }
   }
 
   &.without_sidebar #main_content_wrapper #main_content{ margin-right: 0; }
 
-  #sidebar { 
-    float: left; 
-    width: $sidebar-width; 
+  #sidebar {
+    float: left;
+    width: $sidebar-width;
     margin-left: -$sidebar-width;
   }
-}
+}

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

@@ -6,39 +6,39 @@
   display: table;
   border-bottom-color: #EEE;
   width: 100%;
-  position: relative; 
-  margin: 0; 
+  position: relative;
+  margin: 0;
   margin-bottom: 15px;
-  padding: 10px $horizontal-page-margin; 
+  padding: 10px $horizontal-page-margin;
   z-index: 800;
-  
+
   #titlebar_left, #titlebar_right {
     height: 50px;
     vertical-align: middle;
     display: table-cell;
   }
-  
+
   #titlebar_right {
     text-align: right;
   }
-  
-  h2 { 
+
+  h2 {
     margin: 0;
-    padding: 0; 
+    padding: 0;
     font-size: 2.6em;
     font-weight: bold;
   }
 
-  .action_items { 
-    a { 
-      @include light-button; 
+  .action_items {
+    a {
+      @include light-button;
       padding: 12px 17px 10px;
-      span.icon { vertical-align: bottom; margin-right: 4px;} 
+      span.icon { vertical-align: bottom; margin-right: 4px;}
       margin: 0px;
-      
+
       &:hover{
         @include icon-color(#000);
       }
     }
   }
-}
+}

data/app/views/active_admin/devise/passwords/edit.html.erb

@@ -16,4 +16,4 @@
   <% end %>
 
   <%= render 'active_admin/devise/shared/links' %>
-</div>
+</div>

data/app/views/active_admin/devise/sessions/new.html.erb

@@ -6,7 +6,7 @@
     f.inputs do
       resource.class.authentication_keys.each { |key| f.input key, :input_html => {:autofocus => true}}
       f.input :password
-      f.input :remember_me, :label => t('active_admin.devise.login.remember_me'), :as => :boolean, :if =>  false  #devise_mapping.rememberable? }
+      f.input :remember_me, :label => t('active_admin.devise.login.remember_me'), :as => :boolean if devise_mapping.rememberable?
     end
     f.actions do
       f.action :submit, :label => t('active_admin.devise.login.submit'), :button_html => { :value => t('active_admin.devise.login.submit') }

data/app/views/active_admin/devise/shared/_links.erb

@@ -17,4 +17,11 @@
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
   <%= link_to t('active_admin.devise.links.resend_unlock_instructions'), new_unlock_path(resource_name) %><br />
-<% end -%>
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to t('active_admin.devise.links.sign_in_with_omniauth_provider', :provider => provider.to_s.titleize),
+          omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/app/views/active_admin/resource/index.csv.erb

@@ -7,11 +7,11 @@
               CSV
             end
 
-  col_sep = active_admin_config.csv_builder.column_separator || active_admin_application.csv_column_separator
-  options = (active_admin_config.csv_builder.options || active_admin_application.csv_options).merge(:col_sep => col_sep)
+  default = active_admin_application.csv_options
+  options = default.merge active_admin_config.csv_builder.options
+  columns = active_admin_config.csv_builder.columns
 
   csv_output = csv_lib.generate(options) do |csv|
-    columns = active_admin_config.csv_builder.columns
     csv << columns.map(&:name)
     collection.each do |resource|
       csv << columns.map do |column|

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

@@ -2,15 +2,17 @@
 <html>
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- 
+
   <title><%= [@page_title, render_or_call_method_or_proc_on(self, ActiveAdmin.application.site_title)].compact.join(" | ") %></title>
 
-  <% ActiveAdmin.application.stylesheets.each do |style| %>
-    <%= stylesheet_link_tag style.path, style.options.dup %>
+  <% ActiveAdmin.application.stylesheets.each do |style, options| %>
+    <%= stylesheet_link_tag style, options %>
   <% end %>
   <% ActiveAdmin.application.javascripts.each do |path| %>
     <%= javascript_include_tag path %>
   <% end %>
+  
+  <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
 
   <%= csrf_meta_tag %>
 </head>

data/config/locales/bg.yml

@@ -0,0 +1,101 @@
+bg:
+  active_admin:
+    dashboard: Табло
+    dashboard_welcome:
+      welcome: "Добре дошли в Active Admin. Това е таблото по подразбиране."
+      call_to_action: "За да добавите секции, редактирайте 'app/admin/dashboard.rb'"
+    view: "Преглед"
+    edit: "Редакция"
+    delete: "Изтриване"
+    delete_confirmation: "Сигурни ли сте, че искате да изтриете това?"
+    new_model: "Създаване на %{model}"
+    create_model: "Създаване на %{model}"
+    edit_model: "Редакция на %{model}"
+    update_model: "Обновяване на %{model}"
+    delete_model: "Изтриване на %{model}"
+    details: "%{model} детайли"
+    cancel: "Отказ"
+    empty: "Празно"
+    previous: "Предишно"
+    next: "Следващо"
+    download: "Изтегляне:"
+    has_many_new: "Добавяне на %{model}"
+    has_many_delete: "Изтриване"
+    has_many_remove: "Премахване"
+    filters:
+      buttons:
+        filter: "Филтриране"
+        clear: "Изчистване"
+      predicates:
+        contains: "съдържа"
+        equals: "равно на"
+        starts_with: "Започва с"
+        ends_with: "Завършва с"
+        greater_than: "по-голямо от"
+        less_than: "по-малко от"
+    main_content: "Добавете %{model}#main_content за да видите съдържание."
+    logout: "Изход"
+    powered_by: "Задвижва се от %{active_admin} %{version}"
+    sidebars:
+      filters: "Филтри"
+    pagination:
+      empty: "Не са намерени %{model}"
+      one: "Показване на <b>1</b> %{model}"
+      one_page: "Показване на <b>всички %{n}</b> %{model}"
+      multiple: "Показване %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> от общо <b>%{total}</b>"
+      multiple_without_total: "Показване %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      entry:
+        one: "запис"
+        other: "записи"
+    any: "Без значение"
+    blank_slate:
+      content: "Все още няма добавени %{resource_name}."
+      link: "Създаване"
+    batch_actions:
+      button_label: "Масови действия"
+      delete_confirmation: "Сигурни ли сте, че искате да изтриете тези %{plural_model}? Това действие не може да бъде върнато назад."
+      succesfully_destroyed:
+        one: "Успешно изтриване на 1 %{model}"
+        other: "Успешно изтриване на %{count} %{plural_model}"
+      selection_toggle_explanation: "(Инвертиране на маркирането)"
+      link: "Създаване"
+      action_label: "%{title} избран"
+      labels:
+        destroy: "Изтриване"
+    comments:
+      resource_type: "Тип ресурс"
+      author_type: "Тип автор"
+      body: "Текст"
+      author: "Автор"
+      title: "Коментар"
+      add: "Добавяне на коментар"
+      resource: "Ресурс"
+      no_comments_yet: "Все още няма коментари."
+      title_content: "Коментари (%{count})"
+      errors:
+        empty_text: "Коментарът с празен текст не беше запазен."
+    devise:
+      login:
+        title: "Вход"
+        remember_me: "Запомни ме"
+        submit: "Вход"
+      reset_password:
+        title: "Забравена парола?"
+        submit: "Изпращане на нова парола"
+      change_password:
+        title: "Промяна на моята парола"
+        submit: "Промяна на паролата"
+      unlock:
+        title: "Изпрати отново инструкциите за отключване"
+        submit: "Изпрати инструкциите повторно"
+      links:
+        sign_in: "Вход"
+        forgot_your_password: "Забравена парола?"
+        sign_in_with_omniauth_provider: "Вход с %{provider}"
+    access_denied:
+      message: "Нямате права да извършите това действие."
+    index_list:
+      table: "Таблица"
+      block: "Списък"
+      grid: "Грид"
+      blog: "Блог"